From 6b0e129f0758ccd076d1ecbf85c8f1e863788981 Mon Sep 17 00:00:00 2001 From: Eric Auger Date: Mon, 20 Dec 2021 10:11:47 +0100 Subject: [PATCH 5/6] hw/arm/virt: Add 9.0 machine type and remove 8.5 one RH-Author: Eric Auger RH-MergeRequest: 57: hw/arm/virt: Add 9.0 machine type and remove 8.5 one RH-Commit: [5/6] f573a2fb44882a010e2c6bf5f561f29d54e6e9b5 (eauger1/centos-qemu-kvm) RH-Bugzilla: 2031044 RH-Acked-by: Gavin Shan RH-Acked-by: Andrew Jones RH-Acked-by: Miroslav Rezanina branch: c9s Brew: 42213566 Upstream: no Add 9.0 machine type and remove 8.5 one. Signed-off-by: Eric Auger --- hw/arm/virt.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d433139479..d537706a86 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3236,14 +3236,8 @@ static void rhel_machine_init(void) } type_init(rhel_machine_init); -static void rhel850_virt_options(MachineClass *mc) +static void rhel900_virt_options(MachineClass *mc) { - VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); - compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len); - compat_props_add(mc->compat_props, hw_compat_rhel_8_5, hw_compat_rhel_8_5_len); - mc->smp_props.prefer_sockets = true; - vmc->no_cpu_topology = true; - vmc->no_tcg_its = true; } -DEFINE_RHEL_MACHINE_AS_LATEST(8, 5, 0) +DEFINE_RHEL_MACHINE_AS_LATEST(9, 0, 0) -- 2.27.0