From 12720b4c0434d9549f0e41ed5951890fdd9aedd4 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Tue, 10 Jun 2025 14:27:29 +0200 Subject: [PATCH 5/5] Disable virtio-net-pci romfile loading on riscv64 RH-Author: Andrea Bolognani RH-MergeRequest: 373: Various small fixes RH-Jira: RHEL-96057 RH-Acked-by: Miroslav Rezanina RH-Commit: [4/4] b490ef3c3ab6a47f90c67016f685e19a65d97100 (abologna/centos-stream-qemu-kvm) Same motivation for disabling it as on aarch64. Signed-off-by: Andrea Bolognani --- hw/riscv/virt.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index b8d20575af..5b9291a906 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -59,6 +59,18 @@ #include "hw/virtio/virtio-iommu.h" #include "hw/uefi/var-service-api.h" +/* + * virtio-net-pci variant romfiles are not needed because edk2 does + * fully support the pxe boot. Besides virtio romfiles are not shipped + * on rhel/riscv64. + */ +static GlobalProperty riscv_virt_compat[] = { + {"virtio-net-pci", "romfile", "" }, + {"virtio-net-pci-transitional", "romfile", "" }, + {"virtio-net-pci-non-transitional", "romfile", "" }, +}; +const size_t riscv_virt_compat_len = G_N_ELEMENTS(riscv_virt_compat); + /* KVM AIA only supports APLIC MSI. APLIC Wired is always emulated by QEMU. */ static bool virt_use_kvm_aia_aplic_imsic(RISCVVirtAIAType aia_type) { @@ -1977,6 +1989,9 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) NULL, NULL); object_class_property_set_description(oc, "iommu-sys", "Enable IOMMU platform device"); + + compat_props_add(mc->compat_props, riscv_virt_compat, + riscv_virt_compat_len); } static const TypeInfo virt_machine_typeinfo = { -- 2.39.3