68 lines
2.1 KiB
Diff
68 lines
2.1 KiB
Diff
|
From 1194549a01a472b9ce21819cd32fe253d6263cd6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Greg Kurz <gkurz@redhat.com>
|
||
|
|
Date: Mon, 10 May 2021 15:37:40 -0400
|
||
|
|
Subject: [PATCH 08/15] redhat: Define pseries-rhel8.5.0 machine type
|
||
|
|
|
||
|
|
RH-Author: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-MergeRequest: 5: Synchronize RHEL-AV 8.5 release 18 to RHEL 9 Beta
|
||
|
|
RH-Commit: [3/12] accc2ed549b94360bc6ab180c4266466816f122e (mrezanin/centos-src-qemu-kvm)
|
||
|
|
RH-Bugzilla: 1957194
|
||
|
|
RH-Acked-by: Danilo Cesar Lemes de Paula <ddepaula@redhat.com>
|
||
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
RH-Acked-by: Greg Kurz <gkurz@redhat.com>
|
||
|
|
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
|
||
|
|
Note that the compat entries for 8.4.0 were already wired up
|
||
|
|
in the rhel-8.4.0 machine type.
|
||
|
|
|
||
|
|
Signed-off-by: Greg Kurz <gkurz@redhat.com>
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
---
|
||
|
|
hw/ppc/spapr.c | 18 +++++++++++++++---
|
||
|
|
1 file changed, 15 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
|
||
|
|
index f9e8dfdfc9..653574ba91 100644
|
||
|
|
--- a/hw/ppc/spapr.c
|
||
|
|
+++ b/hw/ppc/spapr.c
|
||
|
|
@@ -5083,6 +5083,19 @@ static void spapr_machine_rhel_default_class_options(MachineClass *mc)
|
||
|
|
mc->max_cpus = 384;
|
||
|
|
}
|
||
|
|
|
||
|
|
+/*
|
||
|
|
+ * pseries-rhel8.5.0
|
||
|
|
+ * like pseries-6.0
|
||
|
|
+ */
|
||
|
|
+
|
||
|
|
+static void spapr_machine_rhel850_class_options(MachineClass *mc)
|
||
|
|
+{
|
||
|
|
+ /* The default machine type must apply the RHEL specific defaults */
|
||
|
|
+ spapr_machine_rhel_default_class_options(mc);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+DEFINE_SPAPR_MACHINE(rhel850, "rhel8.5.0", true);
|
||
|
|
+
|
||
|
|
/*
|
||
|
|
* pseries-rhel8.4.0
|
||
|
|
* like pseries-5.2
|
||
|
|
@@ -5090,13 +5103,12 @@ static void spapr_machine_rhel_default_class_options(MachineClass *mc)
|
||
|
|
|
||
|
|
static void spapr_machine_rhel840_class_options(MachineClass *mc)
|
||
|
|
{
|
||
|
|
- /* The default machine type must apply the RHEL specific defaults */
|
||
|
|
- spapr_machine_rhel_default_class_options(mc);
|
||
|
|
+ spapr_machine_rhel850_class_options(mc);
|
||
|
|
compat_props_add(mc->compat_props, hw_compat_rhel_8_4,
|
||
|
|
hw_compat_rhel_8_4_len);
|
||
|
|
}
|
||
|
|
|
||
|
|
-DEFINE_SPAPR_MACHINE(rhel840, "rhel8.4.0", true);
|
||
|
|
+DEFINE_SPAPR_MACHINE(rhel840, "rhel8.4.0", false);
|
||
|
|
|
||
|
|
/*
|
||
|
|
* pseries-rhel8.3.0
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|