[PATCH for-2.11] s390x: introduce 2.11 compat machine

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[PATCH for-2.11] s390x: introduce 2.11 compat machine

Cornelia Huck-2
Signed-off-by: Cornelia Huck <[hidden email]>
---

It's that time again. I plan to put this into my first 2.11 pullreq.
Yes, and I assume that the next version is indeed 2.11 :)

---
 hw/s390x/s390-virtio-ccw.c | 17 ++++++++++++++++-
 include/hw/compat.h        |  3 +++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 1c7af39ce6..d3d67b8d77 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -432,6 +432,9 @@ bool css_migration_enabled(void)
     }                                                                         \
     type_init(ccw_machine_register_##suffix)
 
+#define CCW_COMPAT_2_10 \
+        HW_COMPAT_2_10
+
 #define CCW_COMPAT_2_9 \
         HW_COMPAT_2_9 \
         {\
@@ -506,8 +509,18 @@ bool css_migration_enabled(void)
             .value    = "0",\
         },
 
+static void ccw_machine_2_11_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_2_11_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(2_11, "2.11", true);
+
 static void ccw_machine_2_10_instance_options(MachineState *machine)
 {
+    ccw_machine_2_11_instance_options(machine);
     if (css_migration_enabled()) {
         css_register_vmstate();
     }
@@ -515,8 +528,10 @@ static void ccw_machine_2_10_instance_options(MachineState *machine)
 
 static void ccw_machine_2_10_class_options(MachineClass *mc)
 {
+    ccw_machine_2_11_class_options(mc);
+    SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_10);
 }
-DEFINE_CCW_MACHINE(2_10, "2.10", true);
+DEFINE_CCW_MACHINE(2_10, "2.10", false);
 
 static void ccw_machine_2_9_instance_options(MachineState *machine)
 {
diff --git a/include/hw/compat.h b/include/hw/compat.h
index 08f36004da..3e101f8f67 100644
--- a/include/hw/compat.h
+++ b/include/hw/compat.h
@@ -1,6 +1,9 @@
 #ifndef HW_COMPAT_H
 #define HW_COMPAT_H
 
+#define HW_COMPAT_2_10 \
+    /* empty */
+
 #define HW_COMPAT_2_9 \
     {\
         .driver   = "pci-bridge",\
--
2.13.4


Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [PATCH for-2.11] s390x: introduce 2.11 compat machine

David Hildenbrand-3
On 10.08.2017 14:37, Cornelia Huck wrote:

> Signed-off-by: Cornelia Huck <[hidden email]>
> ---
>
> It's that time again. I plan to put this into my first 2.11 pullreq.
> Yes, and I assume that the next version is indeed 2.11 :)
>
> ---
>  hw/s390x/s390-virtio-ccw.c | 17 ++++++++++++++++-
>  include/hw/compat.h        |  3 +++
>  2 files changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index 1c7af39ce6..d3d67b8d77 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -432,6 +432,9 @@ bool css_migration_enabled(void)
>      }                                                                         \
>      type_init(ccw_machine_register_##suffix)
>  
> +#define CCW_COMPAT_2_10 \
> +        HW_COMPAT_2_10
> +
>  #define CCW_COMPAT_2_9 \
>          HW_COMPAT_2_9 \
>          {\
> @@ -506,8 +509,18 @@ bool css_migration_enabled(void)
>              .value    = "0",\
>          },
>  
> +static void ccw_machine_2_11_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_2_11_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(2_11, "2.11", true);
> +
>  static void ccw_machine_2_10_instance_options(MachineState *machine)
>  {
> +    ccw_machine_2_11_instance_options(machine);
>      if (css_migration_enabled()) {
>          css_register_vmstate();
>      }
> @@ -515,8 +528,10 @@ static void ccw_machine_2_10_instance_options(MachineState *machine)
>  
>  static void ccw_machine_2_10_class_options(MachineClass *mc)
>  {
> +    ccw_machine_2_11_class_options(mc);
> +    SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_10);
>  }
> -DEFINE_CCW_MACHINE(2_10, "2.10", true);
> +DEFINE_CCW_MACHINE(2_10, "2.10", false);
>  
>  static void ccw_machine_2_9_instance_options(MachineState *machine)
>  {
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index 08f36004da..3e101f8f67 100644
> --- a/include/hw/compat.h
> +++ b/include/hw/compat.h
> @@ -1,6 +1,9 @@
>  #ifndef HW_COMPAT_H
>  #define HW_COMPAT_H
>  
> +#define HW_COMPAT_2_10 \
> +    /* empty */
> +
>  #define HW_COMPAT_2_9 \
>      {\
>          .driver   = "pci-bridge",\
>

Looks just fine to me.

Reviewed-by: David Hildenbrand <[hidden email]>

--

Thanks,

David

Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [PATCH for-2.11] s390x: introduce 2.11 compat machine

Halil Pasic
In reply to this post by Cornelia Huck-2
;

On 08/10/2017 02:37 PM, Cornelia Huck wrote:

> Signed-off-by: Cornelia Huck <[hidden email]>
> ---
>
> It's that time again. I plan to put this into my first 2.11 pullreq.
> Yes, and I assume that the next version is indeed 2.11 :)
>
> ---
>  hw/s390x/s390-virtio-ccw.c | 17 ++++++++++++++++-
>  include/hw/compat.h        |  3 +++
>  2 files changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index 1c7af39ce6..d3d67b8d77 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -432,6 +432,9 @@ bool css_migration_enabled(void)
>      }                                                                         \
>      type_init(ccw_machine_register_##suffix)
>
> +#define CCW_COMPAT_2_10 \
> +        HW_COMPAT_2_10
> +
>  #define CCW_COMPAT_2_9 \
>          HW_COMPAT_2_9 \
>          {\
> @@ -506,8 +509,18 @@ bool css_migration_enabled(void)
>              .value    = "0",\
>          },
>
> +static void ccw_machine_2_11_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_2_11_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(2_11, "2.11", true);
> +
>  static void ccw_machine_2_10_instance_options(MachineState *machine)
>  {
> +    ccw_machine_2_11_instance_options(machine);
>      if (css_migration_enabled()) {
>          css_register_vmstate();
>      }
> @@ -515,8 +528,10 @@ static void ccw_machine_2_10_instance_options(MachineState *machine)
>
>  static void ccw_machine_2_10_class_options(MachineClass *mc)
>  {
> +    ccw_machine_2_11_class_options(mc);
> +    SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_10);
>  }
> -DEFINE_CCW_MACHINE(2_10, "2.10", true);
> +DEFINE_CCW_MACHINE(2_10, "2.10", false);
>
>  static void ccw_machine_2_9_instance_options(MachineState *machine)
>  {
> diff --git a/include/hw/compat.h b/include/hw/compat.h
> index 08f36004da..3e101f8f67 100644
> --- a/include/hw/compat.h
> +++ b/include/hw/compat.h
> @@ -1,6 +1,9 @@
>  #ifndef HW_COMPAT_H
>  #define HW_COMPAT_H
>
> +#define HW_COMPAT_2_10 \
> +    /* empty */
> +
>  #define HW_COMPAT_2_9 \
>      {\
>          .driver   = "pci-bridge",\
>

LGTM

Reviewed-by: Halil Pasic <[hidden email]>


Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [PATCH for-2.11] s390x: introduce 2.11 compat machine

Cornelia Huck-2
In reply to this post by Cornelia Huck-2
On Thu, 10 Aug 2017 14:37:41 +0200
Cornelia Huck <[hidden email]> wrote:

> Signed-off-by: Cornelia Huck <[hidden email]>
> ---
>
> It's that time again. I plan to put this into my first 2.11 pullreq.
> Yes, and I assume that the next version is indeed 2.11 :)
>
> ---
>  hw/s390x/s390-virtio-ccw.c | 17 ++++++++++++++++-
>  include/hw/compat.h        |  3 +++
>  2 files changed, 19 insertions(+), 1 deletion(-)

Applied to s390-next.

Loading...