SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

s390x: introduce 2.11 compat machine

Browse Source 
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Halil Pasic <pasic@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Cornelia Huck 2017-08-10 14:07:31 +02:00
parent 5c8d6f008c
commit 70d8d9a0c9
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -432,6 +432,9 @@ bool css_migration_enabled(void)
} \ } \
type_init(ccw_machine_register_##suffix) type_init(ccw_machine_register_##suffix)
#define CCW_COMPAT_2_10 \
HW_COMPAT_2_10
#define CCW_COMPAT_2_9 \ #define CCW_COMPAT_2_9 \
HW_COMPAT_2_9 \ HW_COMPAT_2_9 \
{\ {\
@ -506,8 +509,18 @@ bool css_migration_enabled(void)
.value = "0",\ .value = "0",\
}, },
static void ccw_machine_2_11_instance_options(MachineState *machine)
{
}
static void ccw_machine_2_11_class_options(MachineClass *mc)
{
}
DEFINE_CCW_MACHINE(2_11, "2.11", true);
static void ccw_machine_2_10_instance_options(MachineState *machine) static void ccw_machine_2_10_instance_options(MachineState *machine)
{ {
ccw_machine_2_11_instance_options(machine);
if (css_migration_enabled()) { if (css_migration_enabled()) {
css_register_vmstate(); css_register_vmstate();
} }
@ -515,8 +528,10 @@ static void ccw_machine_2_10_instance_options(MachineState *machine)
static void ccw_machine_2_10_class_options(MachineClass *mc) static void ccw_machine_2_10_class_options(MachineClass *mc)
{ {
ccw_machine_2_11_class_options(mc);
SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_10);
} }
DEFINE_CCW_MACHINE(2_10, "2.10", true); DEFINE_CCW_MACHINE(2_10, "2.10", false);
static void ccw_machine_2_9_instance_options(MachineState *machine) static void ccw_machine_2_9_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_10 \
/* empty */
#define HW_COMPAT_2_9 \ #define HW_COMPAT_2_9 \
{\ {\
.driver = "pci-bridge",\ .driver = "pci-bridge",\