mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390x: introduce 3.1 compat machine

Browse Source 
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Cornelia Huck 2018-07-23 15:00:54 +02:00
parent 627fce6178
commit 9ca056d68f
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

@ -673,6 +673,9 @@ bool css_migration_enabled(void)
} \ } \
type_init(ccw_machine_register_##suffix) type_init(ccw_machine_register_##suffix)
#define CCW_COMPAT_3_0 \
HW_COMPAT_3_0
#define CCW_COMPAT_2_12 \ #define CCW_COMPAT_2_12 \
HW_COMPAT_2_12 HW_COMPAT_2_12
@ -761,14 +764,26 @@ bool css_migration_enabled(void)
.value = "0",\ .value = "0",\
}, },
static void ccw_machine_3_1_instance_options(MachineState *machine)
{
}
static void ccw_machine_3_1_class_options(MachineClass *mc)
{
}
DEFINE_CCW_MACHINE(3_1, "3.1", true);
static void ccw_machine_3_0_instance_options(MachineState *machine) static void ccw_machine_3_0_instance_options(MachineState *machine)
{ {
ccw_machine_3_1_instance_options(machine);
} }
static void ccw_machine_3_0_class_options(MachineClass *mc) static void ccw_machine_3_0_class_options(MachineClass *mc)
{ {
ccw_machine_3_1_class_options(mc);
SET_MACHINE_COMPAT(mc, CCW_COMPAT_3_0);
} }
DEFINE_CCW_MACHINE(3_0, "3.0", true); DEFINE_CCW_MACHINE(3_0, "3.0", false);
static void ccw_machine_2_12_instance_options(MachineState *machine) static void ccw_machine_2_12_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_3_0 \
/* empty */
#define HW_COMPAT_2_12 \ #define HW_COMPAT_2_12 \
{\ {\
.driver = "migration",\ .driver = "migration",\