| Message ID | 20250501210456.89071-16-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:53 +0200 Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > The hw_compat_2_9[] array was only used by the pc-q35-2.9 and > pc-i440fx-2.9 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 | 8 -------- > 2 files changed, 11 deletions(-) > > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 84bd3735c42..513eb2a54fd 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -832,7 +832,4 @@ extern const size_t hw_compat_2_11_len; > extern GlobalProperty hw_compat_2_10[]; > extern const size_t hw_compat_2_10_len; > > -extern GlobalProperty hw_compat_2_9[]; > -extern const size_t hw_compat_2_9_len; > - > #endif > diff --git a/hw/core/machine.c b/hw/core/machine.c > index bc0606cf740..486d1adb4b9 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -244,14 +244,6 @@ GlobalProperty hw_compat_2_10[] = { > }; > const size_t hw_compat_2_10_len = G_N_ELEMENTS(hw_compat_2_10); > > -GlobalProperty hw_compat_2_9[] = { > - { "pci-bridge", "shpc", "off" }, > - { "intel-iommu", "pt", "off" }, > - { "virtio-net-device", "x-mtu-bypass-backend", "off" }, > - { "pcie-root-port", "x-migrate-msix", "false" }, > -}; > -const size_t hw_compat_2_9_len = G_N_ELEMENTS(hw_compat_2_9); > - > 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 84bd3735c42..513eb2a54fd 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -832,7 +832,4 @@ extern const size_t hw_compat_2_11_len; extern GlobalProperty hw_compat_2_10[]; extern const size_t hw_compat_2_10_len; -extern GlobalProperty hw_compat_2_9[]; -extern const size_t hw_compat_2_9_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index bc0606cf740..486d1adb4b9 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -244,14 +244,6 @@ GlobalProperty hw_compat_2_10[] = { }; const size_t hw_compat_2_10_len = G_N_ELEMENTS(hw_compat_2_10); -GlobalProperty hw_compat_2_9[] = { - { "pci-bridge", "shpc", "off" }, - { "intel-iommu", "pt", "off" }, - { "virtio-net-device", "x-mtu-bypass-backend", "off" }, - { "pcie-root-port", "x-migrate-msix", "false" }, -}; -const size_t hw_compat_2_9_len = G_N_ELEMENTS(hw_compat_2_9); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp)
The hw_compat_2_9[] array was only used by the pc-q35-2.9 and pc-i440fx-2.9 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/hw/boards.h | 3 --- hw/core/machine.c | 8 -------- 2 files changed, 11 deletions(-)