|
 |
7f1c5b |
From 546e4213c4e8a7b2e369315a71bc9aec091eed6e Mon Sep 17 00:00:00 2001
|
|
|
7f1c5b |
From: Cornelia Huck <cohuck@redhat.com>
|
|
|
7f1c5b |
Date: Mon, 19 Dec 2022 10:30:26 +0100
|
|
|
7f1c5b |
Subject: redhat: fix virt-rhel9.2.0 compat props
|
|
|
7f1c5b |
|
|
|
7f1c5b |
RH-Author: Cornelia Huck <cohuck@redhat.com>
|
|
|
7f1c5b |
RH-MergeRequest: 127: redhat: fix virt-rhel9.2.0 compat props
|
|
|
7f1c5b |
RH-Bugzilla: 2154640
|
|
|
7f1c5b |
RH-Acked-by: Eric Auger <eric.auger@redhat.com>
|
|
|
7f1c5b |
RH-Acked-by: Gavin Shan <gshan@redhat.com>
|
|
|
7f1c5b |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7f1c5b |
RH-Commit: [1/1] 49635fdc1d9a934ece78abd160b07c19909f876a (cohuck/qemu-kvm-c9s)
|
|
|
7f1c5b |
|
|
|
7f1c5b |
We need to include arm_rhel_compat props in the latest machine.
|
|
|
7f1c5b |
|
|
|
7f1c5b |
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
7f1c5b |
---
|
|
|
7f1c5b |
hw/arm/virt.c | 2 +-
|
|
|
7f1c5b |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
7f1c5b |
|
|
|
7f1c5b |
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
|
7f1c5b |
index 0a94f31dd1..bf18838b87 100644
|
|
|
7f1c5b |
--- a/hw/arm/virt.c
|
|
|
7f1c5b |
+++ b/hw/arm/virt.c
|
|
|
7f1c5b |
@@ -3520,6 +3520,7 @@ type_init(rhel_machine_init);
|
|
|
7f1c5b |
|
|
|
7f1c5b |
static void rhel920_virt_options(MachineClass *mc)
|
|
|
7f1c5b |
{
|
|
|
7f1c5b |
+ compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
|
|
|
7f1c5b |
}
|
|
|
7f1c5b |
DEFINE_RHEL_MACHINE_AS_LATEST(9, 2, 0)
|
|
|
7f1c5b |
|
|
|
7f1c5b |
@@ -3529,7 +3530,6 @@ static void rhel900_virt_options(MachineClass *mc)
|
|
|
7f1c5b |
|
|
|
7f1c5b |
rhel920_virt_options(mc);
|
|
|
7f1c5b |
|
|
|
7f1c5b |
- compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
|
|
|
7f1c5b |
compat_props_add(mc->compat_props, hw_compat_rhel_9_1, hw_compat_rhel_9_1_len);
|
|
|
7f1c5b |
|
|
|
7f1c5b |
/* Disable FEAT_LPA2 since old kernels (<= v5.12) don't boot with that feature */
|
|
|
7f1c5b |
--
|
|
|
7f1c5b |
2.38.1
|
|
|
7f1c5b |
|