|
 |
26ba25 |
From 7574808ac154ac9ddf8264bf14e775fab96d0cac Mon Sep 17 00:00:00 2001
|
|
|
26ba25 |
From: Laurent Vivier <lvivier@redhat.com>
|
|
|
26ba25 |
Date: Thu, 7 Jun 2018 12:55:12 +0000
|
|
|
26ba25 |
Subject: redhat: define pseries-rhel7.6.0 machine types
|
|
|
26ba25 |
|
|
|
26ba25 |
BREW: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=16632825
|
|
|
26ba25 |
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1585651
|
|
|
26ba25 |
BRANCH: rhel8/master-2.12.0
|
|
|
26ba25 |
UPSTREAM: downsream only
|
|
|
26ba25 |
Tested: minimal, as the change is the same as for RHEL7.6
|
|
|
26ba25 |
Tested ping-pong migration between two
|
|
|
26ba25 |
pseries-rhel7.6.0/qemu-kvm-2.12.0 and with
|
|
|
26ba25 |
pseries-rhel7.5.0/qemu-kvm-rhev-2.10
|
|
|
26ba25 |
|
|
|
26ba25 |
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
26ba25 |
---
|
|
|
26ba25 |
hw/ppc/spapr.c | 26 ++++++++++++++++++++++++--
|
|
|
26ba25 |
1 file changed, 24 insertions(+), 2 deletions(-)
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
|
|
|
26ba25 |
index c751111..c3f08b3 100644
|
|
|
26ba25 |
--- a/hw/ppc/spapr.c
|
|
|
26ba25 |
+++ b/hw/ppc/spapr.c
|
|
|
26ba25 |
@@ -4352,19 +4352,41 @@ DEFINE_SPAPR_MACHINE(2_1, "2.1", false);
|
|
|
26ba25 |
#endif
|
|
|
26ba25 |
|
|
|
26ba25 |
/*
|
|
|
26ba25 |
+ * pseries-rhel7.6.0
|
|
|
26ba25 |
+ */
|
|
|
26ba25 |
+
|
|
|
26ba25 |
+static void spapr_machine_rhel760_instance_options(MachineState *machine)
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
+
|
|
|
26ba25 |
+static void spapr_machine_rhel760_class_options(MachineClass *mc)
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
+ /* Defaults for the latest behaviour inherited from the base class */
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
+
|
|
|
26ba25 |
+DEFINE_SPAPR_MACHINE(rhel760, "rhel7.6.0", true);
|
|
|
26ba25 |
+
|
|
|
26ba25 |
+/*
|
|
|
26ba25 |
* pseries-rhel7.5.0
|
|
|
26ba25 |
+ * like SPAPR_COMPAT_2_11 and SPAPR_COMPAT_2_10
|
|
|
26ba25 |
+ * SPAPR_CAP_HTM already enabled in 7.4
|
|
|
26ba25 |
+ *
|
|
|
26ba25 |
*/
|
|
|
26ba25 |
+#define SPAPR_COMPAT_RHEL7_5 \
|
|
|
26ba25 |
+ HW_COMPAT_RHEL7_5 \
|
|
|
26ba25 |
|
|
|
26ba25 |
static void spapr_machine_rhel750_instance_options(MachineState *machine)
|
|
|
26ba25 |
{
|
|
|
26ba25 |
+ spapr_machine_rhel760_instance_options(machine);
|
|
|
26ba25 |
}
|
|
|
26ba25 |
|
|
|
26ba25 |
static void spapr_machine_rhel750_class_options(MachineClass *mc)
|
|
|
26ba25 |
{
|
|
|
26ba25 |
- /* Defaults for the latest behaviour inherited from the base class */
|
|
|
26ba25 |
+ spapr_machine_rhel760_class_options(mc);
|
|
|
26ba25 |
+ SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_RHEL7_5);
|
|
|
26ba25 |
}
|
|
|
26ba25 |
|
|
|
26ba25 |
-DEFINE_SPAPR_MACHINE(rhel750, "rhel7.5.0", true);
|
|
|
26ba25 |
+DEFINE_SPAPR_MACHINE(rhel750, "rhel7.5.0", false);
|
|
|
26ba25 |
|
|
|
26ba25 |
/*
|
|
|
26ba25 |
* pseries-rhel7.5.0-sxxm
|
|
|
26ba25 |
--
|
|
|
26ba25 |
1.8.3.1
|
|
|
26ba25 |
|