Message ID | 20250501183628.87479-12-philmd@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | hw/i386/pc: Remove deprecated 2.6 and 2.7 PC machines | expand |
On 01/05/2025 19:36, Philippe Mathieu-Daudé wrote: > The hw_compat_2_7[] array was only used by the pc-q35-2.7 and > pc-i440fx-2.7 machines, which got removed. Remove it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > 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 a881db8e7d6..77707c4376a 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -838,7 +838,4 @@ extern const size_t hw_compat_2_9_len; > extern GlobalProperty hw_compat_2_8[]; > extern const size_t hw_compat_2_8_len; > > -extern GlobalProperty hw_compat_2_7[]; > -extern const size_t hw_compat_2_7_len; > - > #endif > diff --git a/hw/core/machine.c b/hw/core/machine.c > index ce98820f277..bde19a2ff67 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -266,15 +266,6 @@ GlobalProperty hw_compat_2_8[] = { > }; > const size_t hw_compat_2_8_len = G_N_ELEMENTS(hw_compat_2_8); > > -GlobalProperty hw_compat_2_7[] = { > - { "virtio-pci", "page-per-vq", "on" }, > - { "virtio-serial-device", "emergency-write", "off" }, > - { "ioapic", "version", "0x11" }, > - { "intel-iommu", "x-buggy-eim", "true" }, > - { "virtio-pci", "x-ignore-backend-features", "on" }, > -}; > -const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7); > - > MachineState *current_machine; > > static char *machine_get_kernel(Object *obj, Error **errp) Reviewed-by: Mark Cave-Ayland <mark.caveayland@nutanix.com> ATB, Mark.
diff --git a/include/hw/boards.h b/include/hw/boards.h index a881db8e7d6..77707c4376a 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -838,7 +838,4 @@ extern const size_t hw_compat_2_9_len; extern GlobalProperty hw_compat_2_8[]; extern const size_t hw_compat_2_8_len; -extern GlobalProperty hw_compat_2_7[]; -extern const size_t hw_compat_2_7_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index ce98820f277..bde19a2ff67 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -266,15 +266,6 @@ GlobalProperty hw_compat_2_8[] = { }; const size_t hw_compat_2_8_len = G_N_ELEMENTS(hw_compat_2_8); -GlobalProperty hw_compat_2_7[] = { - { "virtio-pci", "page-per-vq", "on" }, - { "virtio-serial-device", "emergency-write", "off" }, - { "ioapic", "version", "0x11" }, - { "intel-iommu", "x-buggy-eim", "true" }, - { "virtio-pci", "x-ignore-backend-features", "on" }, -}; -const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp)
The hw_compat_2_7[] array was only used by the pc-q35-2.7 and pc-i440fx-2.7 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/hw/boards.h | 3 --- hw/core/machine.c | 9 --------- 2 files changed, 12 deletions(-)