[PATCH 05/20] hw/arm/virt: Remove deprecated virt-5.0 machine

Philippe Mathieu-Daudé posted 20 patches 4 weeks ago
Maintainers: Shannon Zhao <shannon.zhaosl@gmail.com>, "Michael S. Tsirkin" <mst@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <anisinha@redhat.com>, Peter Maydell <peter.maydell@linaro.org>
[PATCH 05/20] hw/arm/virt: Remove deprecated virt-5.0 machine
Posted by Philippe Mathieu-Daudé 4 weeks ago
This machine has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/arm/virt.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index ffbddb711f6..953b2e5a94f 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3673,15 +3673,3 @@ static void virt_machine_5_1_options(MachineClass *mc)
     vmc->no_kvm_steal_time = true;
 }
 DEFINE_VIRT_MACHINE(5, 1)
-
-static void virt_machine_5_0_options(MachineClass *mc)
-{
-    VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
-
-    virt_machine_5_1_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_5_0, hw_compat_5_0_len);
-    mc->numa_mem_supported = true;
-    vmc->acpi_expose_flash = true;
-    mc->auto_enable_numa_with_memdev = false;
-}
-DEFINE_VIRT_MACHINE(5, 0)
-- 
2.51.0