diff options
author | Cornelia Huck <cohuck@redhat.com> | 2018-07-23 15:00:54 +0200 |
---|---|---|
committer | Cornelia Huck <cohuck@redhat.com> | 2018-08-20 14:18:49 +0200 |
commit | 9ca056d68f82726bda7f0b57d6a94c302d0f3b19 (patch) | |
tree | 2898459d9f9303d4b3a00fd19c141dc942456184 /hw | |
parent | 627fce617868df87b3757375a2a0318ad2beb381 (diff) | |
download | qemu-9ca056d68f82726bda7f0b57d6a94c302d0f3b19.zip qemu-9ca056d68f82726bda7f0b57d6a94c302d0f3b19.tar.gz qemu-9ca056d68f82726bda7f0b57d6a94c302d0f3b19.tar.bz2 |
s390x: introduce 3.1 compat machine
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 7983185..d366909 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -673,6 +673,9 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +#define CCW_COMPAT_3_0 \ + HW_COMPAT_3_0 + #define CCW_COMPAT_2_12 \ HW_COMPAT_2_12 @@ -761,14 +764,26 @@ bool css_migration_enabled(void) .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) { + ccw_machine_3_1_instance_options(machine); } 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) { |