| Message ID | 20250506143905.4961-13-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/i386/pc: Remove deprecated 2.4 and 2.5 PC machines | expand |
On Tue, May 06, 2025 at 04:38:58PM +0200, Philippe Mathieu-Daudé wrote: > Date: Tue, 6 May 2025 16:38:58 +0200 > From: Philippe Mathieu-Daudé <philmd@linaro.org> > Subject: [PATCH v3 12/19] hw/core/machine: Remove hw_compat_2_5[] array > X-Mailer: git-send-email 2.47.1 > > The hw_compat_2_5[] array was only used by the pc-q35-2.5 and > pc-i440fx-2.5 machines, which got removed. Remove it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > --- > include/hw/boards.h | 3 --- > hw/core/machine.c | 9 --------- > 2 files changed, 12 deletions(-) Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
diff --git a/include/hw/boards.h b/include/hw/boards.h index 5dc5e3b547d..5f1a0fb7e28 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -844,7 +844,4 @@ extern const size_t hw_compat_2_7_len; extern GlobalProperty hw_compat_2_6[]; extern const size_t hw_compat_2_6_len; -extern GlobalProperty hw_compat_2_5[]; -extern const size_t hw_compat_2_5_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index d66b02b564c..e7001bf92cd 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -283,15 +283,6 @@ GlobalProperty hw_compat_2_6[] = { }; const size_t hw_compat_2_6_len = G_N_ELEMENTS(hw_compat_2_6); -GlobalProperty hw_compat_2_5[] = { - { "isa-fdc", "fallback", "144" }, - { "pvscsi", "x-old-pci-configuration", "on" }, - { "pvscsi", "x-disable-pcie", "on" }, - { "vmxnet3", "x-old-msi-offsets", "on" }, - { "vmxnet3", "x-disable-pcie", "on" }, -}; -const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp)