114 lines
3.3 KiB
Diff
114 lines
3.3 KiB
Diff
From 149cfc4ec6367978ad764a6d99ce143c0429b996 Mon Sep 17 00:00:00 2001
|
|
From: eabdullin <eabdullin@almalinux.org>
|
|
Date: Tue, 15 Jul 2025 15:00:43 +0300
|
|
Subject: [PATCH] Add AlmaLinux 9 to machine class options
|
|
|
|
---
|
|
hw/ppc/spapr.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++-
|
|
1 file changed, 82 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
|
|
index 29e66f1b3..1001e0f92 100644
|
|
--- a/hw/ppc/spapr.c
|
|
+++ b/hw/ppc/spapr.c
|
|
@@ -5425,6 +5425,87 @@ static void spapr_rhel_machine_default_class_options(MachineClass *mc)
|
|
mc->max_cpus = 384;
|
|
}
|
|
|
|
+static void spapr_rhel_machine_9_6_0_class_options(MachineClass *mc)
|
|
+{
|
|
+ SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
|
|
+
|
|
+ spapr_rhel_machine_default_class_options(mc);
|
|
+ compat_props_add(mc->compat_props, hw_compat_rhel_9_6,
|
|
+ hw_compat_rhel_9_6_len);
|
|
+ smc->pre_6_2_numa_affinity = true;
|
|
+ mc->smp_props.prefer_sockets = true;
|
|
+}
|
|
+
|
|
+DEFINE_SPAPR_MACHINE_AS_LATEST(9, 6, 0);
|
|
+
|
|
+static void spapr_rhel_machine_9_5_0_class_options(MachineClass *mc)
|
|
+{
|
|
+ spapr_rhel_machine_9_6_0_class_options(mc);
|
|
+ compat_props_add(mc->compat_props, hw_compat_rhel_9_5,
|
|
+ hw_compat_rhel_9_5_len);
|
|
+}
|
|
+
|
|
+DEFINE_SPAPR_MACHINE(9, 5, 0);
|
|
+
|
|
+static void spapr_rhel_machine_9_4_0_class_options(MachineClass *mc)
|
|
+{
|
|
+ spapr_rhel_machine_9_5_0_class_options(mc);
|
|
+ compat_props_add(mc->compat_props, hw_compat_rhel_9_4,
|
|
+ hw_compat_rhel_9_4_len);
|
|
+}
|
|
+
|
|
+DEFINE_SPAPR_MACHINE(9, 4, 0);
|
|
+
|
|
+static void spapr_rhel_machine_9_3_0_class_options(MachineClass *mc)
|
|
+{
|
|
+ spapr_rhel_machine_9_4_0_class_options(mc);
|
|
+ compat_props_add(mc->compat_props, hw_compat_rhel_9_3,
|
|
+ hw_compat_rhel_9_3_len);
|
|
+}
|
|
+
|
|
+DEFINE_SPAPR_MACHINE(9, 3, 0);
|
|
+
|
|
+static void spapr_rhel_machine_9_2_0_class_options(MachineClass *mc)
|
|
+{
|
|
+ spapr_rhel_machine_9_3_0_class_options(mc);
|
|
+ compat_props_add(mc->compat_props, hw_compat_rhel_9_2,
|
|
+ hw_compat_rhel_9_2_len);
|
|
+}
|
|
+
|
|
+DEFINE_SPAPR_MACHINE(9, 2, 0);
|
|
+
|
|
+static void spapr_rhel_machine_9_1_0_class_options(MachineClass *mc)
|
|
+{
|
|
+ spapr_rhel_machine_9_2_0_class_options(mc);
|
|
+ compat_props_add(mc->compat_props, hw_compat_rhel_9_1,
|
|
+ hw_compat_rhel_9_1_len);
|
|
+}
|
|
+
|
|
+DEFINE_SPAPR_MACHINE(9, 1, 0);
|
|
+
|
|
+static void spapr_rhel_machine_9_0_0_class_options(MachineClass *mc)
|
|
+{
|
|
+ spapr_rhel_machine_9_1_0_class_options(mc);
|
|
+ compat_props_add(mc->compat_props, hw_compat_rhel_9_0,
|
|
+ hw_compat_rhel_9_0_len);
|
|
+}
|
|
+
|
|
+DEFINE_SPAPR_MACHINE(9, 0, 0);
|
|
+
|
|
+static void spapr_rhel_machine_8_6_0_class_options(MachineClass *mc)
|
|
+{
|
|
+ SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
|
|
+
|
|
+ /* The default machine type must apply the RHEL specific defaults */
|
|
+ spapr_rhel_machine_default_class_options(mc);
|
|
+ compat_props_add(mc->compat_props, hw_compat_rhel_8_6,
|
|
+ hw_compat_rhel_8_6_len);
|
|
+ smc->pre_6_2_numa_affinity = true;
|
|
+ mc->smp_props.prefer_sockets = true;
|
|
+}
|
|
+
|
|
+DEFINE_SPAPR_MACHINE(8, 6, 0);
|
|
+
|
|
/*
|
|
* pseries-rhel8.5.0
|
|
* like pseries-6.0
|
|
@@ -5442,7 +5523,7 @@ static void spapr_rhel_machine_8_5_0_class_options(MachineClass *mc)
|
|
mc->smp_props.prefer_sockets = true;
|
|
}
|
|
|
|
-DEFINE_SPAPR_MACHINE_AS_LATEST(8, 5, 0);
|
|
+DEFINE_SPAPR_MACHINE(8, 5, 0);
|
|
|
|
/*
|
|
* pseries-rhel8.4.0
|
|
--
|
|
2.39.5 (Apple Git-154)
|
|
|