7b74d99404
- kvm-arm-virt-Register-highmem-and-gic-version-as-class-p.patch [bz#1952449] - kvm-hw-arm-virt-Add-8.5-and-9.0-machine-types-and-remove.patch [bz#1952449] - kvm-aarch64-rh-devices-add-CONFIG_PVPANIC_PCI.patch [bz#1747467] - kvm-spec-Do-not-build-qemu-kvm-block-gluster.patch [bz#1964795] - kvm-spec-Do-not-link-pcnet-and-ne2k_pci-roms.patch [bz#1965961] - kvm-redhat-s390x-add-rhel-8.5.0-compat-machine.patch [bz#1957194] - kvm-redhat-add-missing-entries-in-hw_compat_rhel_8_4.patch [bz#1957194] - kvm-redhat-Define-pseries-rhel8.5.0-machine-type.patch [bz#1957194] - kvm-virtio-net-failover-add-missing-remove_migration_sta.patch [bz#1957194] - kvm-hw-arm-virt-Disable-PL011-clock-migration-through-hw.patch [bz#1957194] - kvm-virtio-blk-Fix-rollback-path-in-virtio_blk_data_plan.patch [bz#1957194] - kvm-virtio-blk-Configure-all-host-notifiers-in-a-single-.patch [bz#1957194] - kvm-virtio-scsi-Set-host-notifiers-and-callbacks-separat.patch [bz#1957194] - kvm-virtio-scsi-Configure-all-host-notifiers-in-a-single.patch [bz#1957194] - kvm-hw-arm-smmuv3-Another-range-invalidation-fix.patch [bz#1957194] - Resolves: bz#1952449 ([aarch64] define RHEL9 machine types) - Resolves: bz#1747467 ([aarch64] [qemu] PVPANIC support) - Resolves: bz#1964795 (Remove qemu-kvm-block-gluster package) - Resolves: bz#1965961 (Remove links to not build roms) - Resolves: bz#1957194 (Synchronize RHEL-AV 8.5.0 changes to RHEL 9.0.0 Beta)
64 lines
2.1 KiB
Diff
64 lines
2.1 KiB
Diff
From ee0be09f3598596e41b3fc2dbefef3382c5b0541 Mon Sep 17 00:00:00 2001
|
|
From: Eric Auger <eric.auger@redhat.com>
|
|
Date: Tue, 25 May 2021 09:22:24 +0200
|
|
Subject: [PATCH 02/15] hw/arm/virt: Add 8.5 and 9.0 machine types and remove
|
|
older ones
|
|
|
|
RH-Author: Eric Auger <eric.auger@redhat.com>
|
|
RH-MergeRequest: 1: Add 9.0.0 and 8.5.0 arm-virt machine types
|
|
RH-Commit: [2/2] ace4619a1d505a3b552a236260b259bd6ddabc00 (eauger1/centos-qemu-kvm)
|
|
RH-Bugzilla: 1952449
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Acked-by: Gavin Shan <gshan@redhat.com>
|
|
RH-Acked-by: Andrew Jones <drjones@redhat.com>
|
|
|
|
Add 8.5 and 9.0 machine types and remove older ones.
|
|
|
|
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
hw/arm/virt.c | 24 +++++-------------------
|
|
1 file changed, 5 insertions(+), 19 deletions(-)
|
|
|
|
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
index 51a415570c..e4aa794f83 100644
|
|
--- a/hw/arm/virt.c
|
|
+++ b/hw/arm/virt.c
|
|
@@ -3095,28 +3095,14 @@ static void rhel_machine_init(void)
|
|
}
|
|
type_init(rhel_machine_init);
|
|
|
|
-static void rhel840_virt_options(MachineClass *mc)
|
|
+static void rhel900_virt_options(MachineClass *mc)
|
|
{
|
|
compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
|
|
- compat_props_add(mc->compat_props, hw_compat_rhel_8_4, hw_compat_rhel_8_4_len);
|
|
}
|
|
-DEFINE_RHEL_MACHINE_AS_LATEST(8, 4, 0)
|
|
+DEFINE_RHEL_MACHINE_AS_LATEST(9, 0, 0)
|
|
|
|
-static void rhel830_virt_options(MachineClass *mc)
|
|
+static void rhel850_virt_options(MachineClass *mc)
|
|
{
|
|
- VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
|
|
-
|
|
- rhel840_virt_options(mc);
|
|
- compat_props_add(mc->compat_props, hw_compat_rhel_8_3, hw_compat_rhel_8_3_len);
|
|
- vmc->no_kvm_steal_time = true;
|
|
-}
|
|
-DEFINE_RHEL_MACHINE(8, 3, 0)
|
|
-
|
|
-static void rhel820_virt_options(MachineClass *mc)
|
|
-{
|
|
- rhel830_virt_options(mc);
|
|
- compat_props_add(mc->compat_props, hw_compat_rhel_8_2, hw_compat_rhel_8_2_len);
|
|
- mc->numa_mem_supported = true;
|
|
- mc->auto_enable_numa_with_memdev = false;
|
|
+ rhel900_virt_options(mc);
|
|
}
|
|
-DEFINE_RHEL_MACHINE(8, 2, 0)
|
|
+DEFINE_RHEL_MACHINE(8, 5, 0)
|
|
--
|
|
2.27.0
|
|
|