Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
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 6a57f94197..a23b8aec9f 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -639,6 +639,9 @@ bool css_migration_enabled(void)
} \
type_init(ccw_machine_register_##suffix)
+#define CCW_COMPAT_2_11 \
+ HW_COMPAT_2_11
+
#define CCW_COMPAT_2_10 \
HW_COMPAT_2_10
@@ -716,14 +719,26 @@ bool css_migration_enabled(void)
.value = "0",\
},
+static void ccw_machine_2_12_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_2_12_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(2_12, "2.12", true);
+
static void ccw_machine_2_11_instance_options(MachineState *machine)
{
+ ccw_machine_2_12_instance_options(machine);
}
static void ccw_machine_2_11_class_options(MachineClass *mc)
{
+ ccw_machine_2_12_class_options(mc);
+ SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_11);
}
-DEFINE_CCW_MACHINE(2_11, "2.11", true);
+DEFINE_CCW_MACHINE(2_11, "2.11", false);
static void ccw_machine_2_10_instance_options(MachineState *machine)
{
diff --git a/include/hw/compat.h b/include/hw/compat.h
index cf389b4e85..263de973a7 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_11 \
+ /* empty */
+
#define HW_COMPAT_2_10 \
{\
.driver = "virtio-mouse-device",\
--
2.13.6
On 11/24/2017 04:33 PM, Cornelia Huck wrote: > Signed-off-by: Cornelia Huck <cohuck@redhat.com> Just to be ahead of ARM again? ;-) Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>+ > --- > 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 6a57f94197..a23b8aec9f 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -639,6 +639,9 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +#define CCW_COMPAT_2_11 \ > + HW_COMPAT_2_11 > + > #define CCW_COMPAT_2_10 \ > HW_COMPAT_2_10 > > @@ -716,14 +719,26 @@ bool css_migration_enabled(void) > .value = "0",\ > }, > > +static void ccw_machine_2_12_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_2_12_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(2_12, "2.12", true); > + > static void ccw_machine_2_11_instance_options(MachineState *machine) > { > + ccw_machine_2_12_instance_options(machine); > } > > static void ccw_machine_2_11_class_options(MachineClass *mc) > { > + ccw_machine_2_12_class_options(mc); > + SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_11); > } > -DEFINE_CCW_MACHINE(2_11, "2.11", true); > +DEFINE_CCW_MACHINE(2_11, "2.11", false); > > static void ccw_machine_2_10_instance_options(MachineState *machine) > { > diff --git a/include/hw/compat.h b/include/hw/compat.h > index cf389b4e85..263de973a7 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_11 \ > + /* empty */ > + > #define HW_COMPAT_2_10 \ > {\ > .driver = "virtio-mouse-device",\ >
On 24.11.2017 16:33, Cornelia Huck wrote: > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > --- > 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 6a57f94197..a23b8aec9f 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -639,6 +639,9 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +#define CCW_COMPAT_2_11 \ > + HW_COMPAT_2_11 > + > #define CCW_COMPAT_2_10 \ > HW_COMPAT_2_10 > > @@ -716,14 +719,26 @@ bool css_migration_enabled(void) > .value = "0",\ > }, > > +static void ccw_machine_2_12_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_2_12_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(2_12, "2.12", true); > + > static void ccw_machine_2_11_instance_options(MachineState *machine) > { > + ccw_machine_2_12_instance_options(machine); > } > > static void ccw_machine_2_11_class_options(MachineClass *mc) > { > + ccw_machine_2_12_class_options(mc); > + SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_11); > } > -DEFINE_CCW_MACHINE(2_11, "2.11", true); > +DEFINE_CCW_MACHINE(2_11, "2.11", false); > > static void ccw_machine_2_10_instance_options(MachineState *machine) > { > diff --git a/include/hw/compat.h b/include/hw/compat.h > index cf389b4e85..263de973a7 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_11 \ > + /* empty */ > + > #define HW_COMPAT_2_10 \ > {\ > .driver = "virtio-mouse-device",\ > Reviewed-by: David Hildenbrand <david@redhat.com> Will be helpful for QEMU cpu model changes soon :) -- Thanks, David / dhildenb
On Fri, 24 Nov 2017 16:33:44 +0100 Cornelia Huck <cohuck@redhat.com> wrote: > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > --- > hw/s390x/s390-virtio-ccw.c | 17 ++++++++++++++++- > include/hw/compat.h | 3 +++ > 2 files changed, 19 insertions(+), 1 deletion(-) Queued to s390-next.
© 2016 - 2024 Red Hat, Inc.