| Message ID | 20250501183628.87479-7-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_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é <philmd@linaro.org> > --- > 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 5f1a0fb7e28..a881db8e7d6 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -841,7 +841,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 > diff --git a/hw/core/machine.c b/hw/core/machine.c > index e7001bf92cd..ce98820f277 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -275,14 +275,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) Reviewed-by: Mark Cave-Ayland <mark.caveayland@nutanix.com> ATB, Mark.
On 01/05/2025 20.36, Philippe Mathieu-Daudé wrote: > 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é <philmd@linaro.org> > --- > include/hw/boards.h | 3 --- > hw/core/machine.c | 8 -------- > 2 files changed, 11 deletions(-) It's still used in the arm virt machine which has not been removed yet? Thomas
On 5/5/25 11:13, Thomas Huth wrote: > On 01/05/2025 20.36, Philippe Mathieu-Daudé wrote: >> 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é <philmd@linaro.org> >> --- >> include/hw/boards.h | 3 --- >> hw/core/machine.c | 8 -------- >> 2 files changed, 11 deletions(-) > > It's still used in the arm virt machine which has not been removed yet? Sorry, I forgot to mention in the cover this series consider ARM virt-2.6 up to virt-2.12 machines removed because the series doing that is already queued in target-arm.next: https://lore.kernel.org/qemu-devel/20250116145944.38028-1-philmd@linaro.org/
On 5/5/25 11:58, Philippe Mathieu-Daudé wrote: > On 5/5/25 11:13, Thomas Huth wrote: >> On 01/05/2025 20.36, Philippe Mathieu-Daudé wrote: >>> 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é <philmd@linaro.org> >>> --- >>> include/hw/boards.h | 3 --- >>> hw/core/machine.c | 8 -------- >>> 2 files changed, 11 deletions(-) >> >> It's still used in the arm virt machine which has not been removed yet? > > Sorry, I forgot to mention in the cover this series consider > ARM virt-2.6 up to virt-2.12 machines removed because the > series doing that is already queued in target-arm.next: > https://lore.kernel.org/qemu-devel/20250116145944.38028-1- > philmd@linaro.org/ The ARM patches has been merged as commits 1731ec33c38 ("hw/arm/virt: Remove deprecated virt-2.6 machine") and 390becbf7fa ("hw/arm/virt: Remove deprecated virt-2.7 machine").
diff --git a/include/hw/boards.h b/include/hw/boards.h index 5f1a0fb7e28..a881db8e7d6 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -841,7 +841,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 diff --git a/hw/core/machine.c b/hw/core/machine.c index e7001bf92cd..ce98820f277 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -275,14 +275,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)
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é <philmd@linaro.org> --- include/hw/boards.h | 3 --- hw/core/machine.c | 8 -------- 2 files changed, 11 deletions(-)