OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

s390x: introduce 2.12 compat machine

Browse Source 
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Cornelia Huck 2017-11-24 16:26:51 +01:00
parent 039efad77b
commit 67ee0cefb0
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

@ -639,6 +639,9 @@ bool css_migration_enabled(void)
} \ } \
type_init(ccw_machine_register_##suffix) type_init(ccw_machine_register_##suffix)
#define CCW_COMPAT_2_11 \
HW_COMPAT_2_11
#define CCW_COMPAT_2_10 \ #define CCW_COMPAT_2_10 \
HW_COMPAT_2_10 HW_COMPAT_2_10
@ -716,14 +719,26 @@ bool css_migration_enabled(void)
.value = "0",\ .value = "0",\
}, },
static void ccw_machine_2_12_instance_options(MachineState *machine)
{
}
static void ccw_machine_2_12_class_options(MachineClass *mc)
{
}
DEFINE_CCW_MACHINE(2_12, "2.12", true);
static void ccw_machine_2_11_instance_options(MachineState *machine) static void ccw_machine_2_11_instance_options(MachineState *machine)
{ {
ccw_machine_2_12_instance_options(machine);
} }
static void ccw_machine_2_11_class_options(MachineClass *mc) static void ccw_machine_2_11_class_options(MachineClass *mc)
{ {
ccw_machine_2_12_class_options(mc);
SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_11);
} }
DEFINE_CCW_MACHINE(2_11, "2.11", true); DEFINE_CCW_MACHINE(2_11, "2.11", false);
static void ccw_machine_2_10_instance_options(MachineState *machine) static void ccw_machine_2_10_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_11 \
/* empty */
#define HW_COMPAT_2_10 \ #define HW_COMPAT_2_10 \
{\ {\
.driver = "virtio-mouse-device",\ .driver = "virtio-mouse-device",\