diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-08-22 14:37:31 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-08-22 14:37:31 +0100 |
| commit | ca489cd037e4d50dc6c40570a167504ad7e5a521 (patch) | |
| tree | be8d0d9503f81bb1b3025748b5f0153bba860268 /hw/s390x | |
| parent | e7b4f70e16dd558eea7511a0683e898ef6937696 (diff) | |
| parent | 3ff3c5d31740484b0e19007843094483fb393e80 (diff) | |
Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging
Machine queue 2020-08-19
Regular post-release changes:
* hw: add compat machines for 5.2 (Cornelia Huck)
Features:
* qmp: Expose MachineClass::default_ram_id
(Michal Privoznik)
Cleanups:
* qdev: Document qdev_prop_set_drive_err() return value
(Philippe Mathieu-Daudé)
# gpg: Signature made Wed 19 Aug 2020 16:21:55 BST
# gpg: using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6
# gpg: issuer "ehabkost@redhat.com"
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/machine-next-pull-request:
hw: add compat machines for 5.2
qmp: Expose MachineClass::default_ram_id
qdev: Document qdev_prop_set_drive_err() return value
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/s390x')
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index e72c61d2ea..f4ea6a9545 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -801,14 +801,26 @@ bool css_migration_enabled(void) } \ type_init(ccw_machine_register_##suffix) +static void ccw_machine_5_2_instance_options(MachineState *machine) +{ +} + +static void ccw_machine_5_2_class_options(MachineClass *mc) +{ +} +DEFINE_CCW_MACHINE(5_2, "5.2", true); + static void ccw_machine_5_1_instance_options(MachineState *machine) { + ccw_machine_5_2_instance_options(machine); } static void ccw_machine_5_1_class_options(MachineClass *mc) { + ccw_machine_5_2_class_options(mc); + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); } -DEFINE_CCW_MACHINE(5_1, "5.1", true); +DEFINE_CCW_MACHINE(5_1, "5.1", false); static void ccw_machine_5_0_instance_options(MachineState *machine) { |