9f4495a7b6
- Rebase to QEMU 7.2.0 [bz#2135806] - Resolves: bz#2135806 (Rebase to QEMU 7.2 for RHEL 9.2.0)
44 lines
1.2 KiB
Diff
44 lines
1.2 KiB
Diff
From c1a21266d8bed27f1ef1f705818fde5f9350b73f Mon Sep 17 00:00:00 2001
|
|
From: Cornelia Huck <cohuck@redhat.com>
|
|
Date: Wed, 23 Nov 2022 14:15:37 +0100
|
|
Subject: redhat: aarch64: add rhel9.2.0 virt machine type
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2131982
|
|
Upstream: RHEL only
|
|
|
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
---
|
|
hw/arm/virt.c | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
index dfcab40a73..0a94f31dd1 100644
|
|
--- a/hw/arm/virt.c
|
|
+++ b/hw/arm/virt.c
|
|
@@ -3518,14 +3518,21 @@ static void rhel_machine_init(void)
|
|
}
|
|
type_init(rhel_machine_init);
|
|
|
|
+static void rhel920_virt_options(MachineClass *mc)
|
|
+{
|
|
+}
|
|
+DEFINE_RHEL_MACHINE_AS_LATEST(9, 2, 0)
|
|
+
|
|
static void rhel900_virt_options(MachineClass *mc)
|
|
{
|
|
VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
|
|
|
|
+ rhel920_virt_options(mc);
|
|
+
|
|
compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
|
|
compat_props_add(mc->compat_props, hw_compat_rhel_9_1, hw_compat_rhel_9_1_len);
|
|
|
|
/* Disable FEAT_LPA2 since old kernels (<= v5.12) don't boot with that feature */
|
|
vmc->no_tcg_lpa2 = true;
|
|
}
|
|
-DEFINE_RHEL_MACHINE_AS_LATEST(9, 0, 0)
|
|
+DEFINE_RHEL_MACHINE(9, 0, 0)
|
|
--
|
|
2.31.1
|
|
|