hw/i386/pc: Remove deprecated 2.4 and 2.5 PC machines

[PATCH 01/21] hw/i386/pc: Remove unused pc_compat_2_3 declarations

Posted by Philippe Mathieu-Daudé 2 months, 2 weeks ago

We removed the implementations in commit 46a2bd52571
("hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine")
but forgot to remove the declarations. Do it now.

Fixes: 46a2bd52571 ("hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine")
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/hw/i386/pc.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index a558705cb9a..103b54301f8 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -302,9 +302,6 @@ extern const size_t pc_compat_2_5_len;
 extern GlobalProperty pc_compat_2_4[];
 extern const size_t pc_compat_2_4_len;
 
-extern GlobalProperty pc_compat_2_3[];
-extern const size_t pc_compat_2_3_len;
-
 #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \
     static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \
     { \
-- 
2.47.1

Re: [PATCH 01/21] hw/i386/pc: Remove unused pc_compat_2_3 declarations

Posted by Thomas Huth 2 months, 2 weeks ago

On 16/01/2025 00.22, Philippe Mathieu-Daudé wrote:
> We removed the implementations in commit 46a2bd52571
> ("hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine")
> but forgot to remove the declarations. Do it now.
> 
> Fixes: 46a2bd52571 ("hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine")
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/hw/i386/pc.h | 3 ---
>   1 file changed, 3 deletions(-)
> 
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index a558705cb9a..103b54301f8 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -302,9 +302,6 @@ extern const size_t pc_compat_2_5_len;
>   extern GlobalProperty pc_compat_2_4[];
>   extern const size_t pc_compat_2_4_len;
>   
> -extern GlobalProperty pc_compat_2_3[];
> -extern const size_t pc_compat_2_3_len;
> -
>   #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \
>       static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \
>       { \

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH 01/21] hw/i386/pc: Remove unused pc_compat_2_3 declarations

Posted by Michael Tokarev 2 months ago

17.01.2025 11:52, Thomas Huth wrote:
> On 16/01/2025 00.22, Philippe Mathieu-Daudé wrote:
>> We removed the implementations in commit 46a2bd52571
>> ("hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine")
>> but forgot to remove the declarations. Do it now.
>>
>> Fixes: 46a2bd52571 ("hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine")
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Thomas, such pick-ups from larger series may not be a good idea
for qemu-trivial in general.  But this one looks okay'ish since
the series is about 2.4 and 2.5 machines :)

Philippe, are you okay with merging this one through qemu-trivial?

Thanks,

/mjt

Re: [PATCH 01/21] hw/i386/pc: Remove unused pc_compat_2_3 declarations

Posted by Philippe Mathieu-Daudé 2 months ago

On 30/1/25 10:59, Michael Tokarev wrote:
> 17.01.2025 11:52, Thomas Huth wrote:
>> On 16/01/2025 00.22, Philippe Mathieu-Daudé wrote:
>>> We removed the implementations in commit 46a2bd52571
>>> ("hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine")
>>> but forgot to remove the declarations. Do it now.
>>>
>>> Fixes: 46a2bd52571 ("hw/i386/pc: Remove deprecated pc-i440fx-2.3 
>>> machine")
>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> 
> Thomas, such pick-ups from larger series may not be a good idea
> for qemu-trivial in general.  But this one looks okay'ish since
> the series is about 2.4 and 2.5 machines :)
> 
> Philippe, are you okay with merging this one through qemu-trivial?

Sure! Even appreciated :)

Re: [PATCH 01/21] hw/i386/pc: Remove unused pc_compat_2_3 declarations

Posted by Richard Henderson 2 months, 2 weeks ago

On 1/15/25 15:22, Philippe Mathieu-Daudé wrote:
> We removed the implementations in commit 46a2bd52571
> ("hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine")
> but forgot to remove the declarations. Do it now.
> 
> Fixes: 46a2bd52571 ("hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine")
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/hw/i386/pc.h | 3 ---
>   1 file changed, 3 deletions(-)
> 
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index a558705cb9a..103b54301f8 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -302,9 +302,6 @@ extern const size_t pc_compat_2_5_len;
>   extern GlobalProperty pc_compat_2_4[];
>   extern const size_t pc_compat_2_4_len;
>   
> -extern GlobalProperty pc_compat_2_3[];
> -extern const size_t pc_compat_2_3_len;
> -
>   #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \
>       static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \
>       { \

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Re: [PATCH 01/21] hw/i386/pc: Remove unused pc_compat_2_3 declarations

Posted by Daniel P. Berrangé 2 months, 2 weeks ago

On Thu, Jan 16, 2025 at 12:22:27AM +0100, Philippe Mathieu-Daudé wrote:
> We removed the implementations in commit 46a2bd52571
> ("hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine")
> but forgot to remove the declarations. Do it now.
> 
> Fixes: 46a2bd52571 ("hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine")
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>  include/hw/i386/pc.h | 3 ---
>  1 file changed, 3 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


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 :|