diff options
| author | Cornelia Huck | 2019-11-12 11:48:11 +0100 |
|---|---|---|
| committer | Cornelia Huck | 2019-12-14 10:25:50 +0100 |
| commit | 3eb74d2087d3bd6cb51c06a49ba94222248d2de4 (patch) | |
| tree | c5f5949e647c59f53a9e0966f0e22f184a1f7b90 /hw/s390x/s390-virtio-ccw.c | |
| parent | vfio-ccw: Fix error message (diff) | |
| download | qemu-3eb74d2087d3bd6cb51c06a49ba94222248d2de4.tar.gz qemu-3eb74d2087d3bd6cb51c06a49ba94222248d2de4.tar.xz qemu-3eb74d2087d3bd6cb51c06a49ba94222248d2de4.zip | |
hw: add compat machines for 5.0
Add 5.0 machine types for arm/i440fx/q35/s390x/spapr.
For i440fx and q35, unversioned cpu models are still translated
to -v1; I'll leave changing this (if desired) to the respective
maintainers.
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20191112104811.30323-1-cohuck@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw/s390x/s390-virtio-ccw.c')
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index cb5fe4c84d..01e7e209a5 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -639,15 +639,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_5_0_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_5_0_class_options(MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(5_0, "5.0", true); + static void ccw_machine_4_2_instance_options(MachineState *machine) { + ccw_machine_5_0_instance_options(machine); } static void ccw_machine_4_2_class_options(MachineClass *mc) { + ccw_machine_5_0_class_options(mc); compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len); } -DEFINE_CCW_MACHINE(4_2, "4.2", true); +DEFINE_CCW_MACHINE(4_2, "4.2", false); static void ccw_machine_4_1_instance_options(MachineState *machine) { |