[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/11] s390x: introduce 2.10 compat machine
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 01/11] s390x: introduce 2.10 compat machine |
Date: |
Fri, 21 Apr 2017 09:40:28 +0200 |
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 17 ++++++++++++++++-
include/hw/compat.h | 3 +++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 40914fde6f..5ac315ac78 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -336,6 +336,9 @@ static const TypeInfo ccw_machine_info = {
} \
type_init(ccw_machine_register_##suffix)
+#define CCW_COMPAT_2_9 \
+ HW_COMPAT_2_9
+
#define CCW_COMPAT_2_8 \
HW_COMPAT_2_8 \
{\
@@ -402,14 +405,26 @@ static const TypeInfo ccw_machine_info = {
.value = "0",\
},
+static void ccw_machine_2_10_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_2_10_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(2_10, "2.10", true);
+
static void ccw_machine_2_9_instance_options(MachineState *machine)
{
+ ccw_machine_2_10_instance_options(machine);
}
static void ccw_machine_2_9_class_options(MachineClass *mc)
{
+ ccw_machine_2_10_class_options(mc);
+ SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_9);
}
-DEFINE_CCW_MACHINE(2_9, "2.9", true);
+DEFINE_CCW_MACHINE(2_9, "2.9", false);
static void ccw_machine_2_8_instance_options(MachineState *machine)
{
diff --git a/include/hw/compat.h b/include/hw/compat.h
index 5d5be91daf..846b90eb67 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_9 \
+ /* empty */
+
#define HW_COMPAT_2_8 \
{\
.driver = "fw_cfg_mem",\
--
2.11.0
- [Qemu-devel] [PULL 00/11] s390x patches for 2.10, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 01/11] s390x: introduce 2.10 compat machine,
Cornelia Huck <=
- [Qemu-devel] [PULL 02/11] s390x/kvm: make printf always compile in debug output, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 03/11] s390x/pci: make printf always compile in debug output, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 07/11] s390x: use enum for adapter type and standardize its naming, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 04/11] s390x/css: introduce read-only property type for device ids, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 06/11] s390x/css: consolidate the devno property for ccw devices, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 10/11] s390x: register I/O adapters per ISC during init, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 05/11] s390x/css: provide introspection for virtual subchannel and device busid, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 08/11] s390x: initialize flic before I/O subsystems, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 09/11] s390x/flic: cache flic in s390_get_flic, Cornelia Huck, 2017/04/21
- [Qemu-devel] [PULL 11/11] s390x: Drop useless casts, Cornelia Huck, 2017/04/21