Blame SOURCES/0021-redhat-virt-rhel8.5.0-Update-machine-type-compatibil.patch

ff9ada
From ce73e939b993cc6be170cdb5d3f2068270593f2b Mon Sep 17 00:00:00 2001
ff9ada
From: Eric Auger <eric.auger@redhat.com>
ff9ada
Date: Tue, 16 Nov 2021 17:03:07 +0100
ff9ada
Subject: redhat: virt-rhel8.5.0: Update machine type compatibility for QEMU
ff9ada
 6.2.0 update
ff9ada
ff9ada
RH-Author: Eric Auger <eric.auger@redhat.com>
ff9ada
RH-MergeRequest: 75: redhat: virt-rhel8.5.0: Update machine type compatibility for QEMU 6.2.0 update
ff9ada
RH-Commit: [21/21] f027d13654944e3d34e3356affe7af952eec2bed
ff9ada
RH-Bugzilla: 2022607
ff9ada
RH-Acked-by: Gavin Shan <gshan@redhat.com>
ff9ada
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
ff9ada
RH-Acked-by: Andrew Jones <drjones@redhat.com>
ff9ada
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
ff9ada
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
ff9ada
ff9ada
To keep compatibility with 8.5-AV machine type we need to
ff9ada
turn few new options on by default:
ff9ada
smp_props.prefer_sockets, no_cpu_topology, no_tcg_its
ff9ada
ff9ada
TESTED: migrate from rhel-av-8.5.0 to rhel-8.6.0 and vice-versa
ff9ada
with upstream fix: 33a0c404fb  hw/intc/arm_gicv3_its: Revert version
ff9ada
increments in vmstate_its
ff9ada
ff9ada
Signed-off-by: Eric Auger <eric.auger@redhat.com>
ff9ada
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
ff9ada
---
ff9ada
 hw/arm/virt.c | 5 +++++
ff9ada
 1 file changed, 5 insertions(+)
ff9ada
ff9ada
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
ff9ada
index c77d26ab13..e8941afd01 100644
ff9ada
--- a/hw/arm/virt.c
ff9ada
+++ b/hw/arm/virt.c
ff9ada
@@ -3225,8 +3225,13 @@ type_init(rhel_machine_init);
ff9ada
 
ff9ada
 static void rhel850_virt_options(MachineClass *mc)
ff9ada
 {
ff9ada
+    VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
ff9ada
+
ff9ada
     compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
ff9ada
     compat_props_add(mc->compat_props, hw_compat_rhel_8_5, hw_compat_rhel_8_5_len);
ff9ada
+    mc->smp_props.prefer_sockets = true;
ff9ada
+    vmc->no_cpu_topology = true;
ff9ada
+    vmc->no_tcg_its = true;
ff9ada
 }
ff9ada
 DEFINE_RHEL_MACHINE_AS_LATEST(8, 5, 0)
ff9ada
 
ff9ada
-- 
ff9ada
2.27.0
ff9ada