Commit cf87e0a3 authored by Shmulik Ladkani's avatar Shmulik Ladkani Committed by Cornelia Huck
Browse files

s390: Introduce CCW_COMPAT_2_5 



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: default avatarShmulik Ladkani <shmulik.ladkani@ravellosystems.com>
Message-Id: <1450899731-19517-1-git-send-email-shmulik.ladkani@ravellosystems.com>
Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent e11f4632

hw/s390x/s390-virtio-ccw.c

+9 −0
Original line number Diff line number Diff line
@@ -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 = {