[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/7] s390x: introduce 3.1 compat machine
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 1/7] s390x: introduce 3.1 compat machine |
Date: |
Mon, 20 Aug 2018 14:53:35 +0200 |
Reviewed-by: David Hildenbrand <address@hidden>
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 7983185d04..d366909474 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -673,6 +673,9 @@ bool css_migration_enabled(void)
} \
type_init(ccw_machine_register_##suffix)
+#define CCW_COMPAT_3_0 \
+ HW_COMPAT_3_0
+
#define CCW_COMPAT_2_12 \
HW_COMPAT_2_12
@@ -761,14 +764,26 @@ bool css_migration_enabled(void)
.value = "0",\
},
+static void ccw_machine_3_1_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_3_1_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(3_1, "3.1", true);
+
static void ccw_machine_3_0_instance_options(MachineState *machine)
{
+ ccw_machine_3_1_instance_options(machine);
}
static void ccw_machine_3_0_class_options(MachineClass *mc)
{
+ ccw_machine_3_1_class_options(mc);
+ SET_MACHINE_COMPAT(mc, CCW_COMPAT_3_0);
}
-DEFINE_CCW_MACHINE(3_0, "3.0", true);
+DEFINE_CCW_MACHINE(3_0, "3.0", false);
static void ccw_machine_2_12_instance_options(MachineState *machine)
{
diff --git a/include/hw/compat.h b/include/hw/compat.h
index c08f4040bb..6f4d5fc647 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_3_0 \
+ /* empty */
+
#define HW_COMPAT_2_12 \
{\
.driver = "migration",\
--
2.14.4
- [Qemu-devel] [PULL 0/7] s390x patches for 3.1, Cornelia Huck, 2018/08/20
- [Qemu-devel] [PULL 1/7] s390x: introduce 3.1 compat machine,
Cornelia Huck <=
- [Qemu-devel] [PULL 2/7] s390x/cpumodel: enum type S390FeatGroup now gets generated, Cornelia Huck, 2018/08/20
- [Qemu-devel] [PULL 3/7] s390x: remove 's390-squash-mcss' option, Cornelia Huck, 2018/08/20
- [Qemu-devel] [PULL 4/7] s390x/cpumodel: Add "-cpu max" support, Cornelia Huck, 2018/08/20
- [Qemu-devel] [PULL 5/7] linux-headers: update, Cornelia Huck, 2018/08/20
- [Qemu-devel] [PULL 7/7] s390x: Enable KVM huge page backing support, Cornelia Huck, 2018/08/20
- [Qemu-devel] [PULL 6/7] s390x/kvm: add etoken facility, Cornelia Huck, 2018/08/20
- Re: [Qemu-devel] [PULL 0/7] s390x patches for 3.1, Peter Maydell, 2018/08/20