| Message ID | 20250501210456.89071-6-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/i386/pc: Remove deprecated 2.8 and 2.9 PC machines | expand |
On Thu, 1 May 2025 23:04:43 +0200 Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > The hw_compat_2_8[] array was only used by the pc-q35-2.8 and > pc-i440fx-2.8 machines, which got removed. Remove it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > include/hw/boards.h | 3 --- > hw/core/machine.c | 14 -------------- > 2 files changed, 17 deletions(-) > > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 77707c4376a..84bd3735c42 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -835,7 +835,4 @@ extern const size_t hw_compat_2_10_len; > extern GlobalProperty hw_compat_2_9[]; > extern const size_t hw_compat_2_9_len; > > -extern GlobalProperty hw_compat_2_8[]; > -extern const size_t hw_compat_2_8_len; > - > #endif > diff --git a/hw/core/machine.c b/hw/core/machine.c > index bde19a2ff67..bc0606cf740 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -252,20 +252,6 @@ GlobalProperty hw_compat_2_9[] = { > }; > const size_t hw_compat_2_9_len = G_N_ELEMENTS(hw_compat_2_9); > > -GlobalProperty hw_compat_2_8[] = { > - { "fw_cfg_mem", "x-file-slots", "0x10" }, > - { "fw_cfg_io", "x-file-slots", "0x10" }, > - { "pflash_cfi01", "old-multiple-chip-handling", "on" }, > - { "pci-bridge", "shpc", "on" }, > - { TYPE_PCI_DEVICE, "x-pcie-extcap-init", "off" }, > - { "virtio-pci", "x-pcie-deverr-init", "off" }, > - { "virtio-pci", "x-pcie-lnkctl-init", "off" }, > - { "virtio-pci", "x-pcie-pm-init", "off" }, > - { "cirrus-vga", "vgamem_mb", "8" }, > - { "isa-cirrus-vga", "vgamem_mb", "8" }, > -}; > -const size_t hw_compat_2_8_len = G_N_ELEMENTS(hw_compat_2_8); > - > 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 77707c4376a..84bd3735c42 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -835,7 +835,4 @@ extern const size_t hw_compat_2_10_len; extern GlobalProperty hw_compat_2_9[]; extern const size_t hw_compat_2_9_len; -extern GlobalProperty hw_compat_2_8[]; -extern const size_t hw_compat_2_8_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index bde19a2ff67..bc0606cf740 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -252,20 +252,6 @@ GlobalProperty hw_compat_2_9[] = { }; const size_t hw_compat_2_9_len = G_N_ELEMENTS(hw_compat_2_9); -GlobalProperty hw_compat_2_8[] = { - { "fw_cfg_mem", "x-file-slots", "0x10" }, - { "fw_cfg_io", "x-file-slots", "0x10" }, - { "pflash_cfi01", "old-multiple-chip-handling", "on" }, - { "pci-bridge", "shpc", "on" }, - { TYPE_PCI_DEVICE, "x-pcie-extcap-init", "off" }, - { "virtio-pci", "x-pcie-deverr-init", "off" }, - { "virtio-pci", "x-pcie-lnkctl-init", "off" }, - { "virtio-pci", "x-pcie-pm-init", "off" }, - { "cirrus-vga", "vgamem_mb", "8" }, - { "isa-cirrus-vga", "vgamem_mb", "8" }, -}; -const size_t hw_compat_2_8_len = G_N_ELEMENTS(hw_compat_2_8); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp)
The hw_compat_2_8[] array was only used by the pc-q35-2.8 and pc-i440fx-2.8 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/hw/boards.h | 3 --- hw/core/machine.c | 14 -------------- 2 files changed, 17 deletions(-)