Blob Blame Raw
From 7574808ac154ac9ddf8264bf14e775fab96d0cac Mon Sep 17 00:00:00 2001
From: Laurent Vivier <lvivier@redhat.com>
Date: Thu, 7 Jun 2018 12:55:12 +0000
Subject: redhat: define pseries-rhel7.6.0 machine types

BREW:     https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=16632825
BZ:       https://bugzilla.redhat.com/show_bug.cgi?id=1585651
BRANCH:   rhel8/master-2.12.0
UPSTREAM: downsream only
Tested:   minimal, as the change is the same as for RHEL7.6
          Tested ping-pong migration between two
          pseries-rhel7.6.0/qemu-kvm-2.12.0 and with
          pseries-rhel7.5.0/qemu-kvm-rhev-2.10

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
 hw/ppc/spapr.c | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index c751111..c3f08b3 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -4352,19 +4352,41 @@ DEFINE_SPAPR_MACHINE(2_1, "2.1", false);
 #endif
 
 /*
+ * pseries-rhel7.6.0
+ */
+
+static void spapr_machine_rhel760_instance_options(MachineState *machine)
+{
+}
+
+static void spapr_machine_rhel760_class_options(MachineClass *mc)
+{
+    /* Defaults for the latest behaviour inherited from the base class */
+}
+
+DEFINE_SPAPR_MACHINE(rhel760, "rhel7.6.0", true);
+
+/*
  * pseries-rhel7.5.0
+ * like SPAPR_COMPAT_2_11 and SPAPR_COMPAT_2_10
+ * SPAPR_CAP_HTM already enabled in 7.4
+ *
  */
+#define SPAPR_COMPAT_RHEL7_5                                           \
+    HW_COMPAT_RHEL7_5                                                  \
 
 static void spapr_machine_rhel750_instance_options(MachineState *machine)
 {
+    spapr_machine_rhel760_instance_options(machine);
 }
 
 static void spapr_machine_rhel750_class_options(MachineClass *mc)
 {
-    /* Defaults for the latest behaviour inherited from the base class */
+    spapr_machine_rhel760_class_options(mc);
+    SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_RHEL7_5);
 }
 
-DEFINE_SPAPR_MACHINE(rhel750, "rhel7.5.0", true);
+DEFINE_SPAPR_MACHINE(rhel750, "rhel7.5.0", false);
 
 /*
  * pseries-rhel7.5.0-sxxm
-- 
1.8.3.1