diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2016-08-12 09:26:52 +0200 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2016-09-05 15:15:16 +0200 |
| commit | 61823988df67eba82d59bd9d2cfd643aeac92826 (patch) | |
| tree | 4fc6fa8a622f420796aee6169193aea7f198aea2 | |
| parent | e87d397e5ef66276ccc49b829527d605ca07d0ad (diff) | |
| download | qemu-61823988df67eba82d59bd9d2cfd643aeac92826.tar.gz qemu-61823988df67eba82d59bd9d2cfd643aeac92826.tar.bz2 qemu-61823988df67eba82d59bd9d2cfd643aeac92826.zip | |
s390x: add compat machine for 2.8
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 18 | ||||
| -rw-r--r-- | include/hw/compat.h | 3 |
2 files changed, 20 insertions, 1 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 91d9cefbb5..3bfd6cc6fd 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -316,7 +316,11 @@ static const TypeInfo ccw_machine_info = { } \ type_init(ccw_machine_register_##suffix) +#define CCW_COMPAT_2_7 \ + HW_COMPAT_2_7 + #define CCW_COMPAT_2_6 \ + CCW_COMPAT_2_7 \ HW_COMPAT_2_6 \ {\ .driver = TYPE_S390_IPL,\ @@ -372,14 +376,26 @@ static const TypeInfo ccw_machine_info = { .value = "0",\ }, +static void ccw_machine_2_8_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_2_8_class_options(MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(2_8, "2.8", true); + static void ccw_machine_2_7_instance_options(MachineState *machine) { + ccw_machine_2_8_instance_options(machine); } static void ccw_machine_2_7_class_options(MachineClass *mc) { + ccw_machine_2_8_class_options(mc); + SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_7); } -DEFINE_CCW_MACHINE(2_7, "2.7", true); +DEFINE_CCW_MACHINE(2_7, "2.7", false); static void ccw_machine_2_6_instance_options(MachineState *machine) { diff --git a/include/hw/compat.h b/include/hw/compat.h index 7ee7299c36..08dd4fbec2 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -1,6 +1,9 @@ #ifndef HW_COMPAT_H #define HW_COMPAT_H +#define HW_COMPAT_2_7 \ + /* empty */ + #define HW_COMPAT_2_6 \ {\ .driver = "virtio-mmio",\ |