ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390x: add compat machine for 2.8 

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
This commit is contained in:
Cornelia Huck 2016-08-12 09:26:52 +02:00
parent e87d397e5e
commit 61823988df
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,7 +316,11 @@ static const TypeInfo ccw_machine_info = {
} \ } \
type_init(ccw_machine_register_##suffix) type_init(ccw_machine_register_##suffix)
#define CCW_COMPAT_2_7 \
HW_COMPAT_2_7
#define CCW_COMPAT_2_6 \ #define CCW_COMPAT_2_6 \
CCW_COMPAT_2_7 \
HW_COMPAT_2_6 \ HW_COMPAT_2_6 \
{\ {\
.driver = TYPE_S390_IPL,\ .driver = TYPE_S390_IPL,\
@ -372,14 +376,26 @@ static const TypeInfo ccw_machine_info = {
.value = "0",\ .value = "0",\
}, },
static void ccw_machine_2_8_instance_options(MachineState *machine)
{
}
static void ccw_machine_2_8_class_options(MachineClass *mc)
{
}
DEFINE_CCW_MACHINE(2_8, "2.8", true);
static void ccw_machine_2_7_instance_options(MachineState *machine) static void ccw_machine_2_7_instance_options(MachineState *machine)
{ {
ccw_machine_2_8_instance_options(machine);
} }
static void ccw_machine_2_7_class_options(MachineClass *mc) static void ccw_machine_2_7_class_options(MachineClass *mc)
{ {
ccw_machine_2_8_class_options(mc);
SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_7);
} }
DEFINE_CCW_MACHINE(2_7, "2.7", true); DEFINE_CCW_MACHINE(2_7, "2.7", false);
static void ccw_machine_2_6_instance_options(MachineState *machine) static void ccw_machine_2_6_instance_options(MachineState *machine)
{ {

3
include/hw/compat.h
View File

@ -1,6 +1,9 @@
#ifndef HW_COMPAT_H #ifndef HW_COMPAT_H
#define HW_COMPAT_H #define HW_COMPAT_H
#define HW_COMPAT_2_7 \
/* empty */
#define HW_COMPAT_2_6 \ #define HW_COMPAT_2_6 \
{\ {\
.driver = "virtio-mmio",\ .driver = "virtio-mmio",\