On 4/26/24 13:00, Aditya Gupta wrote:
Make Power11 as default cpu type for 'pseries' and 'powernv' machine type,
with Power11 being the newest supported Power processor in QEMU.
This is too early. We should merge Power11 support first, possibly in 9.1,
and then change default in a future release, 9.2, 10.0
Thanks,
C.
Cc: Cédric Le Goater <c...@kaod.org>
Cc: Daniel Henrique Barboza <danielhb...@gmail.com>
Cc: David Gibson <da...@gibson.dropbear.id.au>
Cc: Frédéric Barrat <fbar...@linux.ibm.com>
Cc: Harsh Prateek Bora <hars...@linux.ibm.com>
Cc: Mahesh J Salgaonkar <mah...@linux.ibm.com>
Cc: Madhavan Srinivasan <ma...@linux.ibm.com>
Cc: Nicholas Piggin <npig...@gmail.com>
Signed-off-by: Aditya Gupta <adit...@linux.ibm.com>
---
hw/ppc/pnv.c | 4 ++--
hw/ppc/spapr.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 06e272f3bdd3..0c5a6bc424af 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -2531,8 +2531,6 @@ static void pnv_machine_p10_common_class_init(ObjectClass
*oc, void *data)
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power10_v2.0");
compat_props_add(mc->compat_props, phb_compat, G_N_ELEMENTS(phb_compat));
- mc->alias = "powernv";
-
pmc->compat = compat;
pmc->compat_size = sizeof(compat);
pmc->dt_power_mgt = pnv_dt_power_mgt;
@@ -2569,6 +2567,8 @@ static void pnv_machine_power11_class_init(ObjectClass
*oc, void *data)
/* do power10_class_init as p11 core is same as p10 */
pnv_machine_p10_common_class_init(oc, data);
+ mc->alias = "powernv";
+
mc->desc = "IBM PowerNV (Non-Virtualized) POWER11";
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power11");
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index d2d1e310a3be..1c3e2da8e9e4 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -4698,7 +4698,7 @@ static void spapr_machine_class_init(ObjectClass *oc,
void *data)
smc->dr_lmb_enabled = true;
smc->update_dt_enabled = true;
- mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power10_v2.0");
+ mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power11");
mc->has_hotpluggable_cpus = true;
mc->nvdimm_supported = true;
smc->resize_hpt_default = SPAPR_RESIZE_HPT_ENABLED;