From 29af345b5879e73a45d6ea549037835d3db80726 Mon Sep 17 00:00:00 2001
From: Eric Auger <eric.auger@redhat.com>
Date: Tue, 17 Aug 2021 07:21:13 -0400
Subject: [PATCH] hw/arm/virt: Remove 9.0 machine type
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

RH-Author: Eric Auger <eric.auger@redhat.com>
RH-MergeRequest: 23: hw/arm/virt: Remove 9.0 machine type
RH-Commit: [1/1] 07dd3c160593867473bc4be6cad707426a75bd81
RH-Bugzilla: 1981462
RH-Acked-by: Gavin Shan <gshan@redhat.com>
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
RH-Acked-by: Andrew Jones <drjones@redhat.com>

branch: rhel-9.0.0-beta
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=39020228
Upstream: no
Test: QMP query-machines and sample VM run

To Align with other architectures, we remove the 9.0 machine type
for now and just keep the 8.5 one.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
 hw/arm/virt.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 0084935ec8..ddd9a33e98 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3103,14 +3103,8 @@ static void rhel_machine_init(void)
 }
 type_init(rhel_machine_init);
 
-static void rhel900_virt_options(MachineClass *mc)
-{
-    compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
-}
-DEFINE_RHEL_MACHINE_AS_LATEST(9, 0, 0)
-
 static void rhel850_virt_options(MachineClass *mc)
 {
-    rhel900_virt_options(mc);
+    compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
 }
-DEFINE_RHEL_MACHINE(8, 5, 0)
+DEFINE_RHEL_MACHINE_AS_LATEST(8, 5, 0)
-- 
2.27.0