From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Tue, 29 Apr 2025 15:39:07 +0000 (+0200)
Subject: hw/arm/virt: Remove deprecated virt-4.0 machine
X-Git-Tag: v10.1.0-rc0~102^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=607e1208b53ac713a76d158f4abc4cd2e8870051;p=thirdparty%2Fqemu.git

hw/arm/virt: Remove deprecated virt-4.0 machine

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>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20250429153907.31866-5-philmd@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 61fd8557683..9a6cd085a37 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3562,10 +3562,3 @@ static void virt_machine_4_1_options(MachineClass *mc)
     mc->auto_enable_numa_with_memhp = false;
 }
 DEFINE_VIRT_MACHINE(4, 1)
-
-static void virt_machine_4_0_options(MachineClass *mc)
-{
-    virt_machine_4_1_options(mc);
-    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
-}
-DEFINE_VIRT_MACHINE(4, 0)