Message ID | 1452173818-13661-8-git-send-email-cornelia.huck@de.ibm.com |
---|---|
State | New |
Headers | show |
On 01/07/2016 02:36 PM, Cornelia Huck wrote: > From: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com> > > In 240240d5 'pc: Add pc-*-2.6 machine classes' HW_COMPAT_2_5 and > PC_COMPAT_2_5 were introduced. > > Accordingly, introduce CCW_COMPAT_2_5 that uses HW_COMPAT_2_5. > > Signed-off-by: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com> > Message-Id: <1450899731-19517-1-git-send-email-shmulik.ladkani@ravellosystems.com> > Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> > --- > hw/s390x/s390-virtio-ccw.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 8d7d04b..586ddbb 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -235,7 +235,11 @@ static const TypeInfo ccw_machine_info = { > }, > }; > > +#define CCW_COMPAT_2_5 \ > + HW_COMPAT_2_5 > + > #define CCW_COMPAT_2_4 \ > + CCW_COMPAT_2_5 \ > HW_COMPAT_2_4 \ > {\ > .driver = TYPE_S390_SKEYS,\ > @@ -296,8 +300,13 @@ static const TypeInfo ccw_machine_2_4_info = { > static void ccw_machine_2_5_class_init(ObjectClass *oc, void *data) > { > MachineClass *mc = MACHINE_CLASS(oc); > + static GlobalProperty compat_props[] = { > + CCW_COMPAT_2_5 > + { /* end of list */ } > + }; > > mc->desc = "VirtIO-ccw based S390 machine v2.5"; > + mc->compat_props = compat_props; > } > > static const TypeInfo ccw_machine_2_5_info = { >
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 8d7d04b..586ddbb 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -235,7 +235,11 @@ static const TypeInfo ccw_machine_info = { }, }; +#define CCW_COMPAT_2_5 \ + HW_COMPAT_2_5 + #define CCW_COMPAT_2_4 \ + CCW_COMPAT_2_5 \ HW_COMPAT_2_4 \ {\ .driver = TYPE_S390_SKEYS,\ @@ -296,8 +300,13 @@ static const TypeInfo ccw_machine_2_4_info = { static void ccw_machine_2_5_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); + static GlobalProperty compat_props[] = { + CCW_COMPAT_2_5 + { /* end of list */ } + }; mc->desc = "VirtIO-ccw based S390 machine v2.5"; + mc->compat_props = compat_props; } static const TypeInfo ccw_machine_2_5_info = {