August 2023 - Devel - libvirt List Archives

[libvirt PATCH 00/21] qemu: Various fixes to firmware selection
by Andrea Bolognani 16 Aug '23

16 Aug '23

Also available from GitLab: $ git fetch https://gitlab.com/abologna/libvirt.git firmware Patch 11/21 is kind of an unreviewable mess, but it can't really be split into more reasonably-sized pieces while preserving bisectability. I have pushed an alternative version that should make things a bit less painful, grab it with: $ git fetch https://gitlab.com/abologna/libvirt.git firmware-reviewable Details are included in the various patches or in the relevant issues: https://bugzilla.redhat.com/show_bug.cgi?id=2196178 https://gitlab.com/libvirt/libvirt/-/issues/500 but the tl;dr is that the changes made to firmware selection in libvirt 9.2.0 have unfortunately introduced a number of regression, which this series addresses. The first few patches are preparatory / tangential cleanups, while the last few implement quality of life improvements rather than actual fixes. They all touch the same areas, so it seemed reasonable to bundle them. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/962320409 Andrea Bolognani (21): tests: Use DO_TEST_CAPS_*_ABI_UPDATE() for ppc64 tests: Switch to firmware autoselection for hvf tests: Use virt-4.0 machine type for aarch64 tests: Consistently use /path/to/guest_VARS.fd tests: Turn abi-update.xml into a symlink tests: Rename firmware-auto-efi-nvram-path qemu: Fix return value for qemuFirmwareFillDomainLegacy() qemu: Fix lookup against stateless/combined pflash tests: Add some more DO_TEST*ABI_UPDATE* macros tests: Add more tests for firmware selection tests: Update firmware descriptor files tests: Drop tags from BIOS firmware descriptor tests: Include microvm in firmwaretest qemu: Don't overwrite NVRAM template for legacy firmware qemu: Generate NVRAM path in more cases qemu: Filter firmware based on loader.readonly qemu: Match NVRAM template extension for new domains conf: Don't default to raw format for loader/NVRAM tests: Rename firmware-auto-efi-format-loader-qcow2-nvram-path tests: Reintroduce firmware-auto-efi-format-mismatch NEWS: Mention fixes to firmware selection NEWS.rst | 6 + src/bhyve/bhyve_firmware.c | 3 + src/conf/domain_conf.c | 21 ++- src/libxl/libxl_conf.c | 15 +- src/libxl/xen_xl.c | 2 + src/libxl/xen_xm.c | 1 + src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_firmware.c | 158 ++++++++++++++---- src/qemu/qemu_firmware.h | 3 +- src/qemu/qemu_process.c | 2 +- .../etc/qemu/firmware/20-bios.json | 1 + .../etc/qemu/firmware/40-ovmf-sb-keys.json | 1 - .../etc/qemu/firmware/59-combined.json | 1 + .../{42-masked.json => 92-masked.json} | 0 ...ovmf.json => 60-edk2-ovmf-x64-amdsev.json} | 11 +- .../firmware/60-edk2-ovmf-x64-inteltdx.json} | 9 +- ...0-edk2-ovmf-4m-qcow2-x64-sb-enrolled.json} | 10 +- ... 31-edk2-ovmf-2m-raw-x64-sb-enrolled.json} | 6 +- .../40-edk2-ovmf-4m-qcow2-x64-sb.json} | 16 +- ...b.json => 41-edk2-ovmf-2m-raw-x64-sb.json} | 7 +- ...-qcow2.json => 50-edk2-aarch64-qcow2.json} | 14 +- ...on => 50-edk2-ovmf-4m-qcow2-x64-nosb.json} | 9 +- .../firmware/50-edk2-ovmf-x64-microvm.json | 22 +++ ...70-aavmf.json => 51-edk2-aarch64-raw.json} | 11 +- ...json => 51-edk2-ovmf-2m-raw-x64-nosb.json} | 8 +- ...son => 52-edk2-aarch64-verbose-qcow2.json} | 16 +- .../53-edk2-aarch64-verbose-raw.json} | 10 +- ...less.json => 60-edk2-ovmf-x64-amdsev.json} | 6 +- ...ss.json => 60-edk2-ovmf-x64-inteltdx.json} | 8 +- ...ovmf-sb-combined.json => 90-combined.json} | 4 +- .../firmware/{40-bios.json => 91-bios.json} | 3 - .../{42-masked.json => 92-masked.json} | 0 tests/qemufirmwaretest.c | 79 +++++---- .../aarch64-virt-graphics.aarch64-latest.args | 6 +- .../aarch64-virt-graphics.xml | 6 +- .../aarch64-virt-headless.aarch64-latest.args | 6 +- .../aarch64-virt-headless.xml | 6 +- ...mware-auto-efi-aarch64.aarch64-latest.args | 2 +- ...efi-abi-update-aarch64.aarch64-latest.args | 2 +- .../firmware-auto-efi-abi-update-aarch64.xml | 18 +- ...re-auto-efi-abi-update.x86_64-latest.args} | 5 +- .../firmware-auto-efi-abi-update.xml | 1 + ...-auto-efi-enrolled-keys.x86_64-latest.args | 2 +- ...oader-qcow2-nvram-path.x86_64-latest.args} | 5 +- ...to-efi-format-loader-qcow2-nvram-path.xml} | 2 +- ...efi-format-loader-qcow2.x86_64-latest.args | 5 +- ...loader-raw-abi-update.aarch64-latest.args} | 4 +- ...-auto-efi-format-loader-raw-abi-update.xml | 1 + ...-efi-format-loader-raw.aarch64-latest.args | 2 +- .../firmware-auto-efi-format-mismatch.xml | 2 +- ...nvram-qcow2-network-nbd.x86_64-latest.args | 2 +- ...format-nvram-qcow2-path.x86_64-latest.args | 5 +- ...-efi-format-nvram-qcow2.x86_64-latest.args | 5 +- ...uto-efi-loader-insecure.x86_64-latest.args | 2 +- ...re-auto-efi-loader-path.x86_64-latest.args | 2 +- .../firmware-auto-efi-loader-path.xml | 2 +- ...ader-secure-abi-update.x86_64-latest.args} | 5 +- ...ware-auto-efi-loader-secure-abi-update.xml | 1 + ...-auto-efi-loader-secure.x86_64-latest.args | 2 +- ...to-efi-no-enrolled-keys.x86_64-latest.args | 2 +- ...are-auto-efi-no-secboot.x86_64-latest.args | 2 +- ...are-auto-efi-nvram-file.x86_64-latest.args | 2 +- ...efi-nvram-network-iscsi.x86_64-latest.args | 2 +- ...o-efi-nvram-network-nbd.x86_64-latest.args | 2 +- ...re-auto-efi-nvram-path.x86_64-latest.args} | 2 +- ...m.xml => firmware-auto-efi-nvram-path.xml} | 0 ...ram-template-nonstandard.x86_64-latest.err | 1 + ...e-auto-efi-nvram-template-nonstandard.xml} | 4 +- ...uto-efi-nvram-template.x86_64-latest.args} | 2 +- ...l => firmware-auto-efi-nvram-template.xml} | 2 +- ...e-auto-efi-rw-abi-update.x86_64-latest.err | 1 + .../firmware-auto-efi-rw-abi-update.xml | 1 + .../firmware-auto-efi-rw.x86_64-latest.err | 1 + ...efi-nvram.xml => firmware-auto-efi-rw.xml} | 2 +- ...rmware-auto-efi-secboot.x86_64-latest.args | 2 +- ...rmware-auto-efi-smm-off.x86_64-latest.args | 2 +- ...ware-auto-efi-stateless.x86_64-latest.args | 2 +- .../firmware-auto-efi.x86_64-latest.args | 2 +- ...-aarch64-legacy-paths.aarch64-latest.args} | 0 ...mware-manual-efi-aarch64-legacy-paths.xml} | 2 +- ...anual-efi-acpi-aarch64.aarch64-latest.args | 4 +- .../firmware-manual-efi-acpi-aarch64.xml | 4 +- ...are-manual-efi-acpi-q35.x86_64-latest.args | 2 +- .../firmware-manual-efi-acpi-q35.xml | 2 +- ...are-manual-efi-features.x86_64-latest.args | 2 +- .../firmware-manual-efi-features.xml | 2 +- ...oader-path-nonstandard.x86_64-latest.args} | 4 +- ...re-manual-efi-loader-path-nonstandard.xml} | 4 +- ...anual-efi-loader-secure.x86_64-latest.args | 2 +- .../firmware-manual-efi-loader-secure.xml | 2 +- ...lled-keys-legacy-paths.x86_64-latest.args} | 2 +- ...ual-efi-no-enrolled-keys-legacy-paths.xml} | 2 +- ...al-efi-no-enrolled-keys.x86_64-latest.args | 2 +- .../firmware-manual-efi-no-enrolled-keys.xml | 4 +- ...o-secboot-legacy-paths.x86_64-latest.args} | 2 +- ...re-manual-efi-no-secboot-legacy-paths.xml} | 2 +- ...e-manual-efi-no-secboot.x86_64-latest.args | 2 +- .../firmware-manual-efi-no-secboot.xml | 4 +- ...ual-efi-noacpi-aarch64.aarch64-latest.args | 4 +- .../firmware-manual-efi-noacpi-aarch64.xml | 4 +- .../firmware-manual-efi-noacpi-q35.xml | 2 +- ...e-manual-efi-nvram-file.x86_64-latest.args | 2 +- .../firmware-manual-efi-nvram-file.xml | 2 +- ...efi-nvram-network-iscsi.x86_64-latest.args | 2 +- ...irmware-manual-efi-nvram-network-iscsi.xml | 2 +- ...l-efi-nvram-network-nbd.x86_64-latest.args | 2 +- .../firmware-manual-efi-nvram-network-nbd.xml | 2 +- .../firmware-manual-efi-nvram-stateless.xml | 2 +- ...m-template-nonstandard.x86_64-latest.args} | 2 +- ...manual-efi-nvram-template-nonstandard.xml} | 6 +- ...re-manual-efi-nvram-template-stateless.xml | 4 +- ...nual-efi-nvram-template.x86_64-latest.args | 2 +- .../firmware-manual-efi-nvram-template.xml | 4 +- ...al-efi-rw-legacy-paths.x86_64-latest.args} | 6 +- ...> firmware-manual-efi-rw-legacy-paths.xml} | 6 +- ...al-efi-rw-modern-paths.x86_64-latest.args} | 6 +- ...> firmware-manual-efi-rw-modern-paths.xml} | 6 +- ...i-secboot-legacy-paths.x86_64-latest.args} | 2 +- ...mware-manual-efi-secboot-legacy-paths.xml} | 2 +- ...ware-manual-efi-secboot.x86_64-latest.args | 2 +- .../firmware-manual-efi-secboot.xml | 4 +- ...re-manual-efi-stateless.x86_64-latest.args | 2 +- .../firmware-manual-efi-stateless.xml | 2 +- .../firmware-manual-efi.x86_64-latest.args | 2 +- .../qemuxml2argvdata/firmware-manual-efi.xml | 2 +- ...-aarch64-virt-headless.aarch64-latest.args | 4 +- .../hvf-aarch64-virt-headless.xml | 6 +- ...hvf-x86_64-q35-headless.x86_64-latest.args | 7 +- .../hvf-x86_64-q35-headless.xml | 4 +- ...nvdimm-ppc64-abi-update.ppc64-latest.args} | 0 ...ppc64-nonuma-abi-update.ppc64-latest.args} | 0 ...sb-controller-qemu-xhci.ppc64-latest.args} | 0 .../pvpanic-pci-aarch64.aarch64-latest.args | 2 +- ...pci-no-address-aarch64.aarch64-latest.args | 2 +- .../virtio-iommu-aarch64.aarch64-latest.args | 2 +- tests/qemuxml2argvtest.c | 54 ++++-- .../aarch64-virt-graphics.aarch64-latest.xml | 12 +- .../aarch64-virt-headless.aarch64-latest.xml | 12 +- ...rmware-auto-efi-aarch64.aarch64-latest.xml | 4 +- ...-efi-abi-update-aarch64.aarch64-latest.xml | 4 +- ...are-auto-efi-abi-update.x86_64-latest.xml} | 4 +- ...e-auto-efi-enrolled-keys.x86_64-latest.xml | 4 +- ...loader-qcow2-nvram-path.x86_64-latest.xml} | 4 +- ...-efi-format-loader-qcow2.x86_64-latest.xml | 9 +- ...-loader-raw-abi-update.aarch64-latest.xml} | 4 +- ...o-efi-format-loader-raw.aarch64-latest.xml | 4 +- ...-nvram-qcow2-network-nbd.x86_64-latest.xml | 2 +- ...-format-nvram-qcow2-path.x86_64-latest.xml | 9 +- ...o-efi-format-nvram-qcow2.x86_64-latest.xml | 9 +- ...auto-efi-loader-insecure.x86_64-latest.xml | 4 +- ...are-auto-efi-loader-path.x86_64-latest.xml | 4 +- ...oader-secure-abi-update.x86_64-latest.xml} | 4 +- ...e-auto-efi-loader-secure.x86_64-latest.xml | 4 +- ...uto-efi-no-enrolled-keys.x86_64-latest.xml | 4 +- ...ware-auto-efi-no-secboot.x86_64-latest.xml | 4 +- ...ware-auto-efi-nvram-file.x86_64-latest.xml | 4 +- ...-efi-nvram-network-iscsi.x86_64-latest.xml | 2 +- ...to-efi-nvram-network-nbd.x86_64-latest.xml | 2 +- ...are-auto-efi-nvram-path.x86_64-latest.xml} | 4 +- ...am-template-nonstandard.x86_64-latest.xml} | 7 +- ...auto-efi-nvram-template.x86_64-latest.xml} | 4 +- ...=> firmware-auto-efi-rw.x86_64-latest.xml} | 6 +- ...irmware-auto-efi-secboot.x86_64-latest.xml | 4 +- ...irmware-auto-efi-smm-off.x86_64-latest.xml | 4 +- ...mware-auto-efi-stateless.x86_64-latest.xml | 2 +- .../firmware-auto-efi.x86_64-latest.xml | 4 +- ...i-aarch64-legacy-paths.aarch64-latest.xml} | 6 +- ...manual-efi-acpi-aarch64.aarch64-latest.xml | 4 +- ...ware-manual-efi-acpi-q35.x86_64-latest.xml | 4 +- ...ware-manual-efi-features.x86_64-latest.xml | 4 +- ...loader-path-nonstandard.x86_64-latest.xml} | 11 +- ...manual-efi-loader-secure.x86_64-latest.xml | 4 +- ...olled-keys-legacy-paths.x86_64-latest.xml} | 8 +- ...ual-efi-no-enrolled-keys.x86_64-latest.xml | 4 +- ...no-secboot-legacy-paths.x86_64-latest.xml} | 8 +- ...re-manual-efi-no-secboot.x86_64-latest.xml | 4 +- ...nual-efi-noacpi-aarch64.aarch64-latest.xml | 4 +- ...re-manual-efi-nvram-file.x86_64-latest.xml | 4 +- ...-efi-nvram-network-iscsi.x86_64-latest.xml | 2 +- ...al-efi-nvram-network-nbd.x86_64-latest.xml | 2 +- ...am-template-nonstandard.x86_64-latest.xml} | 9 +- ...anual-efi-nvram-template.x86_64-latest.xml | 4 +- ...ual-efi-rw-legacy-paths.x86_64-latest.xml} | 10 +- ...ual-efi-rw-modern-paths.x86_64-latest.xml} | 10 +- ...fi-secboot-legacy-paths.x86_64-latest.xml} | 8 +- ...mware-manual-efi-secboot.x86_64-latest.xml | 4 +- ...are-manual-efi-stateless.x86_64-latest.xml | 2 +- .../firmware-manual-efi.x86_64-latest.xml | 4 +- ...f-aarch64-virt-headless.aarch64-latest.xml | 10 +- .../hvf-x86_64-q35-headless.x86_64-latest.xml | 11 +- ...-nvdimm-ppc64-abi-update.ppc64-latest.xml} | 0 ...-ppc64-nonuma-abi-update.ppc64-latest.xml} | 0 .../pvpanic-pci-aarch64.aarch64-latest.xml | 4 +- ...-pci-no-address-aarch64.aarch64-latest.xml | 4 +- .../virtio-iommu-aarch64.aarch64-latest.xml | 4 +- tests/qemuxml2xmltest.c | 30 +++- 196 files changed, 655 insertions(+), 491 deletions(-) create mode 120000 tests/qemufirmwaredata/etc/qemu/firmware/20-bios.json delete mode 120000 tests/qemufirmwaredata/etc/qemu/firmware/40-ovmf-sb-keys.json create mode 120000 tests/qemufirmwaredata/etc/qemu/firmware/59-combined.json rename tests/qemufirmwaredata/etc/qemu/firmware/{42-masked.json => 92-masked.json} (100%) rename tests/qemufirmwaredata/out/usr/share/qemu/firmware/{61-ovmf.json => 60-edk2-ovmf-x64-amdsev.json} (60%) copy tests/qemufirmwaredata/{usr/share/qemu/firmware/45-ovmf-sev-stateless.json => out/usr/share/qemu/firmware/60-edk2-ovmf-x64-inteltdx.json} (63%) copy tests/qemufirmwaredata/usr/share/qemu/firmware/{50-ovmf-sb-keys.json => 30-edk2-ovmf-4m-qcow2-x64-sb-enrolled.json} (70%) rename tests/qemufirmwaredata/usr/share/qemu/firmware/{50-ovmf-sb-keys.json => 31-edk2-ovmf-2m-raw-x64-sb-enrolled.json} (78%) rename tests/qemufirmwaredata/{out/usr/share/qemu/firmware/50-ovmf-sb-keys.json => usr/share/qemu/firmware/40-edk2-ovmf-4m-qcow2-x64-sb.json} (59%) rename tests/qemufirmwaredata/usr/share/qemu/firmware/{60-ovmf-sb.json => 41-edk2-ovmf-2m-raw-x64-sb.json} (77%) copy tests/qemufirmwaredata/usr/share/qemu/firmware/{66-aavmf-qcow2.json => 50-edk2-aarch64-qcow2.json} (53%) rename tests/qemufirmwaredata/usr/share/qemu/firmware/{65-ovmf-qcow2.json => 50-edk2-ovmf-4m-qcow2-x64-nosb.json} (68%) create mode 100644 tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-ovmf-x64-microvm.json rename tests/qemufirmwaredata/usr/share/qemu/firmware/{70-aavmf.json => 51-edk2-aarch64-raw.json} (64%) rename tests/qemufirmwaredata/usr/share/qemu/firmware/{61-ovmf.json => 51-edk2-ovmf-2m-raw-x64-nosb.json} (69%) rename tests/qemufirmwaredata/usr/share/qemu/firmware/{66-aavmf-qcow2.json => 52-edk2-aarch64-verbose-qcow2.json} (53%) rename tests/qemufirmwaredata/{out/usr/share/qemu/firmware/70-aavmf.json => usr/share/qemu/firmware/53-edk2-aarch64-verbose-raw.json} (57%) copy tests/qemufirmwaredata/usr/share/qemu/firmware/{45-ovmf-sev-stateless.json => 60-edk2-ovmf-x64-amdsev.json} (73%) rename tests/qemufirmwaredata/usr/share/qemu/firmware/{45-ovmf-sev-stateless.json => 60-edk2-ovmf-x64-inteltdx.json} (66%) rename tests/qemufirmwaredata/usr/share/qemu/firmware/{55-ovmf-sb-combined.json => 90-combined.json} (85%) rename tests/qemufirmwaredata/usr/share/qemu/firmware/{40-bios.json => 91-bios.json} (87%) rename tests/qemufirmwaredata/usr/share/qemu/firmware/{42-masked.json => 92-masked.json} (100%) mode change 100644 => 120000 tests/qemuxml2argvdata/firmware-auto-efi-abi-update-aarch64.xml copy tests/qemuxml2argvdata/{firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args => firmware-auto-efi-abi-update.x86_64-latest.args} (80%) create mode 120000 tests/qemuxml2argvdata/firmware-auto-efi-abi-update.xml copy tests/qemuxml2argvdata/{firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args => firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.args} (80%) copy tests/qemuxml2argvdata/{firmware-auto-efi-format-mismatch.xml => firmware-auto-efi-format-loader-qcow2-nvram-path.xml} (91%) copy tests/qemuxml2argvdata/{firmware-auto-efi-format-loader-raw.aarch64-latest.args => firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.args} (84%) create mode 120000 tests/qemuxml2argvdata/firmware-auto-efi-format-loader-raw-abi-update.xml copy tests/qemuxml2argvdata/{firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args => firmware-auto-efi-loader-secure-abi-update.x86_64-latest.args} (80%) create mode 120000 tests/qemuxml2argvdata/firmware-auto-efi-loader-secure-abi-update.xml rename tests/qemuxml2argvdata/{firmware-auto-efi-nvram.x86_64-latest.args => firmware-auto-efi-nvram-path.x86_64-latest.args} (91%) copy tests/qemuxml2argvdata/{firmware-auto-efi-nvram.xml => firmware-auto-efi-nvram-path.xml} (100%) create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-nvram-template-nonstandard.x86_64-latest.err copy tests/qemuxml2argvdata/{firmware-auto-efi-format-mismatch.xml => firmware-auto-efi-nvram-template-nonstandard.xml} (77%) copy tests/qemuxml2argvdata/{firmware-auto-efi-enrolled-keys.x86_64-latest.args => firmware-auto-efi-nvram-template.x86_64-latest.args} (91%) copy tests/qemuxml2argvdata/{firmware-auto-efi-nvram.xml => firmware-auto-efi-nvram-template.xml} (88%) create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-rw-abi-update.x86_64-latest.err create mode 120000 tests/qemuxml2argvdata/firmware-auto-efi-rw-abi-update.xml create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-rw.x86_64-latest.err copy tests/qemuxml2argvdata/{firmware-auto-efi-nvram.xml => firmware-auto-efi-rw.xml} (91%) copy tests/qemuxml2argvdata/{firmware-auto-efi-aarch64.aarch64-latest.args => firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args} (100%) copy tests/qemuxml2argvdata/{firmware-manual-efi-acpi-aarch64.xml => firmware-manual-efi-aarch64-legacy-paths.xml} (90%) copy tests/qemuxml2argvdata/{firmware-auto-efi-loader-path.x86_64-latest.args => firmware-manual-efi-loader-path-nonstandard.x86_64-latest.args} (90%) copy tests/qemuxml2argvdata/{firmware-manual-efi-acpi-q35.xml => firmware-manual-efi-loader-path-nonstandard.xml} (78%) copy tests/qemuxml2argvdata/{firmware-auto-efi-no-enrolled-keys.x86_64-latest.args => firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.args} (99%) copy tests/qemuxml2argvdata/{firmware-manual-efi-loader-secure.xml => firmware-manual-efi-no-enrolled-keys-legacy-paths.xml} (91%) copy tests/qemuxml2argvdata/{firmware-auto-efi-loader-path.x86_64-latest.args => firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.args} (99%) copy tests/qemuxml2argvdata/{firmware-manual-efi-acpi-q35.xml => firmware-manual-efi-no-secboot-legacy-paths.xml} (90%) copy tests/qemuxml2argvdata/{firmware-auto-efi-loader-path.x86_64-latest.args => firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.args} (91%) copy tests/qemuxml2argvdata/{firmware-auto-efi-format-mismatch.xml => firmware-manual-efi-nvram-template-nonstandard.xml} (75%) copy tests/qemuxml2argvdata/{firmware-auto-efi-stateless.x86_64-latest.args => firmware-manual-efi-rw-legacy-paths.x86_64-latest.args} (81%) copy tests/qemuxml2argvdata/{firmware-auto-efi-nvram.xml => firmware-manual-efi-rw-legacy-paths.xml} (79%) copy tests/qemuxml2argvdata/{firmware-auto-efi-stateless.x86_64-latest.args => firmware-manual-efi-rw-modern-paths.x86_64-latest.args} (80%) rename tests/qemuxml2argvdata/{firmware-auto-efi-nvram.xml => firmware-manual-efi-rw-modern-paths.xml} (78%) copy tests/qemuxml2argvdata/{firmware-auto-efi-no-enrolled-keys.x86_64-latest.args => firmware-manual-efi-secboot-legacy-paths.x86_64-latest.args} (99%) copy tests/qemuxml2argvdata/{firmware-manual-efi-loader-secure.xml => firmware-manual-efi-secboot-legacy-paths.xml} (90%) rename tests/qemuxml2argvdata/{memory-hotplug-nvdimm-ppc64-abi-update.args => memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args} (100%) rename tests/qemuxml2argvdata/{memory-hotplug-ppc64-nonuma-abi-update.args => memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.args} (100%) rename tests/qemuxml2argvdata/{ppc64-usb-controller-qemu-xhci.args => ppc64-usb-controller-qemu-xhci.ppc64-latest.args} (100%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-enrolled-keys.x86_64-latest.xml => firmware-auto-efi-abi-update.x86_64-latest.xml} (82%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-enrolled-keys.x86_64-latest.xml => firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.xml} (83%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-aarch64.aarch64-latest.xml => firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.xml} (81%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-enrolled-keys.x86_64-latest.xml => firmware-auto-efi-loader-secure-abi-update.x86_64-latest.xml} (82%) rename tests/qemuxml2xmloutdata/{firmware-auto-efi-nvram.x86_64-latest.xml => firmware-auto-efi-nvram-path.x86_64-latest.xml} (90%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-stateless.x86_64-latest.xml => firmware-auto-efi-nvram-template-nonstandard.x86_64-latest.xml} (83%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml => firmware-auto-efi-nvram-template.x86_64-latest.xml} (90%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-stateless.x86_64-latest.xml => firmware-auto-efi-rw.x86_64-latest.xml} (83%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-aarch64.aarch64-latest.xml => firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml} (87%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-stateless.x86_64-latest.xml => firmware-manual-efi-loader-path-nonstandard.x86_64-latest.xml} (80%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml => firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.xml} (88%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-loader-path.x86_64-latest.xml => firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.xml} (87%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-stateless.x86_64-latest.xml => firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.xml} (81%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-stateless.x86_64-latest.xml => firmware-manual-efi-rw-legacy-paths.x86_64-latest.xml} (80%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-stateless.x86_64-latest.xml => firmware-manual-efi-rw-modern-paths.x86_64-latest.xml} (80%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-secboot.x86_64-latest.xml => firmware-manual-efi-secboot-legacy-paths.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-ppc64-abi-update.xml => memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{memory-hotplug-ppc64-nonuma-abi-update.xml => memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.xml} (100%) -- 2.41.0

2 22

[PATCH 0/3] meson: Drop python3_prog
by Michal Privoznik 16 Aug '23

16 Aug '23

Found these on a forgotten local branch. I only vaguely recall the reasoning, but hey - some lines are removed. Michal Prívozník (3): scripts: Avoid spawning yet another process in meson-python.sh scripts: Make standalone python scripts executable meson: Drop python3_prog docs/meson.build | 7 ++--- meson.build | 4 +-- scripts/check-drivername.py | 0 scripts/check-remote-protocol.py | 0 scripts/header-ifdef.py | 0 scripts/meson-install-dirs.py | 0 scripts/meson-install-symlink.py | 0 scripts/meson-python.sh | 2 +- scripts/mock-noinline.py | 0 scripts/prohibit-duplicate-header.py | 0 src/access/meson.build | 6 ++-- src/meson.build | 43 +++++++++++++--------------- src/network/meson.build | 2 +- src/qemu/meson.build | 2 +- tests/meson.build | 2 +- 15 files changed, 32 insertions(+), 36 deletions(-) mode change 100644 => 100755 scripts/check-drivername.py mode change 100644 => 100755 scripts/check-remote-protocol.py mode change 100644 => 100755 scripts/header-ifdef.py mode change 100644 => 100755 scripts/meson-install-dirs.py mode change 100644 => 100755 scripts/meson-install-symlink.py mode change 100644 => 100755 scripts/mock-noinline.py mode change 100644 => 100755 scripts/prohibit-duplicate-header.py -- 2.41.0

4 9

[libvirt PATCH 0/2] ci: Introduce Debian 12 target
by Erik Skultety 16 Aug '23

16 Aug '23

This miniseries also moves the CI workloads from Debian 11 to 12 and marks 11 jobs as optional (just like we did for Debian 10 in the past). Erik Skultety (2): ci: Add Debian-12 target ci: Move Debian-11 workloads to Debian-12 ci/buildenv/debian-12-cross-aarch64.sh | 115 ++++++++++ ci/buildenv/debian-12-cross-armv6l.sh | 114 +++++++++ ci/buildenv/debian-12-cross-armv7l.sh | 115 ++++++++++ ci/buildenv/debian-12-cross-i686.sh | 114 +++++++++ ci/buildenv/debian-12-cross-mips64el.sh | 114 +++++++++ ci/buildenv/debian-12-cross-mipsel.sh | 114 +++++++++ ci/buildenv/debian-12-cross-ppc64le.sh | 114 +++++++++ ci/buildenv/debian-12-cross-s390x.sh | 114 +++++++++ ci/buildenv/debian-12.sh | 97 ++++++++ .../debian-12-cross-aarch64.Dockerfile | 121 ++++++++++ .../debian-12-cross-armv6l.Dockerfile | 120 ++++++++++ .../debian-12-cross-armv7l.Dockerfile | 121 ++++++++++ ci/containers/debian-12-cross-i686.Dockerfile | 120 ++++++++++ .../debian-12-cross-mips64el.Dockerfile | 120 ++++++++++ .../debian-12-cross-mipsel.Dockerfile | 120 ++++++++++ .../debian-12-cross-ppc64le.Dockerfile | 120 ++++++++++ .../debian-12-cross-s390x.Dockerfile | 120 ++++++++++ ci/containers/debian-12.Dockerfile | 100 ++++++++ ci/gitlab/builds.yml | 216 ++++++++++++++++++ ci/gitlab/containers.yml | 72 ++++++ ci/manifest.yml | 40 ++++ 21 files changed, 2401 insertions(+) create mode 100644 ci/buildenv/debian-12-cross-aarch64.sh create mode 100644 ci/buildenv/debian-12-cross-armv6l.sh create mode 100644 ci/buildenv/debian-12-cross-armv7l.sh create mode 100644 ci/buildenv/debian-12-cross-i686.sh create mode 100644 ci/buildenv/debian-12-cross-mips64el.sh create mode 100644 ci/buildenv/debian-12-cross-mipsel.sh create mode 100644 ci/buildenv/debian-12-cross-ppc64le.sh create mode 100644 ci/buildenv/debian-12-cross-s390x.sh create mode 100644 ci/buildenv/debian-12.sh create mode 100644 ci/containers/debian-12-cross-aarch64.Dockerfile create mode 100644 ci/containers/debian-12-cross-armv6l.Dockerfile create mode 100644 ci/containers/debian-12-cross-armv7l.Dockerfile create mode 100644 ci/containers/debian-12-cross-i686.Dockerfile create mode 100644 ci/containers/debian-12-cross-mips64el.Dockerfile create mode 100644 ci/containers/debian-12-cross-mipsel.Dockerfile create mode 100644 ci/containers/debian-12-cross-ppc64le.Dockerfile create mode 100644 ci/containers/debian-12-cross-s390x.Dockerfile create mode 100644 ci/containers/debian-12.Dockerfile -- 2.41.0

2 4

[libvirt PATCH 0/2] Fix the failing FreeBSD 13.1 CI build job
by Erik Skultety 16 Aug '23

16 Aug '23

failing CI job reference: https://gitlab.com/libvirt/libvirt/-/jobs/4880861477 Even though 13.1 has been marked as EOL and we are rightfully permitted to bump the version, we can't/shouldn't fix this directly in lcitool just yet, because libosinfo hasn't caught up on this fact yet and if we just bumped the cirrus version in the lcitool target OS config without updating the libosinfo ID we'd create a consistency problem. However, thanks to Paolo Bonzini's work on lcitool we have an easy workaround fix at hand where we can override many data-related things in lcitool. Erik Skultety (2): ci: Introduce a new 'lcitool' data directory ci: Udate FreeBSD-13 image with lcitool manifest ci/gitlab/builds.yml | 2 +- ci/lcitool/targets/freebsd-13.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 ci/lcitool/targets/freebsd-13.yml -- 2.41.0

2 4

Does libvirt support intra-host migration?
by Eric Wheeler 15 Aug '23

15 Aug '23

Hello all: I looked around for documentation on intra-host KVM migration but haven't found much. For example, this could be useful to "migrate" VM to run on an upgraded version of `qemu-kvm` without migrating to a different host and migrating back. We tested migrating a VM to the same host on an old version of libvirt (el7), and it complained about UUID conflicts if the destination already hosts the same VM. Changing the name or the UUID in the destination XML during migration (`virsh migrate --xml`) gives an error that the UUID or name does not match during migration: UUID change: error: unsupported configuration: Target domain uuid 66a113f4-a101-4db1-8478-49cf088fedb9 does not match source b5256b25-e137-45b8-bddb-78545ab55fc4 Name change: error: unsupported configuration: Target domain name 'diskless2' does not match source 'diskless' Questions before we do more testing: - Do modern versions of libvirt support intra-host migration? - If so, which version? - Documentation? Any help you can provide would be greatly appreciated! -- Eric Wheeler

1 0

Re: [PATCH v1 1/3] softmmu/physmem: fallback to opening guest RAM file as readonly in a MAP_PRIVATE mapping
by Peter Xu 12 Aug '23

12 Aug '23

On Fri, Aug 11, 2023 at 06:25:14PM +0200, David Hildenbrand wrote: > On 11.08.23 18:22, Peter Xu wrote: > > On Fri, Aug 11, 2023 at 06:17:05PM +0200, David Hildenbrand wrote: > > > We wouldn't touch "-mem-path". > > > > But still the same issue when someone uses -object memory-backend-file for > > hugetlb, mapping privately, expecting ram discard to work? > > > > Basically I see that example as, "hugetlb" in general made the private > > mapping over RW file usable, so forbidden that anywhere may take a risk. > > These users can be directed to using hugetlb > > a) using MAP_SHARED > b) using memory-backend-memfd, if MAP_PRIVATE is desired > > Am I missing any important use case? Are we being a bit to careful about > virtio-balloon and postcopy simply not being available for these corner > cases? The current immediate issue is not really mem=rw + fd=rw + private case (which was a known issue), but how to make mem=rw + fd=ro + private work for ThinnerBloger, iiuc. I'd just think it safer to expose that cap to solve problem A (vm templating) without affecting problem B (fallcate-over-private not working right), when B is uncertain. I'm also copy Daniel & libvirt list in case there's quick comment from there. Say, maybe libvirt never use private mapping on hugetlb files over memory-backend-file at all, then it's probably fine. In all cases, you and Igor should have the final grasp; no stand on a strong opinon from my side. -- Peter Xu

2 2

[libvirt PATCH] ci: integration: Drop the Fedora 35 check
by Erik Skultety 11 Aug '23

11 Aug '23

We're already past Fedora 35 and so all new fedora's default to modular daemon setup. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- ci/integration-template.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/integration-template.yml b/ci/integration-template.yml index efd04b76c1..111a115286 100644 --- a/ci/integration-template.yml +++ b/ci/integration-template.yml @@ -38,8 +38,7 @@ .enable-libvirt-debugging: &enable-libvirt-debugging - source /etc/os-release # in order to query the vendor-provided variables - - if test "$ID" = "centos" && test "$VERSION_ID" -lt 9 || - test "$ID" = "fedora" && test "$VERSION_ID" -lt 35; + - if test "$ID" = "centos" && test "$VERSION_ID" -lt 9; then DAEMONS="libvirtd virtlockd virtlogd"; else -- 2.41.0

2 1

[PATCH 0/4] migration: Sanitize handling of 'migrate_disks' parameter
by Peter Krempa 10 Aug '23

10 Aug '23

Improve error reporting when users select disk's to migrate but don't enable non-shared storage migration. Peter Krempa (4): qemuMigrationSrcBeginPhase: Properly report error when non-shared storage migration is requested over tunnel qemuMigrationSrcBeginPhase: Require storage migration when 'migrate_disks' parameter is specified virsh: doMigrate: Rework virsh option to migration flag conversion virsh: doMigrate: Require --copy-storage-(all|inc) with --migrate-disks src/qemu/qemu_migration.c | 7 +++ tools/virsh-domain.c | 113 ++++++++++++++++---------------------- 2 files changed, 54 insertions(+), 66 deletions(-) -- 2.41.0

2 8

[PATCH 0/5] introduce support for block device properties
by Kristina Hanicova 09 Aug '23

09 Aug '23

I noticed this on the list after the 1849570 bug on discard granularity: https://listman.redhat.com/archives/libvir-list/2020-June/203862.html so I decided to add maximum unmap size as well. The series is heavily based on Lin's patches and I would be glad if there is any way to add Lin into commit messages as well. Kristina Hanicova (5): conf: add support for discard_granularity qemu: add support for discard_granularity conf: add support for max_unmap_size qemu: Introduce QEMU_CAPS_SCSI_DISK_MAX_UNMAP_SIZE capability qemu: add support for max_unmap_size docs/formatdomain.rst | 16 +++++++- src/conf/domain_conf.c | 22 ++++++++++- src/conf/domain_conf.h | 2 + src/conf/domain_validate.c | 4 +- src/conf/schemas/domaincommon.rng | 10 +++++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 4 ++ src/qemu/qemu_domain.c | 4 ++ src/vz/vz_utils.c | 4 +- .../caps_4.2.0_aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0_s390x.xml | 1 + .../caps_4.2.0_x86_64.xml | 1 + .../caps_5.0.0_aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 1 + .../caps_5.0.0_riscv64.xml | 1 + .../caps_5.0.0_x86_64.xml | 1 + .../qemucapabilitiesdata/caps_5.1.0_sparc.xml | 1 + .../caps_5.1.0_x86_64.xml | 1 + .../caps_5.2.0_aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 1 + .../caps_5.2.0_riscv64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0_s390x.xml | 1 + .../caps_5.2.0_x86_64.xml | 1 + .../caps_6.0.0_aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.0.0_s390x.xml | 1 + .../caps_6.0.0_x86_64.xml | 1 + .../caps_6.1.0_x86_64.xml | 1 + .../caps_6.2.0_aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 + .../caps_6.2.0_x86_64.xml | 1 + .../caps_7.0.0_aarch64+hvf.xml | 1 + .../caps_7.0.0_aarch64.xml | 1 + .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 + .../caps_7.0.0_x86_64.xml | 1 + .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 + .../caps_7.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 + .../caps_7.2.0_x86_64+hvf.xml | 1 + .../caps_7.2.0_x86_64.xml | 1 + .../caps_8.0.0_riscv64.xml | 1 + .../caps_8.0.0_x86_64.xml | 1 + .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 + .../caps_8.1.0_x86_64.xml | 1 + .../disk-blockio.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-blockio.xml | 2 +- ...csi-disk-max_unmap_size.x86_64-latest.args | 37 +++++++++++++++++++ .../disk-scsi-disk-max_unmap_size.xml | 28 ++++++++++++++ tests/qemuxml2argvtest.c | 1 + 50 files changed, 168 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-max_unmap_size.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-max_unmap_size.xml -- 2.41.0

3 9

[PATCH] virStorageBackendLogicalCheckPool: Properly mark empty logical pools as active
by Peter Krempa 09 Aug '23

09 Aug '23

The '/dev' filesystem convenience directory for a LVM volume group is not created when the volume group is empty. The logic in 'virStorageBackendLogicalCheckPool' which is used to see whether a pool is active was first checking presence of the directory, which failed for an empty VG. Since the second step is virStorageBackendLogicalMatchPoolSource which is checking mapping between configured PVs and the VG, we can simply rely on the function to also check presence of the pool. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2228223 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/storage/storage_backend_logical.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 9462ac6790..6acbc37f18 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -624,13 +624,7 @@ static int virStorageBackendLogicalCheckPool(virStoragePoolObj *pool, bool *isActive) { - virStoragePoolDef *def = virStoragePoolObjGetDef(pool); - - /* If we can find the target.path as well as ensure that the - * pool's def source - */ - *isActive = virFileExists(def->target.path) && - virStorageBackendLogicalMatchPoolSource(pool); + *isActive = virStorageBackendLogicalMatchPoolSource(pool); return 0; } -- 2.41.0

2 1