On Wed, 3 Dec 2025 00:28:26 +0800 Zhao Liu <[email protected]> wrote:
> From: Philippe Mathieu-Daudé <[email protected]> > > The hw_compat_2_6[] array was only used by the pc-q35-2.6 and > pc-i440fx-2.6 machines, which got removed. Remove it. > > Signed-off-by: Philippe Mathieu-Daudé <[email protected]> > Reviewed-by: Mark Cave-Ayland <[email protected]> > Reviewed-by: Thomas Huth <[email protected]> > Reviewed-by: Zhao Liu <[email protected]> > Signed-off-by: Zhao Liu <[email protected]> Reviewed-by: Igor Mammedov <[email protected]> > --- > hw/core/machine.c | 8 -------- > include/hw/boards.h | 3 --- > 2 files changed, 11 deletions(-) > > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 27372bb01ef4..0b10adb5d538 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -290,14 +290,6 @@ GlobalProperty hw_compat_2_7[] = { > }; > const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7); > > -GlobalProperty hw_compat_2_6[] = { > - { "virtio-mmio", "format_transport_address", "off" }, > - /* Optional because not all virtio-pci devices support legacy mode */ > - { "virtio-pci", "disable-modern", "on", .optional = true }, > - { "virtio-pci", "disable-legacy", "off", .optional = true }, > -}; > -const size_t hw_compat_2_6_len = G_N_ELEMENTS(hw_compat_2_6); > - > 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 a48ed4f86a35..5ddadbfd8a83 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -882,7 +882,4 @@ extern const size_t hw_compat_2_8_len; > extern GlobalProperty hw_compat_2_7[]; > extern const size_t hw_compat_2_7_len; > > -extern GlobalProperty hw_compat_2_6[]; > -extern const size_t hw_compat_2_6_len; > - > #endif
