|
 |
9bac43 |
From 86ef5cd189077ab6a1a3b55ed844408c1ba8f75a Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: Laurent Vivier <lvivier@redhat.com>
|
|
|
9bac43 |
Date: Mon, 9 Oct 2017 14:23:16 +0200
|
|
|
9bac43 |
Subject: [PATCH 07/69] redhat: define pseries-rhel7.5.0 machine type
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
|
|
9bac43 |
Message-id: <20171009142318.6262-3-lvivier@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 77034
|
|
|
9bac43 |
O-Subject: [RHV7.5 qemu-kvm-rhev PATCH 2/4] redhat: define pseries-rhel7.5.0 machine type
|
|
|
9bac43 |
Bugzilla: 1478478
|
|
|
9bac43 |
RH-Acked-by: David Gibson <dgibson@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
As we don't support migration from PEGAS 1.0, pseries-rhel7.4.0alt is removed
|
|
|
9bac43 |
(replaced) in this patch.
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
hw/ppc/spapr.c | 29 ++++++++++++++++++++++-------
|
|
|
9bac43 |
1 file changed, 22 insertions(+), 7 deletions(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
|
|
|
9bac43 |
index 30b2c5b..cb317f8 100644
|
|
|
9bac43 |
--- a/hw/ppc/spapr.c
|
|
|
9bac43 |
+++ b/hw/ppc/spapr.c
|
|
|
9bac43 |
@@ -3946,32 +3946,47 @@ DEFINE_SPAPR_MACHINE(2_1, "2.1", false);
|
|
|
9bac43 |
#endif
|
|
|
9bac43 |
|
|
|
9bac43 |
/*
|
|
|
9bac43 |
- * pseries-rhel7.4.0alt
|
|
|
9bac43 |
+ * pseries-rhel7.5.0
|
|
|
9bac43 |
*/
|
|
|
9bac43 |
-static void spapr_machine_rhel740alt_instance_options(MachineState *machine)
|
|
|
9bac43 |
+
|
|
|
9bac43 |
+static void spapr_machine_rhel750_instance_options(MachineState *machine)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
-static void spapr_machine_rhel740alt_class_options(MachineClass *mc)
|
|
|
9bac43 |
+static void spapr_machine_rhel750_class_options(MachineClass *mc)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
/* Defaults for the latest behaviour inherited from the base class */
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
-DEFINE_SPAPR_MACHINE(rhel740alt, "rhel7.4.0alt", true);
|
|
|
9bac43 |
-
|
|
|
9bac43 |
+DEFINE_SPAPR_MACHINE(rhel750, "rhel7.5.0", true);
|
|
|
9bac43 |
|
|
|
9bac43 |
/*
|
|
|
9bac43 |
* pseries-rhel7.4.0
|
|
|
9bac43 |
+ * like SPAPR_COMPAT_2_9
|
|
|
9bac43 |
*/
|
|
|
9bac43 |
|
|
|
9bac43 |
+#define SPAPR_COMPAT_RHEL7_4 \
|
|
|
9bac43 |
+ HW_COMPAT_RHEL7_4 \
|
|
|
9bac43 |
+ { \
|
|
|
9bac43 |
+ .driver = TYPE_POWERPC_CPU, \
|
|
|
9bac43 |
+ .property = "pre-2.10-migration", \
|
|
|
9bac43 |
+ .value = "on", \
|
|
|
9bac43 |
+ }, \
|
|
|
9bac43 |
+
|
|
|
9bac43 |
static void spapr_machine_rhel740_instance_options(MachineState *machine)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
- spapr_machine_rhel740alt_instance_options(machine);
|
|
|
9bac43 |
+ spapr_machine_rhel750_instance_options(machine);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
static void spapr_machine_rhel740_class_options(MachineClass *mc)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
- spapr_machine_rhel740alt_class_options(mc);
|
|
|
9bac43 |
+ sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
|
|
|
9bac43 |
+
|
|
|
9bac43 |
+ spapr_machine_rhel750_class_options(mc);
|
|
|
9bac43 |
+ SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_RHEL7_4);
|
|
|
9bac43 |
+ mc->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
|
|
|
9bac43 |
+ smc->pre_2_10_has_unused_icps = true;
|
|
|
9bac43 |
+ smc->resize_hpt_default = SPAPR_RESIZE_HPT_DISABLED;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
DEFINE_SPAPR_MACHINE(rhel740, "rhel7.4.0", false);
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|