|
 |
a83cc2 |
From 29af345b5879e73a45d6ea549037835d3db80726 Mon Sep 17 00:00:00 2001
|
|
|
a83cc2 |
From: Eric Auger <eric.auger@redhat.com>
|
|
|
a83cc2 |
Date: Tue, 17 Aug 2021 07:21:13 -0400
|
|
|
a83cc2 |
Subject: [PATCH] hw/arm/virt: Remove 9.0 machine type
|
|
|
a83cc2 |
MIME-Version: 1.0
|
|
|
a83cc2 |
Content-Type: text/plain; charset=UTF-8
|
|
|
a83cc2 |
Content-Transfer-Encoding: 8bit
|
|
|
a83cc2 |
|
|
|
a83cc2 |
RH-Author: Eric Auger <eric.auger@redhat.com>
|
|
|
a83cc2 |
RH-MergeRequest: 23: hw/arm/virt: Remove 9.0 machine type
|
|
|
a83cc2 |
RH-Commit: [1/1] 07dd3c160593867473bc4be6cad707426a75bd81
|
|
|
a83cc2 |
RH-Bugzilla: 1981462
|
|
|
a83cc2 |
RH-Acked-by: Gavin Shan <gshan@redhat.com>
|
|
|
a83cc2 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
a83cc2 |
RH-Acked-by: Andrew Jones <drjones@redhat.com>
|
|
|
a83cc2 |
|
|
|
a83cc2 |
branch: rhel-9.0.0-beta
|
|
|
a83cc2 |
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=39020228
|
|
|
a83cc2 |
Upstream: no
|
|
|
a83cc2 |
Test: QMP query-machines and sample VM run
|
|
|
a83cc2 |
|
|
|
a83cc2 |
To Align with other architectures, we remove the 9.0 machine type
|
|
|
a83cc2 |
for now and just keep the 8.5 one.
|
|
|
a83cc2 |
|
|
|
a83cc2 |
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
|
|
a83cc2 |
---
|
|
|
a83cc2 |
hw/arm/virt.c | 10 ++--------
|
|
|
a83cc2 |
1 file changed, 2 insertions(+), 8 deletions(-)
|
|
|
a83cc2 |
|
|
|
a83cc2 |
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
|
a83cc2 |
index 0084935ec8..ddd9a33e98 100644
|
|
|
a83cc2 |
--- a/hw/arm/virt.c
|
|
|
a83cc2 |
+++ b/hw/arm/virt.c
|
|
|
a83cc2 |
@@ -3103,14 +3103,8 @@ static void rhel_machine_init(void)
|
|
|
a83cc2 |
}
|
|
|
a83cc2 |
type_init(rhel_machine_init);
|
|
|
a83cc2 |
|
|
|
a83cc2 |
-static void rhel900_virt_options(MachineClass *mc)
|
|
|
a83cc2 |
-{
|
|
|
a83cc2 |
- compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
|
|
|
a83cc2 |
-}
|
|
|
a83cc2 |
-DEFINE_RHEL_MACHINE_AS_LATEST(9, 0, 0)
|
|
|
a83cc2 |
-
|
|
|
a83cc2 |
static void rhel850_virt_options(MachineClass *mc)
|
|
|
a83cc2 |
{
|
|
|
a83cc2 |
- rhel900_virt_options(mc);
|
|
|
a83cc2 |
+ compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
|
|
|
a83cc2 |
}
|
|
|
a83cc2 |
-DEFINE_RHEL_MACHINE(8, 5, 0)
|
|
|
a83cc2 |
+DEFINE_RHEL_MACHINE_AS_LATEST(8, 5, 0)
|
|
|
a83cc2 |
--
|
|
|
a83cc2 |
2.27.0
|
|
|
a83cc2 |
|