[PATCH 2/4] hw/i386/pc: Remove pc_compat_3_0[] array

Philippe Mathieu-Daudé posted 4 patches 1 month ago
Maintainers: Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Zhao Liu <zhao1.liu@intel.com>, "Michael S. Tsirkin" <mst@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Marcelo Tosatti <mtosatti@redhat.com>
[PATCH 2/4] hw/i386/pc: Remove pc_compat_3_0[] array
Posted by Philippe Mathieu-Daudé 1 month ago
The pc_compat_3_0[] array was only used by the pc-q35-3.0
and pc-i440fx-3.0 machines, which got removed. Remove it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/hw/i386/pc.h | 3 ---
 hw/i386/pc.c         | 7 -------
 2 files changed, 10 deletions(-)

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 113813c07d7..5623660f5dd 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -277,9 +277,6 @@ extern const size_t pc_compat_4_0_len;
 extern GlobalProperty pc_compat_3_1[];
 extern const size_t pc_compat_3_1_len;
 
-extern GlobalProperty pc_compat_3_0[];
-extern const size_t pc_compat_3_0_len;
-
 #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \
     static void pc_machine_##suffix##_class_init(ObjectClass *oc, \
                                                  const void *data) \
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 819e729a6e3..a38634e3577 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -214,13 +214,6 @@ GlobalProperty pc_compat_3_1[] = {
 };
 const size_t pc_compat_3_1_len = G_N_ELEMENTS(pc_compat_3_1);
 
-GlobalProperty pc_compat_3_0[] = {
-    { TYPE_X86_CPU, "x-hv-synic-kvm-only", "on" },
-    { "Skylake-Server" "-" TYPE_X86_CPU, "pku", "off" },
-    { "Skylake-Server-IBRS" "-" TYPE_X86_CPU, "pku", "off" },
-};
-const size_t pc_compat_3_0_len = G_N_ELEMENTS(pc_compat_3_0);
-
 /*
  * @PC_FW_DATA:
  * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables
-- 
2.52.0


Re: [PATCH 2/4] hw/i386/pc: Remove pc_compat_3_0[] array
Posted by Zhao Liu 1 month ago
On Sat, Mar 07, 2026 at 04:00:40PM +0100, Philippe Mathieu-Daudé wrote:
> Date: Sat,  7 Mar 2026 16:00:40 +0100
> From: Philippe Mathieu-Daudé <philmd@linaro.org>
> Subject: [PATCH 2/4] hw/i386/pc: Remove pc_compat_3_0[] array
> X-Mailer: git-send-email 2.52.0
> 
> The pc_compat_3_0[] array was only used by the pc-q35-3.0
> and pc-i440fx-3.0 machines, which got removed. Remove it.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>  include/hw/i386/pc.h | 3 ---
>  hw/i386/pc.c         | 7 -------
>  2 files changed, 10 deletions(-)

Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Re: [PATCH 2/4] hw/i386/pc: Remove pc_compat_3_0[] array
Posted by Thomas Huth 1 month ago
On 07/03/2026 16.00, Philippe Mathieu-Daudé wrote:
> The pc_compat_3_0[] array was only used by the pc-q35-3.0
> and pc-i440fx-3.0 machines, which got removed. Remove it.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/hw/i386/pc.h | 3 ---
>   hw/i386/pc.c         | 7 -------
>   2 files changed, 10 deletions(-)
> 
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 113813c07d7..5623660f5dd 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -277,9 +277,6 @@ extern const size_t pc_compat_4_0_len;
>   extern GlobalProperty pc_compat_3_1[];
>   extern const size_t pc_compat_3_1_len;
>   
> -extern GlobalProperty pc_compat_3_0[];
> -extern const size_t pc_compat_3_0_len;
> -
>   #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \
>       static void pc_machine_##suffix##_class_init(ObjectClass *oc, \
>                                                    const void *data) \
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 819e729a6e3..a38634e3577 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -214,13 +214,6 @@ GlobalProperty pc_compat_3_1[] = {
>   };
>   const size_t pc_compat_3_1_len = G_N_ELEMENTS(pc_compat_3_1);
>   
> -GlobalProperty pc_compat_3_0[] = {
> -    { TYPE_X86_CPU, "x-hv-synic-kvm-only", "on" },
> -    { "Skylake-Server" "-" TYPE_X86_CPU, "pku", "off" },
> -    { "Skylake-Server-IBRS" "-" TYPE_X86_CPU, "pku", "off" },
> -};
> -const size_t pc_compat_3_0_len = G_N_ELEMENTS(pc_compat_3_0);
> -
>   /*
>    * @PC_FW_DATA:
>    * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables

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


Re: [PATCH 2/4] hw/i386/pc: Remove pc_compat_3_0[] array
Posted by noreply77-demartz@thinocorp.com 1 month ago
   - Philippe propuso eliminar la matriz pc_compat_3_0[] del código i386/pc.
   - Thomas Huth revisó y aprobó el parche propuesto por Philippe.





sales@thinocorp.com

El dom, 8 de mar de 2026, 05:37, Thomas Huth <thuth@redhat.com> escribió:

> On 07/03/2026 16.00, Philippe Mathieu-Daudé wrote:
> > The pc_compat_3_0[] array was only used by the pc-q35-3.0
> > and pc-i440fx-3.0 machines, which got removed. Remove it.
> >
> > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> > ---
> >   include/hw/i386/pc.h | 3 ---
> >   hw/i386/pc.c         | 7 -------
> >   2 files changed, 10 deletions(-)
> >
> > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> > index 113813c07d7..5623660f5dd 100644
> > --- a/include/hw/i386/pc.h
> > +++ b/include/hw/i386/pc.h
> > @@ -277,9 +277,6 @@ extern const size_t pc_compat_4_0_len;
> >   extern GlobalProperty pc_compat_3_1[];
> >   extern const size_t pc_compat_3_1_len;
> >
> > -extern GlobalProperty pc_compat_3_0[];
> > -extern const size_t pc_compat_3_0_len;
> > -
> >   #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \
> >       static void pc_machine_##suffix##_class_init(ObjectClass *oc, \
> >                                                    const void *data) \
> > diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> > index 819e729a6e3..a38634e3577 100644
> > --- a/hw/i386/pc.c
> > +++ b/hw/i386/pc.c
> > @@ -214,13 +214,6 @@ GlobalProperty pc_compat_3_1[] = {
> >   };
> >   const size_t pc_compat_3_1_len = G_N_ELEMENTS(pc_compat_3_1);
> >
> > -GlobalProperty pc_compat_3_0[] = {
> > -    { TYPE_X86_CPU, "x-hv-synic-kvm-only", "on" },
> > -    { "Skylake-Server" "-" TYPE_X86_CPU, "pku", "off" },
> > -    { "Skylake-Server-IBRS" "-" TYPE_X86_CPU, "pku", "off" },
> > -};
> > -const size_t pc_compat_3_0_len = G_N_ELEMENTS(pc_compat_3_0);
> > -
> >   /*
> >    * @PC_FW_DATA:
> >    * Size of the chunk of memory at the top of RAM for the BIOS ACPI
> tables
>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
>
>
>