321b8a8d36
- kvm-io-move-websock-resource-release-to-close-method.patch [RHEL-120116] - kvm-io-fix-use-after-free-in-websocket-handshake-code.patch [RHEL-120116] - kvm-vfio-Disable-VFIO-migration-with-MultiFD-support.patch [RHEL-126573] - kvm-hw-arm-virt-Use-ACPI-PCI-hotplug-by-default-from-10..patch [RHEL-67323] - kvm-hw-arm-smmu-common-Check-SMMU-has-PCIe-Root-Complex-.patch [RHEL-73800] - kvm-hw-arm-virt-acpi-build-Re-arrange-SMMUv3-IORT-build.patch [RHEL-73800] - kvm-hw-arm-virt-acpi-build-Update-IORT-for-multiple-smmu.patch [RHEL-73800] - kvm-hw-arm-virt-Factor-out-common-SMMUV3-dt-bindings-cod.patch [RHEL-73800] - kvm-hw-arm-virt-Add-an-SMMU_IO_LEN-macro.patch [RHEL-73800] - kvm-hw-pci-Introduce-pci_setup_iommu_per_bus-for-per-bus.patch [RHEL-73800] - kvm-hw-arm-virt-Allow-user-creatable-SMMUv3-dev-instanti.patch [RHEL-73800] - kvm-qemu-options.hx-Document-the-arm-smmuv3-device.patch [RHEL-73800] - kvm-bios-tables-test-Allow-for-smmuv3-test-data.patch [RHEL-73800] - kvm-qtest-bios-tables-test-Add-tests-for-legacy-smmuv3-a.patch [RHEL-73800] - kvm-qtest-bios-tables-test-Update-tables-for-smmuv3-test.patch [RHEL-73800] - kvm-qtest-Do-not-run-bios-tables-test-on-aarch64.patch [] - Resolves: RHEL-120116 (CVE-2025-11234 qemu-kvm: VNC WebSocket handshake use-after-free [rhel-10.2]) - Resolves: RHEL-126573 (VFIO migration using multifd should be disabled by default) - Resolves: RHEL-67323 ([aarch64] Support ACPI based PCI hotplug on ARM) - Resolves: RHEL-73800 (NVIDIA:Grace-Hopper:Backport support for user-creatable nested SMMUv3 - RHEL 10.1)
67 lines
2.5 KiB
Diff
67 lines
2.5 KiB
Diff
From 5264d9ea8c029dab0663a3da82f4d8241ad0f1b9 Mon Sep 17 00:00:00 2001
|
|
From: Eric Auger <eric.auger@redhat.com>
|
|
Date: Fri, 7 Nov 2025 05:23:16 -0500
|
|
Subject: [PATCH 04/16] hw/arm/virt: Use ACPI PCI hotplug by default from 10.2
|
|
onwards
|
|
|
|
RH-Author: Eric Auger <eric.auger@redhat.com>
|
|
RH-MergeRequest: 422: hw/arm/virt: Use ACPI PCI hotplug by default from 10.2 onwards
|
|
RH-Jira: RHEL-67323
|
|
RH-Acked-by: Sebastian Ott <sebott@redhat.com>
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
RH-Acked-by: Gavin Shan <gshan@redhat.com>
|
|
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
RH-Commit: [1/1] 4539ba6526fef80adb9893a643eb001449397447 (eauger1/centos-qemu-kvm)
|
|
|
|
UPSTREAM: RHEL-only
|
|
|
|
Use ACPI PCI hotplug by default from 10.2 onwards. For older
|
|
rhel10 machine types and all rhel9 machine types ACPI PCI hotplug
|
|
is kept disabled.
|
|
|
|
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
|
---
|
|
hw/arm/virt.c | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
index dcdd53043e..542d702513 100644
|
|
--- a/hw/arm/virt.c
|
|
+++ b/hw/arm/virt.c
|
|
@@ -94,9 +94,15 @@
|
|
|
|
static GlobalProperty arm_virt_compat[] = {
|
|
{ TYPE_VIRTIO_IOMMU_PCI, "aw-bits", "48" },
|
|
+ { TYPE_ACPI_GED, "acpi-pci-hotplug-with-bridge-support", "on" },
|
|
};
|
|
static const size_t arm_virt_compat_len = G_N_ELEMENTS(arm_virt_compat);
|
|
|
|
+GlobalProperty arm_acpi_pci_hp_disabled_compat[] = {
|
|
+ { TYPE_ACPI_GED, "acpi-pci-hotplug-with-bridge-support", "off" },
|
|
+};
|
|
+static const size_t arm_acpi_pci_hp_disabled_compat_len = G_N_ELEMENTS(arm_virt_compat);
|
|
+
|
|
/*
|
|
* RHEL9 kernels have pauth disabled while RHEL10 has it enabled,
|
|
* since qemu will setup the VM with pauth when KVM supports it we
|
|
@@ -104,6 +110,7 @@ static const size_t arm_virt_compat_len = G_N_ELEMENTS(arm_virt_compat);
|
|
*/
|
|
GlobalProperty arm_rhel9_compat[] = {
|
|
{TYPE_ARM_CPU, "pauth", "off", .optional = true},
|
|
+ {TYPE_ACPI_GED, "acpi-pci-hotplug-with-bridge-support", "off" },
|
|
};
|
|
const size_t arm_rhel9_compat_len = G_N_ELEMENTS(arm_rhel9_compat);
|
|
|
|
@@ -3701,6 +3708,8 @@ static void virt_rhel_machine_10_0_0_options(MachineClass *mc)
|
|
|
|
/* QEMU 9.1 and earlier have only a stage-1 SMMU, not a nested s1+2 one */
|
|
vmc->no_nested_smmu = true;
|
|
+ compat_props_add(mc->compat_props, arm_acpi_pci_hp_disabled_compat,
|
|
+ arm_acpi_pci_hp_disabled_compat_len);
|
|
compat_props_add(mc->compat_props, hw_compat_rhel_10_2, hw_compat_rhel_10_2_len);
|
|
compat_props_add(mc->compat_props, hw_compat_rhel_10_1, hw_compat_rhel_10_1_len);
|
|
}
|
|
--
|
|
2.47.3
|
|
|