david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390: Introduce CCW_COMPAT_2_5

Browse Source 
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>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
This commit is contained in:
Shmulik Ladkani 2015-12-23 21:42:11 +02:00 committed by Cornelia Huck
parent e11f463295
commit cf87e0a3ee
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/s390x/s390-virtio-ccw.c
View File

@ -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 = {