ppc-for-20250928 queue

[PULL 18/27] hw/intc/xics: Add missing call to register vmstate_icp_server

Posted by Harsh Prateek Bora 4 months, 1 week ago

From: Fabian Vogt <fvogt@suse.de>

An obsolete wrapper function with a workaround was removed entirely,
without restoring the call it wrapped.

Without this, the guest is stuck after savevm/loadvm.

Fixes: 24ee9229fe31 ("ppc/spapr: remove deprecated machine pseries-2.9")
Signed-off-by: Fabian Vogt <fvogt@suse.de>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Link: https://lore.kernel.org/qemu-devel/6187781.lOV4Wx5bFT@fvogt-thinkpad
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Gautam Menghani <gautam@linux.ibm.com>
Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Link: https://lore.kernel.org/r/20250819223905.2247-2-farosas@suse.de
Message-ID: <20250819223905.2247-2-farosas@suse.de>
---
 hw/intc/xics.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index d9a199e883..200710eb6c 100644
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -335,6 +335,8 @@ static void icp_realize(DeviceState *dev, Error **errp)
             return;
         }
     }
+
+    vmstate_register(NULL, icp->cs->cpu_index, &vmstate_icp_server, icp);
 }
 
 static void icp_unrealize(DeviceState *dev)
-- 
2.43.5

Re: [PULL 18/27] hw/intc/xics: Add missing call to register vmstate_icp_server

Posted by Michael Tokarev 4 months, 1 week ago

On 9/28/25 22:26, Harsh Prateek Bora wrote:
> From: Fabian Vogt <fvogt@suse.de>
> 
> An obsolete wrapper function with a workaround was removed entirely,
> without restoring the call it wrapped.
> 
> Without this, the guest is stuck after savevm/loadvm.
> 
> Fixes: 24ee9229fe31 ("ppc/spapr: remove deprecated machine pseries-2.9")
> Signed-off-by: Fabian Vogt <fvogt@suse.de>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Link: https://lore.kernel.org/qemu-devel/6187781.lOV4Wx5bFT@fvogt-thinkpad
> Signed-off-by: Fabiano Rosas <farosas@suse.de>
> Reviewed-by: Gautam Menghani <gautam@linux.ibm.com>
> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
> Link: https://lore.kernel.org/r/20250819223905.2247-2-farosas@suse.de
> Message-ID: <20250819223905.2247-2-farosas@suse.de>

I'm picking this up for both 10.1.x and 10.0.x stable qemu series.
Please let me know if I understood the previous discussion in a wrong
way and it should only be picked up for 10.1.x, but not for 10.0.x.

Thanks,

/mjt

>   hw/intc/xics.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/hw/intc/xics.c b/hw/intc/xics.c
> index d9a199e883..200710eb6c 100644
> --- a/hw/intc/xics.c
> +++ b/hw/intc/xics.c
> @@ -335,6 +335,8 @@ static void icp_realize(DeviceState *dev, Error **errp)
>               return;
>           }
>       }
> +
> +    vmstate_register(NULL, icp->cs->cpu_index, &vmstate_icp_server, icp);
>   }
>   
>   static void icp_unrealize(DeviceState *dev)

Re: [PULL 18/27] hw/intc/xics: Add missing call to register vmstate_icp_server

Posted by Harsh Prateek Bora 4 months, 1 week ago

Hi Michael,

On 9/30/25 01:02, Michael Tokarev wrote:
> On 9/28/25 22:26, Harsh Prateek Bora wrote:
>> From: Fabian Vogt <fvogt@suse.de>
>>
>> An obsolete wrapper function with a workaround was removed entirely,
>> without restoring the call it wrapped.
>>
>> Without this, the guest is stuck after savevm/loadvm.
>>
>> Fixes: 24ee9229fe31 ("ppc/spapr: remove deprecated machine pseries-2.9")
>> Signed-off-by: Fabian Vogt <fvogt@suse.de>
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> Link: 
>> https://lore.kernel.org/qemu-devel/6187781.lOV4Wx5bFT@fvogt-thinkpad
>> Signed-off-by: Fabiano Rosas <farosas@suse.de>
>> Reviewed-by: Gautam Menghani <gautam@linux.ibm.com>
>> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
>> Link: https://lore.kernel.org/r/20250819223905.2247-2-farosas@suse.de
>> Message-ID: <20250819223905.2247-2-farosas@suse.de>
> 
> I'm picking this up for both 10.1.x and 10.0.x stable qemu series.
> Please let me know if I understood the previous discussion in a wrong
> way and it should only be picked up for 10.1.x, but not for 10.0.x.

It's applicable for all releases where the commit specified in Fixes: 
(24ee9229fe31) is present.

Thanks
Harsh
> 
> Thanks,
> 
> /mjt
> 
>>   hw/intc/xics.c | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/hw/intc/xics.c b/hw/intc/xics.c
>> index d9a199e883..200710eb6c 100644
>> --- a/hw/intc/xics.c
>> +++ b/hw/intc/xics.c
>> @@ -335,6 +335,8 @@ static void icp_realize(DeviceState *dev, Error 
>> **errp)
>>               return;
>>           }
>>       }
>> +
>> +    vmstate_register(NULL, icp->cs->cpu_index, &vmstate_icp_server, 
>> icp);
>>   }
>>   static void icp_unrealize(DeviceState *dev)
>