[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.8 01/38] s390x: add compat machine for 2.8
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH for-2.8 01/38] s390x: add compat machine for 2.8 |
Date: |
Mon, 29 Aug 2016 13:44:53 +0200 |
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 18 +++++++++++++++++-
include/hw/compat.h | 3 +++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 91d9cef..3bfd6cc 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 7ee7299..08dd4fb 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",\
--
2.9.3
- [Qemu-devel] [PATCH for-2.8 00/38] s390x patches for 2.8, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 03/38] s390x/pci: assert zpci always existing, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 10/38] qmp: details about CPU definitions in query-cpu-definitions, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 23/38] s390x/sclp: introduce sclp feature blocks, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 14/38] s390x/cpumodel: generate CPU feature lists for CPU models, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 04/38] s390/sclp: cache the sclp device, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 05/38] s390x: wrap flic savevm calls into vmstate, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 07/38] s390x/css: handle cssid 255 correctly, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 16/38] s390x/cpumodel: introduce CPU feature group definitions, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 01/38] s390x: add compat machine for 2.8,
Cornelia Huck <=
- [Qemu-devel] [PATCH for-2.8 26/38] s390x/sclp: propagate the mha via sclp, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 17/38] s390x/cpumodel: register defined CPU models as subclasses, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 25/38] s390x/sclp: propagate the ibc val (lowest and unblocked ibc), Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 21/38] s390x/cpumodel: check and apply the CPU model, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 06/38] s390x/ioinst: advertise fcs facility, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 38/38] s390x/cpumodel: implement QMP interface "query-cpu-model-baseline", Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 12/38] s390x/cpumodel: expose CPU class properties, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 20/38] s390x/cpumodel: let the CPU model handle feature checks, Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 31/38] s390x/kvm: let the CPU model control CMM(A), Cornelia Huck, 2016/08/29
- [Qemu-devel] [PATCH for-2.8 09/38] s390x/kvm: 2 byte software breakpoint support, Cornelia Huck, 2016/08/29