|
 |
1bdc94 |
From 7b1ad037d92201aee894afd9cc70a852721f2d9d Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: Laurent Vivier <lvivier@redhat.com>
|
|
|
1bdc94 |
Date: Thu, 24 May 2018 14:11:45 +0200
|
|
|
1bdc94 |
Subject: [PATCH 4/8] redhat: define pseries-rhel7.6.0 machine types
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180524141145.7532-3-lvivier@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 80470
|
|
|
1bdc94 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 2/2] redhat: define pseries-rhel7.6.0 machine types
|
|
|
1bdc94 |
Bugzilla: 1557054
|
|
|
1bdc94 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
hw/ppc/spapr.c | 26 ++++++++++++++++++++++++--
|
|
|
1bdc94 |
1 file changed, 24 insertions(+), 2 deletions(-)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
|
|
|
1bdc94 |
index 6f005a0..e2df370 100644
|
|
|
1bdc94 |
--- a/hw/ppc/spapr.c
|
|
|
1bdc94 |
+++ b/hw/ppc/spapr.c
|
|
|
1bdc94 |
@@ -4354,19 +4354,41 @@ DEFINE_SPAPR_MACHINE(2_1, "2.1", false);
|
|
|
1bdc94 |
#endif
|
|
|
1bdc94 |
|
|
|
1bdc94 |
/*
|
|
|
1bdc94 |
+ * pseries-rhel7.6.0
|
|
|
1bdc94 |
+ */
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
+static void spapr_machine_rhel760_instance_options(MachineState *machine)
|
|
|
1bdc94 |
+{
|
|
|
1bdc94 |
+}
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
+static void spapr_machine_rhel760_class_options(MachineClass *mc)
|
|
|
1bdc94 |
+{
|
|
|
1bdc94 |
+ /* Defaults for the latest behaviour inherited from the base class */
|
|
|
1bdc94 |
+}
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
+DEFINE_SPAPR_MACHINE(rhel760, "rhel7.6.0", true);
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
+/*
|
|
|
1bdc94 |
* pseries-rhel7.5.0
|
|
|
1bdc94 |
+ * like SPAPR_COMPAT_2_11 and SPAPR_COMPAT_2_10
|
|
|
1bdc94 |
+ * SPAPR_CAP_HTM already enabled in 7.4
|
|
|
1bdc94 |
+ *
|
|
|
1bdc94 |
*/
|
|
|
1bdc94 |
+#define SPAPR_COMPAT_RHEL7_5 \
|
|
|
1bdc94 |
+ HW_COMPAT_RHEL7_5 \
|
|
|
1bdc94 |
|
|
|
1bdc94 |
static void spapr_machine_rhel750_instance_options(MachineState *machine)
|
|
|
1bdc94 |
{
|
|
|
1bdc94 |
+ spapr_machine_rhel760_instance_options(machine);
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
static void spapr_machine_rhel750_class_options(MachineClass *mc)
|
|
|
1bdc94 |
{
|
|
|
1bdc94 |
- /* Defaults for the latest behaviour inherited from the base class */
|
|
|
1bdc94 |
+ spapr_machine_rhel760_class_options(mc);
|
|
|
1bdc94 |
+ SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_RHEL7_5);
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
-DEFINE_SPAPR_MACHINE(rhel750, "rhel7.5.0", true);
|
|
|
1bdc94 |
+DEFINE_SPAPR_MACHINE(rhel750, "rhel7.5.0", false);
|
|
|
1bdc94 |
|
|
|
1bdc94 |
/*
|
|
|
1bdc94 |
* pseries-rhel7.5.0-sxxm
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|