| Message ID | 1450899731-19517-1-git-send-email-shmulik.ladkani@ravellosystems.com |
|---|---|
| State | New |
| Headers | show |
On Wed, 23 Dec 2015 21:42:11 +0200 Shmulik Ladkani <shmulik.ladkani@ravellosystems.com> wrote: > 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> > --- > hw/s390x/s390-virtio-ccw.c | 9 +++++++++ > 1 file changed, 9 insertions(+) Thanks, applied to my s390-next branch (after fixing up a trivial conflict).
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 5a52ff2..3d79654 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,10 +300,15 @@ 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->alias = "s390-ccw-virtio"; mc->desc = "VirtIO-ccw based S390 machine v2.5"; mc->is_default = 1; + mc->compat_props = compat_props; } static const TypeInfo ccw_machine_2_5_info = {
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> --- hw/s390x/s390-virtio-ccw.c | 9 +++++++++ 1 file changed, 9 insertions(+)