|
 |
4a2fec |
From 1ece5bfd00eda071ff19d17035d1af23f4d160e9 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
Date: Mon, 9 Oct 2017 15:50:34 +0200
|
|
|
4a2fec |
Subject: [PATCH 31/34] RHEL: Add RHEL7 machine type for qemu on s390x
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
Message-id: <1507564234-19627-3-git-send-email-thuth@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 77037
|
|
|
4a2fec |
O-Subject: [RHEL-7.5 qemu-kvm-ma PATCH 2/2] RHEL: Add RHEL7 machine type for qemu on s390x
|
|
|
4a2fec |
Bugzilla: 1473292
|
|
|
4a2fec |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
Upstream-status: downstream only
|
|
|
4a2fec |
|
|
|
4a2fec |
Since downstream qemu-kvm is an engineered version (with additional
|
|
|
4a2fec |
bug fixes and features on top of the upstream version), we can not
|
|
|
4a2fec |
use the upstream machine types here. Introduce RHEL-specific machine
|
|
|
4a2fec |
types instead.
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
hw/s390x/s390-virtio-ccw.c | 17 ++++++++++++++++-
|
|
|
4a2fec |
1 file changed, 16 insertions(+), 1 deletion(-)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
|
|
|
4a2fec |
index 1aec58c..4e524b0 100644
|
|
|
4a2fec |
--- a/hw/s390x/s390-virtio-ccw.c
|
|
|
4a2fec |
+++ b/hw/s390x/s390-virtio-ccw.c
|
|
|
4a2fec |
@@ -411,7 +411,7 @@ bool css_migration_enabled(void)
|
|
|
4a2fec |
{ \
|
|
|
4a2fec |
MachineClass *mc = MACHINE_CLASS(oc); \
|
|
|
4a2fec |
ccw_machine_##suffix##_class_options(mc); \
|
|
|
4a2fec |
- mc->desc = "VirtIO-ccw based S390 machine v" verstr; \
|
|
|
4a2fec |
+ mc->desc = "VirtIO-ccw based S390 machine " verstr; \
|
|
|
4a2fec |
if (latest) { \
|
|
|
4a2fec |
mc->alias = "s390-ccw-virtio"; \
|
|
|
4a2fec |
mc->is_default = 1; \
|
|
|
4a2fec |
@@ -435,6 +435,8 @@ bool css_migration_enabled(void)
|
|
|
4a2fec |
} \
|
|
|
4a2fec |
type_init(ccw_machine_register_##suffix)
|
|
|
4a2fec |
|
|
|
4a2fec |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
4a2fec |
+
|
|
|
4a2fec |
#define CCW_COMPAT_2_9 \
|
|
|
4a2fec |
HW_COMPAT_2_9 \
|
|
|
4a2fec |
{\
|
|
|
4a2fec |
@@ -605,6 +607,19 @@ static void ccw_machine_2_4_class_options(MachineClass *mc)
|
|
|
4a2fec |
}
|
|
|
4a2fec |
DEFINE_CCW_MACHINE(2_4, "2.4", false);
|
|
|
4a2fec |
|
|
|
4a2fec |
+#else
|
|
|
4a2fec |
+
|
|
|
4a2fec |
+static void ccw_machine_rhel750_instance_options(MachineState *machine)
|
|
|
4a2fec |
+{
|
|
|
4a2fec |
+}
|
|
|
4a2fec |
+
|
|
|
4a2fec |
+static void ccw_machine_rhel750_class_options(MachineClass *mc)
|
|
|
4a2fec |
+{
|
|
|
4a2fec |
+}
|
|
|
4a2fec |
+DEFINE_CCW_MACHINE(rhel750, "rhel7.5.0", true);
|
|
|
4a2fec |
+
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
+
|
|
|
4a2fec |
static void ccw_machine_register_types(void)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
type_register_static(&ccw_machine_info);
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|