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