* [PATCH] ppc/spapr: fix default cpu for pre-10.0 machines.
@ 2025-03-12 5:58 Harsh Prateek Bora
2025-03-12 10:09 ` Philippe Mathieu-Daudé
2025-03-13 9:32 ` Daniel P. Berrangé
0 siblings, 2 replies; 6+ messages in thread
From: Harsh Prateek Bora @ 2025-03-12 5:58 UTC (permalink / raw)
To: qemu-devel, qemu-ppc; +Cc: npiggin
When POWER10 CPU was made as default, we missed keeping POWER9 as
default for older pseries releases (pre-10.0) at that time.
This caused breakge in default cpu evaluation for older pseries
machines and hence this fix.
Fixes: 51113013f3 ("ppc/spapr: change pseries machine default to POWER10 CPU")
Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
---
hw/ppc/spapr.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index c15340a58d..b31a91e2e2 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -4748,6 +4748,7 @@ static void spapr_machine_9_2_class_options(MachineClass *mc)
{
spapr_machine_10_0_class_options(mc);
compat_props_add(mc->compat_props, hw_compat_9_2, hw_compat_9_2_len);
+ mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power9_v2.2");
}
DEFINE_SPAPR_MACHINE(9, 2);
--
2.43.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] ppc/spapr: fix default cpu for pre-10.0 machines.
2025-03-12 5:58 [PATCH] ppc/spapr: fix default cpu for pre-10.0 machines Harsh Prateek Bora
@ 2025-03-12 10:09 ` Philippe Mathieu-Daudé
2025-03-12 10:20 ` Harsh Prateek Bora
2025-03-13 9:32 ` Daniel P. Berrangé
1 sibling, 1 reply; 6+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-03-12 10:09 UTC (permalink / raw)
To: Harsh Prateek Bora, qemu-devel, qemu-ppc; +Cc: npiggin, Daniel P. Berrangé
On 12/3/25 06:58, Harsh Prateek Bora wrote:
> When POWER10 CPU was made as default, we missed keeping POWER9 as
> default for older pseries releases (pre-10.0) at that time.
> This caused breakge in default cpu evaluation for older pseries
> machines and hence this fix.
>
Should we also include:
Cc: qemu-stable@nongnu.org
?
> Fixes: 51113013f3 ("ppc/spapr: change pseries machine default to POWER10 CPU")
> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
> ---
> hw/ppc/spapr.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index c15340a58d..b31a91e2e2 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4748,6 +4748,7 @@ static void spapr_machine_9_2_class_options(MachineClass *mc)
> {
> spapr_machine_10_0_class_options(mc);
> compat_props_add(mc->compat_props, hw_compat_9_2, hw_compat_9_2_len);
> + mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power9_v2.2");
This is confusing because v9.2 has already been released with that...
> }
>
> DEFINE_SPAPR_MACHINE(9, 2);
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ppc/spapr: fix default cpu for pre-10.0 machines.
2025-03-12 10:09 ` Philippe Mathieu-Daudé
@ 2025-03-12 10:20 ` Harsh Prateek Bora
2025-03-13 4:45 ` Harsh Prateek Bora
0 siblings, 1 reply; 6+ messages in thread
From: Harsh Prateek Bora @ 2025-03-12 10:20 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel, qemu-ppc
Cc: npiggin, Daniel P. Berrangé
On 3/12/25 15:39, Philippe Mathieu-Daudé wrote:
> On 12/3/25 06:58, Harsh Prateek Bora wrote:
>> When POWER10 CPU was made as default, we missed keeping POWER9 as
>> default for older pseries releases (pre-10.0) at that time.
>> This caused breakge in default cpu evaluation for older pseries
>> machines and hence this fix.
>>
>
> Should we also include:
>
> Cc: qemu-stable@nongnu.org
>
> ?
>
I guess so. Not sure if we need a patch v2 for just that.
>> Fixes: 51113013f3 ("ppc/spapr: change pseries machine default to
>> POWER10 CPU")
>> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
>> ---
>> hw/ppc/spapr.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
>> index c15340a58d..b31a91e2e2 100644
>> --- a/hw/ppc/spapr.c
>> +++ b/hw/ppc/spapr.c
>> @@ -4748,6 +4748,7 @@ static void
>> spapr_machine_9_2_class_options(MachineClass *mc)
>> {
>> spapr_machine_10_0_class_options(mc);
>> compat_props_add(mc->compat_props, hw_compat_9_2,
>> hw_compat_9_2_len);
>> + mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power9_v2.2");
>
> This is confusing because v9.2 has already been released with that...
I think it still needs to be fixed for v9.2 (and older) if someone wants
to use pseries-9.2 (and older) with future releases.
Thanks
Harsh
>
>> }
>> DEFINE_SPAPR_MACHINE(9, 2);
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ppc/spapr: fix default cpu for pre-10.0 machines.
2025-03-12 10:20 ` Harsh Prateek Bora
@ 2025-03-13 4:45 ` Harsh Prateek Bora
0 siblings, 0 replies; 6+ messages in thread
From: Harsh Prateek Bora @ 2025-03-13 4:45 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel, qemu-ppc
Cc: npiggin, Daniel P. Berrangé
On 3/12/25 15:50, Harsh Prateek Bora wrote:
>
>
> On 3/12/25 15:39, Philippe Mathieu-Daudé wrote:
>> On 12/3/25 06:58, Harsh Prateek Bora wrote:
>>> When POWER10 CPU was made as default, we missed keeping POWER9 as
>>> default for older pseries releases (pre-10.0) at that time.
>>> This caused breakge in default cpu evaluation for older pseries
>>> machines and hence this fix.
>>>
>>
>> Should we also include:
>>
>> Cc: qemu-stable@nongnu.org
>>
>> ?
>>
>
> I guess so. Not sure if we need a patch v2 for just that.
>
>>> Fixes: 51113013f3 ("ppc/spapr: change pseries machine default to
>>> POWER10 CPU")
>>> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
>>> ---
>>> hw/ppc/spapr.c | 1 +
>>> 1 file changed, 1 insertion(+)
>>>
>>> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
>>> index c15340a58d..b31a91e2e2 100644
>>> --- a/hw/ppc/spapr.c
>>> +++ b/hw/ppc/spapr.c
>>> @@ -4748,6 +4748,7 @@ static void
>>> spapr_machine_9_2_class_options(MachineClass *mc)
>>> {
>>> spapr_machine_10_0_class_options(mc);
>>> compat_props_add(mc->compat_props, hw_compat_9_2,
>>> hw_compat_9_2_len);
>>> + mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power9_v2.2");
>>
>> This is confusing because v9.2 has already been released with that...
>
> I think it still needs to be fixed for v9.2 (and older) if someone wants
> to use pseries-9.2 (and older) with future releases.
Gave it another thought. May be moving the default to v9.1 could be
relatively better. 9.2 stable shall get the fix for pre-9.2 but 9.2
default need not change.
Nick, Daniel, comments?
Thanks
Harsh
>
> Thanks
> Harsh
>
>>
>>> }
>>> DEFINE_SPAPR_MACHINE(9, 2);
>>
>>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ppc/spapr: fix default cpu for pre-10.0 machines.
2025-03-12 5:58 [PATCH] ppc/spapr: fix default cpu for pre-10.0 machines Harsh Prateek Bora
2025-03-12 10:09 ` Philippe Mathieu-Daudé
@ 2025-03-13 9:32 ` Daniel P. Berrangé
2025-03-13 9:49 ` Harsh Prateek Bora
1 sibling, 1 reply; 6+ messages in thread
From: Daniel P. Berrangé @ 2025-03-13 9:32 UTC (permalink / raw)
To: Harsh Prateek Bora; +Cc: qemu-devel, qemu-ppc, npiggin
On Wed, Mar 12, 2025 at 11:28:04AM +0530, Harsh Prateek Bora wrote:
> When POWER10 CPU was made as default, we missed keeping POWER9 as
> default for older pseries releases (pre-10.0) at that time.
> This caused breakge in default cpu evaluation for older pseries
> machines and hence this fix.
>
> Fixes: 51113013f3 ("ppc/spapr: change pseries machine default to POWER10 CPU")
> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
> ---
> hw/ppc/spapr.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index c15340a58d..b31a91e2e2 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4748,6 +4748,7 @@ static void spapr_machine_9_2_class_options(MachineClass *mc)
> {
> spapr_machine_10_0_class_options(mc);
> compat_props_add(mc->compat_props, hw_compat_9_2, hw_compat_9_2_len);
> + mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power9_v2.2");
> }
This doesn't make sense.
AFAICT, the commit 51113013f3 was introduced in the QEMU 9.0.0 release,
so it is correct that every machine from pseries-9.0 and newer had the
POWER10 CPU model.
What broke were the machines that already existed prior to the
9.0.0 release, whose default CPU got changed. IOW, the pseries-8.2
and earlier machines.
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ppc/spapr: fix default cpu for pre-10.0 machines.
2025-03-13 9:32 ` Daniel P. Berrangé
@ 2025-03-13 9:49 ` Harsh Prateek Bora
0 siblings, 0 replies; 6+ messages in thread
From: Harsh Prateek Bora @ 2025-03-13 9:49 UTC (permalink / raw)
To: Daniel P. Berrangé
Cc: qemu-devel, qemu-ppc, npiggin, Philippe Mathieu-Daudé
On 3/13/25 15:02, Daniel P. Berrangé wrote:
> On Wed, Mar 12, 2025 at 11:28:04AM +0530, Harsh Prateek Bora wrote:
>> When POWER10 CPU was made as default, we missed keeping POWER9 as
>> default for older pseries releases (pre-10.0) at that time.
>> This caused breakge in default cpu evaluation for older pseries
>> machines and hence this fix.
>>
>> Fixes: 51113013f3 ("ppc/spapr: change pseries machine default to POWER10 CPU")
>> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
>> ---
>> hw/ppc/spapr.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
>> index c15340a58d..b31a91e2e2 100644
>> --- a/hw/ppc/spapr.c
>> +++ b/hw/ppc/spapr.c
>> @@ -4748,6 +4748,7 @@ static void spapr_machine_9_2_class_options(MachineClass *mc)
>> {
>> spapr_machine_10_0_class_options(mc);
>> compat_props_add(mc->compat_props, hw_compat_9_2, hw_compat_9_2_len);
>> + mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power9_v2.2");
>> }
>
> This doesn't make sense.
>
> AFAICT, the commit 51113013f3 was introduced in the QEMU 9.0.0 release,
> so it is correct that every machine from pseries-9.0 and newer had the
> POWER10 CPU model.
>
> What broke were the machines that already existed prior to the
> 9.0.0 release, whose default CPU got changed. IOW, the pseries-8.2
> and earlier machines.
Thanks Daniel for catching this.
I should have checked using git tags. I have posted v2 here:
https://lore.kernel.org/qemu-devel/20250313094705.2361997-1-harshpb@linux.ibm.com/T/#u
regards,
Harsh
>
>
> With regards,
> Daniel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-03-13 9:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-12 5:58 [PATCH] ppc/spapr: fix default cpu for pre-10.0 machines Harsh Prateek Bora
2025-03-12 10:09 ` Philippe Mathieu-Daudé
2025-03-12 10:20 ` Harsh Prateek Bora
2025-03-13 4:45 ` Harsh Prateek Bora
2025-03-13 9:32 ` Daniel P. Berrangé
2025-03-13 9:49 ` Harsh Prateek Bora
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).