|
 |
495e37 |
From 6b0e129f0758ccd076d1ecbf85c8f1e863788981 Mon Sep 17 00:00:00 2001
|
|
|
495e37 |
From: Eric Auger <eric.auger@redhat.com>
|
|
|
495e37 |
Date: Mon, 20 Dec 2021 10:11:47 +0100
|
|
|
495e37 |
Subject: [PATCH 5/6] hw/arm/virt: Add 9.0 machine type and remove 8.5 one
|
|
|
495e37 |
|
|
|
495e37 |
RH-Author: Eric Auger <eric.auger@redhat.com>
|
|
|
495e37 |
RH-MergeRequest: 57: hw/arm/virt: Add 9.0 machine type and remove 8.5 one
|
|
|
495e37 |
RH-Commit: [5/6] f573a2fb44882a010e2c6bf5f561f29d54e6e9b5 (eauger1/centos-qemu-kvm)
|
|
|
495e37 |
RH-Bugzilla: 2031044
|
|
|
495e37 |
RH-Acked-by: Gavin Shan <gshan@redhat.com>
|
|
|
495e37 |
RH-Acked-by: Andrew Jones <drjones@redhat.com>
|
|
|
495e37 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
495e37 |
|
|
|
495e37 |
branch: c9s
|
|
|
495e37 |
Brew: 42213566
|
|
|
495e37 |
Upstream: no
|
|
|
495e37 |
|
|
|
495e37 |
Add 9.0 machine type and remove 8.5 one.
|
|
|
495e37 |
|
|
|
495e37 |
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
|
|
495e37 |
---
|
|
|
495e37 |
hw/arm/virt.c | 10 ++--------
|
|
|
495e37 |
1 file changed, 2 insertions(+), 8 deletions(-)
|
|
|
495e37 |
|
|
|
495e37 |
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
|
495e37 |
index d433139479..d537706a86 100644
|
|
|
495e37 |
--- a/hw/arm/virt.c
|
|
|
495e37 |
+++ b/hw/arm/virt.c
|
|
|
495e37 |
@@ -3236,14 +3236,8 @@ static void rhel_machine_init(void)
|
|
|
495e37 |
}
|
|
|
495e37 |
type_init(rhel_machine_init);
|
|
|
495e37 |
|
|
|
495e37 |
-static void rhel850_virt_options(MachineClass *mc)
|
|
|
495e37 |
+static void rhel900_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 |
+DEFINE_RHEL_MACHINE_AS_LATEST(9, 0, 0)
|
|
|
495e37 |
--
|
|
|
495e37 |
2.27.0
|
|
|
495e37 |
|