diff options
Diffstat (limited to 'hw/s390x/s390-virtio-ccw.c')
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 4516d73ff5..bfcf64d007 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -222,10 +222,6 @@ static void s390_create_virtio_net(BusState *bus, const char *name) NICInfo *nd = &nd_table[i]; DeviceState *dev; - if (!nd->model) { - nd->model = g_strdup("virtio"); - } - qemu_check_nic_model(nd, "virtio"); dev = qdev_new(name); @@ -828,14 +824,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_8_2_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_8_2_class_options(MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(8_2, "8.2", true); + static void ccw_machine_8_1_instance_options(MachineState *machine) { + ccw_machine_8_2_instance_options(machine); } static void ccw_machine_8_1_class_options(MachineClass *mc) { + ccw_machine_8_2_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_8_1, hw_compat_8_1_len); } -DEFINE_CCW_MACHINE(8_1, "8.1", true); +DEFINE_CCW_MACHINE(8_1, "8.1", false); static void ccw_machine_8_0_instance_options(MachineState *machine) { |