|
 |
77609c |
From 8dc162b2ae2e412c7d4e0d46f7a11001c34263dc Mon Sep 17 00:00:00 2001
|
|
|
77609c |
From: Andrew Jones <drjones@redhat.com>
|
|
|
77609c |
Date: Mon, 23 Aug 2021 18:57:11 +0200
|
|
|
77609c |
Subject: [PATCH 1/4] 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 |
|
|
|
77609c |
RH-Author: Andrew Jones <drjones@redhat.com>
|
|
|
77609c |
RH-MergeRequest: 38: hw/arm/virt: Remove 9.0 machine type
|
|
|
77609c |
RH-Commit: [1/1 35c0734886622b88f6a715f13fba8f65331f7a82
|
|
|
77609c |
RH-Bugzilla: 2002937
|
|
|
77609c |
RH-Acked-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
77609c |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
a83cc2 |
RH-Acked-by: Gavin Shan <gshan@redhat.com>
|
|
|
a83cc2 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
a83cc2 |
|
|
|
77609c |
Testing: '/usr/libexec/qemu-kvm -M help' and sample VM run
|
|
|
a83cc2 |
|
|
|
77609c |
Remove the 9.0 machine type for RHEL9 Beta to align with other
|
|
|
77609c |
architectures. Also, like other architectures, the 8.5 machine
|
|
|
77609c |
type should be the RHEL9 Beta default.
|
|
|
a83cc2 |
|
|
|
77609c |
Signed-off-by: Andrew Jones <drjones@redhat.com>
|
|
|
77609c |
Signed-off-by: Miroslav Rezanina <mrezanin@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
|
|
|
77609c |
index 3c8e6de36d..9e7cb687dc 100644
|
|
|
a83cc2 |
--- a/hw/arm/virt.c
|
|
|
a83cc2 |
+++ b/hw/arm/virt.c
|
|
|
77609c |
@@ -3145,14 +3145,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 |
|