| Message ID | 20250512083948.39294-6-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/i386/pc: Remove deprecated 2.4 and 2.5 PC machines | expand |
On 5/12/2025 4:39 PM, Philippe Mathieu-Daudé wrote: > The hw_compat_2_4[] array was only used by the pc-q35-2.4 and > pc-i440fx-2.4 machines, which got removed. Remove it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > Reviewed-by: Zhao Liu <zhao1.liu@intel.com> Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com> > --- > include/hw/boards.h | 3 --- > hw/core/machine.c | 9 --------- > 2 files changed, 12 deletions(-) > > diff --git a/include/hw/boards.h b/include/hw/boards.h > index a7b1fcffae3..03e7cbeae82 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -866,7 +866,4 @@ extern const size_t hw_compat_2_6_len; > extern GlobalProperty hw_compat_2_5[]; > extern const size_t hw_compat_2_5_len; > > -extern GlobalProperty hw_compat_2_4[]; > -extern const size_t hw_compat_2_4_len; > - > #endif > diff --git a/hw/core/machine.c b/hw/core/machine.c > index ed01798d37c..d66b02b564c 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -292,15 +292,6 @@ GlobalProperty hw_compat_2_5[] = { > }; > const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5); > > -GlobalProperty hw_compat_2_4[] = { > - { "e1000", "extra_mac_registers", "off" }, > - { "virtio-pci", "x-disable-pcie", "on" }, > - { "virtio-pci", "migrate-extra", "off" }, > - { "fw_cfg_mem", "dma_enabled", "off" }, > - { "fw_cfg_io", "dma_enabled", "off" } > -}; > -const size_t hw_compat_2_4_len = G_N_ELEMENTS(hw_compat_2_4); > - > MachineState *current_machine; > > static char *machine_get_kernel(Object *obj, Error **errp)
diff --git a/include/hw/boards.h b/include/hw/boards.h index a7b1fcffae3..03e7cbeae82 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -866,7 +866,4 @@ extern const size_t hw_compat_2_6_len; extern GlobalProperty hw_compat_2_5[]; extern const size_t hw_compat_2_5_len; -extern GlobalProperty hw_compat_2_4[]; -extern const size_t hw_compat_2_4_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index ed01798d37c..d66b02b564c 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -292,15 +292,6 @@ GlobalProperty hw_compat_2_5[] = { }; const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5); -GlobalProperty hw_compat_2_4[] = { - { "e1000", "extra_mac_registers", "off" }, - { "virtio-pci", "x-disable-pcie", "on" }, - { "virtio-pci", "migrate-extra", "off" }, - { "fw_cfg_mem", "dma_enabled", "off" }, - { "fw_cfg_io", "dma_enabled", "off" } -}; -const size_t hw_compat_2_4_len = G_N_ELEMENTS(hw_compat_2_4); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp)