56d8e9c672
- kvm-x86-create-new-pc-q35-machine-type-for-rhel-9.6.patch [RHEL-29002 RHEL-29003 RHEL-35587 RHEL-38411 RHEL-45141] - kvm-arm-create-new-virt-machine-type-for-rhel-9.6.patch [RHEL-29002 RHEL-29003 RHEL-35587 RHEL-38411 RHEL-45141] - kvm-x86-create-pc-i440fx-machine-type-for-rhel10.patch [RHEL-29002 RHEL-29003 RHEL-35587 RHEL-38411 RHEL-45141] - kvm-x86-create-pc-q35-machine-type-for-rhel10.patch [RHEL-29002 RHEL-29003 RHEL-35587 RHEL-38411 RHEL-45141] - kvm-arm-create-virt-machine-type-for-rhel10.patch [RHEL-29002 RHEL-29003 RHEL-35587 RHEL-38411 RHEL-45141] - kvm-x86-remove-deprecated-rhel-machine-types.patch [RHEL-29002 RHEL-29003 RHEL-35587 RHEL-38411 RHEL-45141] - kvm-remove-stale-compat-definitions.patch [RHEL-29002 RHEL-29003 RHEL-35587 RHEL-38411 RHEL-45141] - kvm-RH-Author-Shaoqin-Huang-shahuang-redhat.com.patch [RHEL-38374] - kvm-qemu-guest-agent-Update-the-logfile-path-of-qga-fsfr.patch [RHEL-57028] - Resolves: RHEL-29002 (Remove the existing deprecated machine types in RHEL-10) - Resolves: RHEL-29003 (Deprecate RHEL-9 machine types in RHEL-10) - Resolves: RHEL-35587 (Create a pc-i440fx-rhel10.0 machine type) - Resolves: RHEL-38411 ([Fujitsu 10.0 FEAT]: qemu-kvm: Continue to support i440fx for RHEL10) - Resolves: RHEL-45141 (Introduce virt-rhel10.0 arm-virt machine type [aarch64]) - Resolves: RHEL-38374 (aarch64 SMBIOS 'Manufacturer' and 'Product Name' differ from x86 ones [rhel-10]) - Resolves: RHEL-57028 (fsfreeze hooks break on the systems first restorecon [rhel-10])
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From 60d59db99f0527eaf0ce8d3a18d8333aa77a03f2 Mon Sep 17 00:00:00 2001
|
|
From: Sebastian Ott <sebott@redhat.com>
|
|
Date: Thu, 5 Sep 2024 13:53:13 +0200
|
|
Subject: [PATCH 2/9] arm: create new virt machine type for rhel 9.6
|
|
|
|
RH-Author: Sebastian Ott <sebott@redhat.com>
|
|
RH-MergeRequest: 270: RHEL10 machine types
|
|
RH-Jira: RHEL-29002 RHEL-29003 RHEL-35587 RHEL-38411 RHEL-45141 RHEL-52318 RHEL-52320
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
RH-Acked-by: Eric Auger <eric.auger@redhat.com>
|
|
RH-Commit: [2/7] 0179f5a7a177f53b58ff9b82bd09217e183f258b (seott1/cos-qemu-kvm)
|
|
|
|
Signed-off-by: Sebastian Ott <sebott@redhat.com>
|
|
---
|
|
hw/arm/virt.c | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
index 31a71a7f45..f94be8656c 100644
|
|
--- a/hw/arm/virt.c
|
|
+++ b/hw/arm/virt.c
|
|
@@ -3580,15 +3580,22 @@ static void virt_machine_2_6_options(MachineClass *mc)
|
|
DEFINE_VIRT_MACHINE(2, 6)
|
|
#endif /* disabled for RHEL */
|
|
|
|
+static void virt_rhel_machine_9_6_0_options(MachineClass *mc)
|
|
+{
|
|
+}
|
|
+DEFINE_VIRT_MACHINE_AS_LATEST(9, 6, 0)
|
|
+
|
|
static void virt_rhel_machine_9_4_0_options(MachineClass *mc)
|
|
{
|
|
+ virt_rhel_machine_9_6_0_options(mc);
|
|
+
|
|
/* From virt_machine_9_0_options() */
|
|
mc->smbios_memory_device_size = 16 * GiB;
|
|
|
|
compat_props_add(mc->compat_props, hw_compat_rhel_10_0, hw_compat_rhel_10_0_len);
|
|
compat_props_add(mc->compat_props, hw_compat_rhel_9_5, hw_compat_rhel_9_5_len);
|
|
}
|
|
-DEFINE_VIRT_MACHINE_AS_LATEST(9, 4, 0)
|
|
+DEFINE_VIRT_MACHINE(9, 4, 0)
|
|
|
|
static void virt_rhel_machine_9_2_0_options(MachineClass *mc)
|
|
{
|
|
--
|
|
2.39.3
|
|
|