- Devel - libvirt List Archives

[PATCH v6 0/7] qemu: Implement support for iommufd
by Nathan Chen 02 Feb '26

02 Feb '26

Hi, This is a follow up to the fifth patch series [0] for using iommufd to propagate DMA mappings to the kernel for VM-assigned host devices in a qemu VM. We add a new 'iommufd' attribute for hostdev devices to be associated with the iommufd object. For instance, specifying the iommufd object and associated hostdev in a VM definition: <devices> ... <hostdev mode='subsystem' type='pci' managed='no'> <driver iommufd='yes'/> <source> <address domain='0x0009' bus='0x01' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x15' slot='0x00' function='0x0'/> </hostdev> <hostdev mode='subsystem' type='pci' managed='no'> <driver iommufd='yes'/> <source> <address domain='0x0019' bus='0x01' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x16' slot='0x00' function='0x0'/> </hostdev> ... </devices> This would get translated to a qemu command line with the arguments below. Note that libvirt will open the /dev/iommu and VFIO cdev, passing the associated fd number to qemu: -object '{"qom-type":"iommufd","id":"iommufd0","fd":"24"}' \ -device '{"driver":"vfio-pci","host":"0009:01:00.0","id":"hostdev0","iommufd":"iommufd0","fd":"22","bus":"pci.21","addr":"0x0"}' \ -device '{"driver":"vfio-pci","host":"0019:01:00.0","id":"hostdev1","iommufd":"iommufd0","fd":"25","bus":"pci.22","addr":"0x0"}' \ Changes from v5: - Updated documentation to point to 12.1.0 (QEMU and KVM only) - Move define and VIR_LOG_INIT out of #ifdef __linux__ block in viriommufd.h - Remove unneeded virPCIDeviceFree() from AppArmorSetSecurityHostdevLabel - Always error out if per-process accounting failed Changes from v4: - Move qemuProcessOpenVfioFds() to qemu_process.h in patch 4/7 - Add `linux/iommufd.h` into headers list in the meson.build file - Correct viriommufd.c pre-processor definition indentations - Restore call to virIOMMUFDSetRLimitMode() in patch 5/7 - Fix indentations for various print function calls - Move the qemuProcessOpenVfioFds() call to qemuProcessPrepareHost() - Make qemuProcessOpenVfioFds() static - Remove unnecessary formatting and comment in virPCIDeviceGetVfioPath() - Clean up namespace and cgroup changes with conditional check for iommufd - Remove virIOMMUFDSupported() - Fix seclabel return logic - In Apparmor seclabel logic, use g_autoptr for virPCIDevice pointer Changes from v3: - Resolved issue from v2 where stale FD from previous VM boot was in use - Remove second approach for retrieving VFIO device path in virPCIDeviceGetVfioPath() - Resolve broken build of libvirt on non-Linux platforms - Conditionally define iommufd headers and use system headers where possible - Add non-fatal handling + warning print for EPERM for the IOMMU_OPTION_RLIMIT_MODE ioctl - Replace references to /dev/iommu with VIR_IOMMU_DEV_PATH - Implement virIOMMUFDSupported(void) to check for existence of /dev/iommu on host - Include tests for multiple hostdevs Changes from v2: - Set per-process memory accounting mode for iommufd - Separated out formatting of iommufd object from qemuBuildHostdevCommandLine - Placed hostdev private data implementation in a separate commit - Allocate hostdev private data unconditionally - Compare FDs against -1 - Integrated callback function in virQEMUDriverPrivateDataCallbacks for qemuDomainHostdevPrivateNew - Dropped qemuProcessCloseVfioFds - Addressed other feedback from v2 (formatting, includes, etc.) - Revised seclabel logic to be device-specific for AppArmor and to allow paths for SELinux/DAC This series is on Github: https://github.com/NathanChenNVIDIA/libvirt/commits/iommufd-v6-01-26 Thanks, Nathan [0] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/GKSD… Nathan Chen (7): qemu: Implement support for associating iommufd to hostdev qemu: Introduce privateData for hostdevs qemu: Support per-process memory accounting for iommufd qemu: open VFIO FDs from libvirt backend qemu: open iommufd FD from libvirt backend qemu: Update Cgroup, namespace, and seclabel for iommufd tests: qemuxmlconfdata: provide iommufd sample XML and CLI args docs/formatdomain.rst | 6 + meson.build | 1 + po/POTFILES | 1 + src/bhyve/bhyve_parse_command.c | 2 +- src/conf/device_conf.c | 11 ++ src/conf/device_conf.h | 1 + src/conf/domain_conf.c | 13 +- src/conf/domain_conf.h | 5 +- src/conf/schemas/basictypes.rng | 5 + src/libvirt_private.syms | 4 + src/libxl/xen_common.c | 2 +- src/libxl/xen_xl.c | 2 +- src/lxc/lxc_native.c | 2 +- src/qemu/qemu_cgroup.c | 3 + src/qemu/qemu_command.c | 76 +++++++++++ src/qemu/qemu_domain.c | 41 ++++++ src/qemu/qemu_domain.h | 17 +++ src/qemu/qemu_namespace.c | 3 + src/qemu/qemu_process.c | 121 ++++++++++++++++++ src/security/security_apparmor.c | 28 ++-- src/security/security_dac.c | 49 +++++-- src/security/security_selinux.c | 47 +++++-- src/security/virt-aa-helper.c | 33 ++++- src/util/meson.build | 1 + src/util/viriommufd.c | 111 ++++++++++++++++ src/util/viriommufd.h | 25 ++++ src/util/virpci.c | 39 ++++++ src/util/virpci.h | 2 + src/vbox/vbox_common.c | 2 +- .../iommufd-q35.x86_64-latest.args | 41 ++++++ .../iommufd-q35.x86_64-latest.xml | 60 +++++++++ tests/qemuxmlconfdata/iommufd-q35.xml | 38 ++++++ ...fd-virt-pci-bus-single.aarch64-latest.args | 32 +++++ ...ufd-virt-pci-bus-single.aarch64-latest.xml | 31 +++++ .../iommufd-virt-pci-bus-single.xml | 22 ++++ .../iommufd-virt.aarch64-latest.args | 36 ++++++ .../iommufd-virt.aarch64-latest.xml | 53 ++++++++ tests/qemuxmlconfdata/iommufd-virt.xml | 29 +++++ .../iommufd.x86_64-latest.args | 35 +++++ .../qemuxmlconfdata/iommufd.x86_64-latest.xml | 38 ++++++ tests/qemuxmlconfdata/iommufd.xml | 30 +++++ tests/qemuxmlconftest.c | 34 +++++ tests/virhostdevtest.c | 2 +- 43 files changed, 1090 insertions(+), 44 deletions(-) create mode 100644 src/util/viriommufd.c create mode 100644 src/util/viriommufd.h create mode 100644 tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/iommufd-q35.xml create mode 100644 tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args create mode 100644 tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.xml create mode 100644 tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args create mode 100644 tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/iommufd-virt.xml create mode 100644 tests/qemuxmlconfdata/iommufd.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/iommufd.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/iommufd.xml -- 2.43.0

2 11

[PATCH 0/2] target/arm: Deprecate '-cpu any'
by Philippe Mathieu-Daudé 02 Feb '26

02 Feb '26

Arm '-cpu any' is aliased to '-cpu max' since more than 5 years. Deprecate the former in preparation of removal. Philippe Mathieu-Daudé (2): target/arm: Remove dead code target/arm: Deprecate '-cpu any' (remplaced by '-cpu max') docs/about/deprecated.rst | 8 ++++++++ target/arm/cpu.c | 1 + target/arm/tcg/cpu32.c | 3 --- 3 files changed, 9 insertions(+), 3 deletions(-) -- 2.52.0

2 3

[PATCH v7 0/2] qemu: Support accelerated vSMMUs
by Nathan Chen 30 Jan '26

30 Jan '26

Hi, This is a follow up to the sixth RFC patchset [0] for supporting multiple accelerated vSMMU instances. Support for user-creatable accelerated SMMUv3 in QEMU has been applied to target-arm.next [1]. For instance, specifying hostdevs associated with multiple accelerated SMMUs, configured to be routed to pcie-expander-bus controllers in a way where VFIO device to SMMUv3 associations are matched with the host: <devices> ... <controller type='pci' index='1' model='pcie-expander-bus'> <model name='pxb-pcie'/> <target busNr='252'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </controller> <controller type='pci' index='2' model='pcie-expander-bus'> <model name='pxb-pcie'/> <target busNr='248'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </controller> ... <controller type='pci' index='21' model='pcie-root-port'> <model name='pcie-root-port'/> <target chassis='21' port='0x0'/> <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> </controller> <controller type='pci' index='22' model='pcie-root-port'> <model name='pcie-root-port'/> <target chassis='22' port='0xa8'/> <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> </controller> ... <hostdev mode='subsystem' type='pci' managed='no'> <source> <address domain='0x0009' bus='0x01' slot='0x00' function='0x0'/> </source> <vpasidCapOffset>0xff8</vpasidCapOffset> <address type='pci' domain='0x0000' bus='0x15' slot='0x00' function='0x0'/> </hostdev> <hostdev mode='subsystem' type='pci' managed='no'> <source> <address domain='0x0019' bus='0x01' slot='0x00' function='0x0'/> </source> <vpasidCapOffset>0xff8</vpasidCapOffset> <address type='pci' domain='0x0000' bus='0x16' slot='0x00' function='0x0'/> </hostdev> <iommu model='smmuv3'> <driver parentIdx='1' accel='on' ats='on' ril='off' ssidSize='20' oas='44'/> </iommu> <iommu model='smmuv3'> <driver parentIdx='2' accel='on' ats='on' ril='off' ssidSize='20' oas='44'/> </iommu> </devices> This would get translated to a qemu command line with the arguments below: -device '{"driver":"pxb-pcie","bus_nr":252,"id":"pci.1","bus":"pcie.0","addr":"0x1"}' \ -device '{"driver":"pxb-pcie","bus_nr":248,"id":"pci.2","bus":"pcie.0","addr":"0x2"}' \ -device '{"driver":"pcie-root-port","port":0,"chassis":21,"id":"pci.21","bus":"pci.1","addr":"0x0"}' \ -device '{"driver":"pcie-root-port","port":168,"chassis":22,"id":"pci.22","bus":"pci.2","addr":"0x0"}' \ -device '{"driver":"arm-smmuv3","primary-bus":"pci.1","id":"iommu0","accel":true,"ats":true,"ril":false,"ssidsize":20,"oas":44}' \ -device '{"driver":"arm-smmuv3","primary-bus":"pci.2","id":"iommu1","accel":true,"ats":true,"ril":false,"ssidsize":20,"oas":44}' \ -device '{"driver":"vfio-pci","host":"0009:01:00.0","id":"hostdev0","x-vpasid-cap-offset":4088,"bus":"pci.21","addr":"0x0"}' \ -device '{"driver":"vfio-pci","host":"0019:01:00.0","id":"hostdev1","x-vpasid-cap-offset":4088,"bus":"pci.22","addr":"0x0"}' \ This series is on Github: https://github.com/NathanChenNVIDIA/libvirt/tree/smmuv3-accel-01-26-v7/ Thanks, Nathan Changes from v6: - Remove smmuv3 'pasid' attribute - Add smmuv3 'ssidsize' attribute - Add support for 'vpasidCapOffset' element - Modify logic for building accel smmuv3 qemu command line to omit ATS, RIL, accel flags when not needed (enabled/disabled by default in QEMU SMMUv3) [0] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/VRSS… [1] https://lore.kernel.org/qemu-devel/20260126104342.253965-1-skolothumtho@nvi… Nathan Chen (2): qemu: Add support for HW-accelerated nested SMMUv3 tests: qemuxmlconfdata: provide HW-accel smmuv3 sample XML and CLI args docs/formatdomain.rst | 36 +++++++ src/conf/domain_conf.c | 101 +++++++++++++++++- src/conf/domain_conf.h | 6 ++ src/conf/domain_validate.c | 36 ++++++- src/conf/schemas/domaincommon.rng | 32 ++++++ src/qemu/qemu_command.c | 23 ++++ src/util/virpci.h | 4 + ...u-smmuv3-pci-bus-accel.aarch64-latest.args | 38 +++++++ ...mu-smmuv3-pci-bus-accel.aarch64-latest.xml | 64 +++++++++++ .../iommu-smmuv3-pci-bus-accel.xml | 54 ++++++++++ tests/qemuxmlconftest.c | 1 + 11 files changed, 390 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-accel.aarch64-latest.args create mode 100644 tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-accel.aarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-accel.xml -- 2.43.0

1 2

[PATCH v5 0/7] qemu: Implement support for iommufd
by Nathan Chen 30 Jan '26

30 Jan '26

Hi, This is a follow up to the fourth patch series [0] for using iommufd to propagate DMA mappings to the kernel for VM-assigned host devices in a qemu VM. We add a new 'iommufd' attribute for hostdev devices to be associated with the iommufd object. For instance, specifying the iommufd object and associated hostdev in a VM definition: <devices> ... <hostdev mode='subsystem' type='pci' managed='no'> <driver iommufd='yes'/> <source> <address domain='0x0009' bus='0x01' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x15' slot='0x00' function='0x0'/> </hostdev> <hostdev mode='subsystem' type='pci' managed='no'> <driver iommufd='yes'/> <source> <address domain='0x0019' bus='0x01' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x16' slot='0x00' function='0x0'/> </hostdev> ... </devices> This would get translated to a qemu command line with the arguments below. Note that libvirt will open the /dev/iommu and VFIO cdev, passing the associated fd number to qemu: -object '{"qom-type":"iommufd","id":"iommufd0","fd":"24"}' \ -device '{"driver":"vfio-pci","host":"0009:01:00.0","id":"hostdev0","iommufd":"iommufd0","fd":"22","bus":"pci.21","addr":"0x0"}' \ -device '{"driver":"vfio-pci","host":"0019:01:00.0","id":"hostdev1","iommufd":"iommufd0","fd":"25","bus":"pci.22","addr":"0x0"}' \ Changes from v4: - Move qemuProcessOpenVfioFds() to qemu_process.h in patch 4/7 - Add `linux/iommufd.h` into headers list in the meson.build file - Correct viriommufd.c pre-processor definition indentations - Restore call to virIOMMUFDSetRLimitMode() in patch 5/7 - Fix indentations for various print function calls - Move the qemuProcessOpenVfioFds() call to qemuProcessPrepareHost() - Make qemuProcessOpenVfioFds() static - Remove unnecessary formatting and comment in virPCIDeviceGetVfioPath() - Clean up namespace and cgroup changes with conditional check for iommufd - Remove virIOMMUFDSupported() - Fix seclabel return logic - In Apparmor seclabel logic, use g_autoptr for virPCIDevice pointer Changes from v3: - Resolved issue from v2 where stale FD from previous VM boot was in use - Remove second approach for retrieving VFIO device path in virPCIDeviceGetVfioPath() - Resolve broken build of libvirt on non-Linux platforms - Conditionally define iommufd headers and use system headers where possible - Add non-fatal handling + warning print for EPERM for the IOMMU_OPTION_RLIMIT_MODE ioctl - Replace references to /dev/iommu with VIR_IOMMU_DEV_PATH - Implement virIOMMUFDSupported(void) to check for existence of /dev/iommu on host - Include tests for multiple hostdevs Changes from v2: - Set per-process memory accounting mode for iommufd - Separated out formatting of iommufd object from qemuBuildHostdevCommandLine - Placed hostdev private data implementation in a separate commit - Allocate hostdev private data unconditionally - Compare FDs against -1 - Integrated callback function in virQEMUDriverPrivateDataCallbacks for qemuDomainHostdevPrivateNew - Dropped qemuProcessCloseVfioFds - Addressed other feedback from v2 (formatting, includes, etc.) - Revised seclabel logic to be device-specific for AppArmor and to allow paths for SELinux/DAC This series is on Github: https://github.com/NathanChenNVIDIA/libvirt/commits/iommufd-v5-01-26 Thanks, Nathan [0] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/4BEU… Nathan Chen (7): qemu: Implement support for associating iommufd to hostdev qemu: Introduce privateData for hostdevs qemu: Support per-process memory accounting for iommufd qemu: open VFIO FDs from libvirt backend qemu: open iommufd FD from libvirt backend qemu: Update Cgroup, namespace, and seclabel for iommufd tests: qemuxmlconfdata: provide iommufd sample XML and CLI args docs/formatdomain.rst | 7 + meson.build | 1 + po/POTFILES | 1 + src/bhyve/bhyve_parse_command.c | 2 +- src/conf/device_conf.c | 11 ++ src/conf/device_conf.h | 1 + src/conf/domain_conf.c | 13 +- src/conf/domain_conf.h | 5 +- src/conf/schemas/basictypes.rng | 5 + src/libvirt_private.syms | 4 + src/libxl/xen_common.c | 2 +- src/libxl/xen_xl.c | 2 +- src/lxc/lxc_native.c | 2 +- src/qemu/qemu_cgroup.c | 3 + src/qemu/qemu_command.c | 76 +++++++++++ src/qemu/qemu_domain.c | 41 ++++++ src/qemu/qemu_domain.h | 17 +++ src/qemu/qemu_namespace.c | 3 + src/qemu/qemu_process.c | 121 ++++++++++++++++++ src/security/security_apparmor.c | 31 +++-- src/security/security_dac.c | 49 +++++-- src/security/security_selinux.c | 47 +++++-- src/security/virt-aa-helper.c | 33 ++++- src/util/meson.build | 1 + src/util/viriommufd.c | 111 ++++++++++++++++ src/util/viriommufd.h | 25 ++++ src/util/virpci.c | 39 ++++++ src/util/virpci.h | 2 + src/vbox/vbox_common.c | 2 +- .../iommufd-q35.x86_64-latest.args | 41 ++++++ .../iommufd-q35.x86_64-latest.xml | 60 +++++++++ tests/qemuxmlconfdata/iommufd-q35.xml | 38 ++++++ ...fd-virt-pci-bus-single.aarch64-latest.args | 32 +++++ ...ufd-virt-pci-bus-single.aarch64-latest.xml | 31 +++++ .../iommufd-virt-pci-bus-single.xml | 22 ++++ .../iommufd-virt.aarch64-latest.args | 36 ++++++ .../iommufd-virt.aarch64-latest.xml | 53 ++++++++ tests/qemuxmlconfdata/iommufd-virt.xml | 29 +++++ .../iommufd.x86_64-latest.args | 35 +++++ .../qemuxmlconfdata/iommufd.x86_64-latest.xml | 38 ++++++ tests/qemuxmlconfdata/iommufd.xml | 30 +++++ tests/qemuxmlconftest.c | 34 +++++ tests/virhostdevtest.c | 2 +- 43 files changed, 1093 insertions(+), 45 deletions(-) create mode 100644 src/util/viriommufd.c create mode 100644 src/util/viriommufd.h create mode 100644 tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/iommufd-q35.xml create mode 100644 tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args create mode 100644 tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.xml create mode 100644 tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args create mode 100644 tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/iommufd-virt.xml create mode 100644 tests/qemuxmlconfdata/iommufd.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/iommufd.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/iommufd.xml -- 2.43.0

2 21

[PATCH] networkxmlconftest: Expect success for "hostdev" case only on Linux
by Michal Privoznik 30 Jan '26

30 Jan '26

From: Michal Privoznik <mprivozn(a)redhat.com> Our network has multiple means of forwarding the traffic and 'hostdev' is one of them. This mode means that the network is configured to use a set of PCI devices which are then assigned to individual domains to use (PCI device assignment). Now, as of v12.0.0-61-gecb2e06bdf our test runners (testCompareXMLToXMLFiles() and testCompareXMLToConfFiles()) call networkValidateTests(). For aforementioned type of network this means checking that the specified set of devices contains only VFs (see v3.2.0-rc1~24 for more info). It is true that our virpcimock is preloaded which mimics VFs, but our utils module (virpci.c specifically) talks to sysfs to check various PCI device attributes, including whether it's a VF. This obviously works on Linux and doesn't work anywhere else. Therefore, until our utils module is taught how to check PCI attribs on other systems, make the "hostdev" test case expect validation failure on non-Linux systems. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/networkxmlconftest.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/networkxmlconftest.c b/tests/networkxmlconftest.c index b32a39c553..b74d5b14f5 100644 --- a/tests/networkxmlconftest.c +++ b/tests/networkxmlconftest.c @@ -313,7 +313,16 @@ mymain(void) DO_TEST("bandwidth-network"); DO_TEST("openvswitch-net"); DO_TEST_VALIDATE_ERROR("passthrough-pf"); +#ifdef __linux__ DO_TEST("hostdev"); +#else + /* Our test runners call networkValidateTests() which for + * <forward mode='hostdev'/> means validating that PCI + * devices are VFs. It's done so by querying sysfs which + * obviously works on Linux only. Thus, expect a validation + * error elsewhere. */ + DO_TEST_VALIDATE_ERROR("hostdev"); +#endif DO_TEST_FLAGS("hostdev-pf", VIR_NETWORK_XML_INACTIVE); DO_TEST_FLAGS("hostdev-pf-driver-model", VIR_NETWORK_XML_INACTIVE); DO_TEST("ptr-domains-auto"); -- 2.52.0

2 1

[PATCH v6] qapi: net: deprecate vhostforce option
by Vladimir Sementsov-Ogievskiy 30 Jan '26

30 Jan '26

This option for tap and vhost-user netdevs doesn't make sense since long ago (10 years!), starting from commits: 1e7398a140f7a6 ("vhost: enable vhost without without MSI-X") 24f938a682d934 ("vhost user:support vhost user nic for non msi guests") Prior these commits, to enable kernel vhost-net, or vhost-user-net for some specific kind of guests (that don't have MSI-X support), you should have set vhostforce=on. Now guest type doesn't matter, all guests are equal for these options logic. For tap the current logic is: vhost=on / vhost=off : vhostforce ignored, doesn't make sense vhost unset : vhostforce counts, enabling vhost So you may enable vhost for tap several ways: - vhost=on - vhostforce=on - vhost=on + vhostforce=on - and even vhost=on + vhostforce=off - they are all equal. For vhost-user we simply ignore the vhostforce option at all in the code. Let's finally deprecate the extra options. Also, fix @vhostforce documentation everywhere to show the real picture, and update vhost-user test to not use deprecated option. While updating command line options, drop "experimental" word from "experimental in kernel accelerator". vhost-net is in production for years. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov(a)yandex-team.ru> Reviewed-by: Markus Armbruster <armbru(a)redhat.com> --- v6: - update numbers 10.2 -> 11.0 - add r-b by Markus docs/about/deprecated.rst | 11 +++++++++++ qapi/net.json | 18 ++++++++++++++---- qemu-options.hx | 13 +++++-------- tests/qtest/vhost-user-test.c | 2 +- 4 files changed, 31 insertions(+), 13 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 03e29915f0..3f97392a45 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -498,6 +498,17 @@ Backend ``memory`` (since 9.0) ``memory`` is a deprecated synonym for ``ringbuf``. +TAP ``vhostforce`` (since 11.0) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The ``vhostforce`` option is redundant with the ``vhost`` option. +If they conflict, ``vhost`` takes precedence. Just use ``vhost``. + +Vhost-user ``vhostforce`` (since 11.0) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The ``vhostforce`` option is a no-op. Do not use it. + CPU device properties ''''''''''''''''''''' diff --git a/qapi/net.json b/qapi/net.json index 118bd34965..9a00d578e9 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -348,13 +348,18 @@ # @vhostfds: file descriptors of multiple already opened vhost net # devices # -# @vhostforce: vhost on for non-MSIX virtio guests +# @vhostforce: enable vhost-net network accelerator. Ignored when +# @vhost is set. # # @queues: number of queues to be created for multiqueue capable tap # # @poll-us: maximum number of microseconds that could be spent on busy # polling for tap (since 2.7) # +# Features: +# +# @deprecated: Member @vhostforce is deprecated. Use @vhost instead. +# # Since: 1.2 ## { 'struct': 'NetdevTapOptions', @@ -371,7 +376,7 @@ '*vhost': 'bool', '*vhostfd': 'str', '*vhostfds': 'str', - '*vhostforce': 'bool', + '*vhostforce': { 'type': 'bool', 'features': [ 'deprecated' ] }, '*queues': 'uint32', '*poll-us': 'uint32'} } @@ -610,17 +615,22 @@ # # @chardev: name of a unix socket chardev # -# @vhostforce: vhost on for non-MSIX virtio guests (default: false). +# @vhostforce: silently ignored, exists just for backward +# compatibility. # # @queues: number of queues to be created for multiqueue vhost-user # (default: 1) (Since 2.5) # +# Features: +# +# @deprecated: Member @vhostforce is deprecated. +# # Since: 2.1 ## { 'struct': 'NetdevVhostUserOptions', 'data': { 'chardev': 'str', - '*vhostforce': 'bool', + '*vhostforce': { 'type': 'bool', 'features': [ 'deprecated' ] }, '*queues': 'int' } } ## diff --git a/qemu-options.hx b/qemu-options.hx index fca2b7bc74..414b762743 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2882,7 +2882,7 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, #else "-netdev tap,id=str[,fd=h][,fds=x:y:...:z][,ifname=name][,script=file][,downscript=dfile]\n" " [,br=bridge][,helper=helper][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off]\n" - " [,vhostfd=h][,vhostfds=x:y:...:z][,vhostforce=on|off][,queues=n]\n" + " [,vhostfd=h][,vhostfds=x:y:...:z][,queues=n]\n" " [,poll-us=n]\n" " configure a host TAP network backend with ID 'str'\n" " connected to a bridge (default=" DEFAULT_BRIDGE_INTERFACE ")\n" @@ -2898,9 +2898,7 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, " default is disabled 'sndbuf=0' to enable flow control set 'sndbuf=1048576')\n" " use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag\n" " use vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition\n" - " use vhost=on to enable experimental in kernel accelerator\n" - " (only has effect for virtio guests which use MSIX)\n" - " use vhostforce=on to force vhost on for non-MSIX virtio guests\n" + " use vhost=on to enable in kernel accelerator\n" " use 'vhostfd=h' to connect to an already opened vhost net device\n" " use 'vhostfds=x:y:...:z to connect to multiple already opened vhost net devices\n" " use 'queues=n' to specify the number of queues to be created for multiqueue TAP\n" @@ -2991,7 +2989,7 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, " use 'start-queue=m' to specify the first queue that should be used\n" #endif #ifdef CONFIG_POSIX - "-netdev vhost-user,id=str,chardev=dev[,vhostforce=on|off]\n" + "-netdev vhost-user,id=str,chardev=dev\n" " configure a vhost-user network, backed by a chardev 'dev'\n" #endif #ifdef __linux__ @@ -3882,12 +3880,11 @@ SRST for insertion into the socket map. The combination of 'map-path' and 'sock-fds' together is not supported. -``-netdev vhost-user,chardev=id[,vhostforce=on|off][,queues=n]`` +``-netdev vhost-user,chardev=id[,queues=n]`` Establish a vhost-user netdev, backed by a chardev id. The chardev should be a unix domain socket backed one. The vhost-user uses a specifically defined protocol to pass vhost ioctl replacement - messages to an application on the other end of the socket. On - non-MSIX guests, the feature can be forced with vhostforce. Use + messages to an application on the other end of the socket. Use 'queues=n' to specify the number of queues to be created for multiqueue vhost-user. diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c index d2bb21d5b9..f977f50baf 100644 --- a/tests/qtest/vhost-user-test.c +++ b/tests/qtest/vhost-user-test.c @@ -46,7 +46,7 @@ #define QEMU_CMD_SHM " -m %d -object memory-backend-shm,id=mem,size=%dM," \ " -numa node,memdev=mem" #define QEMU_CMD_CHR " -chardev socket,id=%s,path=%s%s" -#define QEMU_CMD_NETDEV " -netdev vhost-user,id=hs0,chardev=%s,vhostforce=on" +#define QEMU_CMD_NETDEV " -netdev vhost-user,id=hs0,chardev=%s" #define HUGETLBFS_MAGIC 0x958458f6 -- 2.48.1

2 3

[libvirt PATCH] virt-aa-helper: replace usage of magic constant
by Pavel Hrdina 29 Jan '26

29 Jan '26

From: Pavel Hrdina <phrdina(a)redhat.com> Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- I wonder if we should just drop that argument and use QEMU_DOMAIN_STORAGE_SOURCE_CHAIN_MAX_DEPTH inside the function directly as the only remaining caller with different value is from virstoragetest.c src/security/virt-aa-helper.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 211c34f926..443646c0a1 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -901,12 +901,12 @@ get_files(vahControl * ctl) continue; /* XXX - if we knew the qemu user:group here we could send it in * so that the open could be re-tried as that user:group. - * - * The maximum depth is limited to 200 layers similarly to the qemu - * implementation. */ - if (!disk->src->backingStore) - virStorageSourceGetMetadata(disk->src, -1, -1, 200, false); + if (!disk->src->backingStore) { + virStorageSourceGetMetadata(disk->src, -1, -1, + QEMU_DOMAIN_STORAGE_SOURCE_CHAIN_MAX_DEPTH, + false); + } /* XXX should handle open errors more careful than just ignoring them. */ -- 2.52.0

3 5

[PATCH] ci: regenerate with 'lcitool manifest'
by Michal Privoznik 29 Jan '26

29 Jan '26

From: Michal Privoznik <mprivozn(a)redhat.com> Update Alpine to 3.23. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- ci/buildenv/{alpine-322.sh => alpine-323.sh} | 0 .../{alpine-322.Dockerfile => alpine-323.Dockerfile} | 2 +- ci/gitlab/builds.yml | 8 ++++---- ci/gitlab/containers.yml | 4 ++-- ci/manifest.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename ci/buildenv/{alpine-322.sh => alpine-323.sh} (100%) rename ci/containers/{alpine-322.Dockerfile => alpine-323.Dockerfile} (98%) diff --git a/ci/buildenv/alpine-322.sh b/ci/buildenv/alpine-323.sh similarity index 100% rename from ci/buildenv/alpine-322.sh rename to ci/buildenv/alpine-323.sh diff --git a/ci/containers/alpine-322.Dockerfile b/ci/containers/alpine-323.Dockerfile similarity index 98% rename from ci/containers/alpine-322.Dockerfile rename to ci/containers/alpine-323.Dockerfile index e3672a9788..ee1f194808 100644 --- a/ci/containers/alpine-322.Dockerfile +++ b/ci/containers/alpine-323.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/alpine:3.22 +FROM docker.io/library/alpine:3.23 RUN apk update && \ apk upgrade && \ diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index fe1468ff81..7e671b7d99 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -59,15 +59,15 @@ x86_64-almalinux-10-clang: TARGET_BASE_IMAGE: docker.io/library/almalinux:10 -x86_64-alpine-322: +x86_64-alpine-323: extends: .native_build_job needs: - - job: x86_64-alpine-322-container + - job: x86_64-alpine-323-container optional: true allow_failure: false variables: - NAME: alpine-322 - TARGET_BASE_IMAGE: docker.io/library/alpine:3.22 + NAME: alpine-323 + TARGET_BASE_IMAGE: docker.io/library/alpine:3.23 x86_64-alpine-edge: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 56b974f2a1..1fbf11b21a 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -21,11 +21,11 @@ x86_64-almalinux-10-container: NAME: almalinux-10 -x86_64-alpine-322-container: +x86_64-alpine-323-container: extends: .container_job allow_failure: false variables: - NAME: alpine-322 + NAME: alpine-323 x86_64-alpine-edge-container: diff --git a/ci/manifest.yml b/ci/manifest.yml index 2fdb764142..a673f0c413 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -32,7 +32,7 @@ targets: RPM: skip CC: clang - alpine-322: x86_64 + alpine-323: x86_64 alpine-edge: jobs: -- 2.52.0

2 1

[PATCH 0/5] qemu: migration: Always try to migrate block dirty bitmaps
by Peter Krempa 29 Jan '26

29 Jan '26

Try to migrate them always when they are not present in the destination image. While this has no change if they are present and on shared filesystem it does allow migrating them when the filesystem is not shared but we're not migrating storage. This is a special case for qcow2 overlay with data_file feature. The code uses the existing logic for offering and accepting bitmaps, just fixed a bug and enables the code for all kinds of migration. See 5/5 for more in-depth description. Peter Krempa (5): qemublocktest: Iterate all nodenames in 'testQemuDetectBitmaps' qemu: monitor: Detect list of bitmaps from 'qcow2' format specific data qemuMigrationDstPrepareAnyBlockDirtyBitmaps: Fix check for existing bitmaps qemu: migration: Always offer block dirty bitmaps during migration qemuMigrationDstPrepareAnyBlockDirtyBitmaps: Always consider offered bitmaps src/qemu/qemu_migration.c | 54 ++++++------------- src/qemu/qemu_monitor.h | 4 ++ src/qemu/qemu_monitor_json.c | 17 ++++++ tests/qemublocktest.c | 35 ++++++------ tests/qemublocktestdata/bitmap/basic.out | 1 + tests/qemublocktestdata/bitmap/empty.out | 1 + .../bitmap/snapshots-internal.out | 7 +++ tests/qemublocktestdata/bitmap/snapshots.out | 10 ++++ tests/qemublocktestdata/bitmap/synthetic.out | 9 ++++ 9 files changed, 86 insertions(+), 52 deletions(-) -- 2.52.0

2 7

[PATCH 00/20] tests: Join networkxml2xmltest and networkxml2conftest into one
by Michal Privoznik 29 Jan '26

29 Jan '26

This was inspired by seemingly unrelated patches I've sent a month ago: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/WVTY… I was adding one attribute to an element and had to change three different test XMLs. Anyway, this is also available here: https://gitlab.com/MichalPrivoznik/libvirt/-/tree/network_tests?ref_type=he… Michal Prívozník (20): tests: Avoid crossdir inclusion for networkxml2* tests network: Separate private APIs declaration to bridge_driver_priv.h network: Move decision on dnsmasq need into a separate function networkxml2conftest: Drop routed-network-no-dns test case networkxml2conftest: Fail tests where no dnsmasq would be spawned networkxml2xmltest: Update couple of test cases network: Introduce networkValidateTests() test: wire up networkValidateTests() networkxml2conftest: Avoid potential leak networkxml2conftest: Allow regenerating hosts file networkxml2conftest: Allow regenerating more in one run networkxml2xmltest: Don't recreate xmlopt object networkxml2xmltest: Introduce testRun() networkxml2xmltest: Move path generation into testRun() networkxml2xmltest: Dynamically allocate testInfo struct networkxml2xmltest: Store parsed def for future tests networkxml2xmltest: Sync test cases with networkxml2conftest networkxml2xmltest: Do conf test tests: Drop networkxml2conftest tests: Rename networkxml2xmltest to networkxmlconftest src/network/bridge_driver.c | 62 ++++- src/network/bridge_driver.h | 15 - .../{bridge_driver.h => bridge_driver_priv.h} | 33 +-- tests/meson.build | 5 +- .../networkxml2confdata/isolated-network.xml | 11 - .../nat-network-dns-hosts.xml | 15 - tests/networkxml2confdata/nat-network-mtu.xml | 22 -- tests/networkxml2confdata/nat-network.xml | 21 -- tests/networkxml2confdata/netboot-network.xml | 14 - .../netboot-proxy-network.xml | 13 - tests/networkxml2confdata/open-network.xml | 9 - tests/networkxml2confdata/routed-network.xml | 9 - tests/networkxml2conftest.c | 200 -------------- tests/networkxml2firewalltest.c | 12 +- tests/networkxml2xmlin/dnsmasq-options.xml | 15 - tests/networkxml2xmlin/hostdev.xml | 10 - tests/networkxml2xmlin/leasetime-hours.xml | 1 - tests/networkxml2xmlin/leasetime-infinite.xml | 1 - tests/networkxml2xmlin/leasetime-minutes.xml | 1 - tests/networkxml2xmlin/leasetime-seconds.xml | 1 - .../nat-network-dns-forward-plain.xml | 9 - .../nat-network-dns-forwarders.xml | 14 - .../nat-network-dns-srv-record.xml | 26 -- .../nat-network-dns-txt-record.xml | 24 -- tests/networkxml2xmlin/netboot-tftp.xml | 1 - .../routed-network-no-dns.xml | 10 - tests/networkxml2xmlout/hostdev.xml | 10 - tests/networkxml2xmlout/leasetime-hours.xml | 1 - .../networkxml2xmlout/leasetime-infinite.xml | 1 - tests/networkxml2xmlout/leasetime-minutes.xml | 1 - tests/networkxml2xmlout/leasetime-seconds.xml | 1 - .../nat-network-dns-forwarder-no-resolv.xml | 11 - tests/networkxml2xmlout/netboot-tftp.xml | 1 - .../passthrough-address-crash.xml | 7 - tests/networkxml2xmlout/passthrough-pf.xml | 9 - .../srv-record-protocol.xml | 2 +- .../nat-network-dns-hosts-modified.xml | 1 + .../nat-network-dns-more-hosts.xml | 1 + .../nat-network-dns-srv-records.xml | 6 + .../nat-network-forward-ifaces.xml | 6 + .../nat-network-no-forward-ifaces.xml | 6 + .../nat-network-no-hosts.xml | 1 + tests/networkxml2xmlupdateout/nat-network.xml | 8 + .../openvswitch-net-modified.xml | 4 +- .../openvswitch-net-more-portgroups.xml | 6 +- .../openvswitch-net-without-alice.xml | 4 +- tests/networkxml2xmlupdatetest.c | 2 +- .../8021Qbh-net.expect.xml} | 3 - .../8021Qbh-net.xml | 3 - .../bandwidth-network.conf} | 10 +- .../bandwidth-network.expect.xml} | 0 .../bandwidth-network.xml | 0 .../dhcp6-nat-network.conf | 0 .../dhcp6-nat-network.expect.xml} | 16 +- .../dhcp6-nat-network.hostsfile | 0 .../dhcp6-nat-network.xml | 0 .../dhcp6-network.conf | 0 .../dhcp6-network.expect.xml} | 5 +- .../dhcp6-network.hostsfile | 0 .../dhcp6-network.xml | 0 .../dhcp6host-routed-network.conf | 0 .../dhcp6host-routed-network.expect.xml} | 0 .../dhcp6host-routed-network.hostsfile | 0 .../dhcp6host-routed-network.xml | 0 .../direct-net.expect.xml} | 0 .../direct-net.xml | 0 .../dnsmasq-options.conf | 0 .../dnsmasq-options.expect.xml} | 1 + .../dnsmasq-options.xml | 0 .../empty-allow-ipv6.expect.xml} | 0 .../empty-allow-ipv6.xml | 0 .../host-bridge-net.expect.xml} | 0 .../host-bridge-net.xml | 0 .../host-bridge-no-flood.expect.xml} | 0 .../host-bridge-no-flood.xml | 0 .../hostdev-duplicate.xml | 0 .../hostdev-pf-driver-model.expect.xml} | 0 .../hostdev-pf-driver-model.xml | 0 .../hostdev-pf.expect.xml} | 0 .../hostdev-pf.xml | 0 .../hostdev.expect.xml} | 4 +- .../hostdev.xml} | 4 +- .../isolated-network.conf | 0 .../isolated-network.expect.xml} | 0 .../isolated-network.xml | 0 .../isolated-ports.expect.xml} | 0 .../isolated-ports.xml | 0 .../leasetime-hours.conf | 0 .../leasetime-hours.expect.xml | 1 + .../leasetime-hours.hostsfile | 0 .../leasetime-hours.xml | 1 + .../leasetime-infinite.conf | 0 .../leasetime-infinite.expect.xml | 1 + .../leasetime-infinite.hostsfile | 0 .../leasetime-infinite.xml | 1 + .../leasetime-minutes.conf | 0 .../leasetime-minutes.expect.xml | 1 + .../leasetime-minutes.hostsfile | 0 .../leasetime-minutes.xml | 1 + .../leasetime-seconds.conf | 0 .../leasetime-seconds.expect.xml | 1 + .../leasetime-seconds.hostsfile | 0 .../leasetime-seconds.xml | 1 + .../metadata.expect.xml} | 0 .../metadata.xml | 0 .../nat-network-dns-forward-plain.conf | 0 .../nat-network-dns-forward-plain.expect.xml} | 1 + .../nat-network-dns-forward-plain.xml | 0 .../nat-network-dns-forwarder-no-resolv.conf | 0 ...etwork-dns-forwarder-no-resolv.expect.xml} | 1 + .../nat-network-dns-forwarder-no-resolv.xml | 0 .../nat-network-dns-forwarders.conf | 0 .../nat-network-dns-forwarders.expect.xml} | 4 +- .../nat-network-dns-forwarders.xml | 2 +- .../nat-network-dns-hosts.conf | 0 .../nat-network-dns-hosts.expect.xml} | 2 + .../nat-network-dns-hosts.xml | 1 + .../nat-network-dns-local-domain.conf | 0 .../nat-network-dns-local-domain.expect.xml} | 3 +- .../nat-network-dns-local-domain.xml | 0 .../nat-network-dns-srv-record-minimal.conf | 2 +- ...network-dns-srv-record-minimal.expect.xml} | 3 +- ...t-network-dns-srv-record-minimal.hostsfile | 0 .../nat-network-dns-srv-record-minimal.xml | 2 +- .../nat-network-dns-srv-record.conf | 2 +- .../nat-network-dns-srv-record.expect.xml} | 7 + .../nat-network-dns-srv-record.hostsfile | 0 .../nat-network-dns-srv-record.xml | 2 +- .../nat-network-dns-srv-records.conf} | 2 + .../nat-network-dns-srv-records.expect.xml} | 1 + .../nat-network-dns-srv-records.hostsfile} | 0 .../nat-network-dns-srv-records.xml | 0 .../nat-network-dns-txt-record.conf | 0 .../nat-network-dns-txt-record.expect.xml} | 1 + .../nat-network-dns-txt-record.hostsfile | 0 .../nat-network-dns-txt-record.xml | 0 .../nat-network-explicit-flood.conf} | 0 .../nat-network-explicit-flood.expect.xml} | 1 + .../nat-network-explicit-flood.hostsfile} | 0 .../nat-network-explicit-flood.xml | 0 .../nat-network-forward-nat-address.conf} | 0 ...at-network-forward-nat-address.expect.xml} | 1 + ...nat-network-forward-nat-address.hostsfile} | 0 .../nat-network-forward-nat-address.xml | 0 .../nat-network-forward-nat-ipv6.conf} | 2 +- .../nat-network-forward-nat-ipv6.expect.xml} | 1 + .../nat-network-forward-nat-ipv6.xml | 0 .../nat-network-forward-nat-no-address.conf} | 0 ...network-forward-nat-no-address.expect.xml} | 1 + ...-network-forward-nat-no-address.hostsfile} | 0 .../nat-network-forward-nat-no-address.xml | 0 .../nat-network-mtu.conf | 0 .../nat-network-mtu.expect.xml} | 1 + .../nat-network-mtu.hostsfile | 0 .../nat-network-mtu.xml | 0 .../nat-network-name-with-quotes.conf | 0 .../nat-network-name-with-quotes.expect.xml} | 3 +- .../nat-network-name-with-quotes.hostsfile | 0 .../nat-network-name-with-quotes.xml | 0 .../nat-network.conf | 0 .../nat-network.expect.xml} | 1 + .../nat-network.hostsfile | 0 .../nat-network.xml | 0 .../netboot-network.conf | 0 .../netboot-network.expect.xml} | 1 + .../netboot-network.xml | 0 .../netboot-proxy-network.conf | 0 .../netboot-proxy-network.expect.xml} | 1 + .../netboot-proxy-network.xml | 0 .../netboot-tftp.conf | 0 .../netboot-tftp.expect.xml | 1 + .../netboot-tftp.xml | 1 + .../open-network-with-forward-dev.xml | 0 .../open-network.conf | 0 .../open-network.expect.xml} | 0 .../open-network.xml | 0 .../openvswitch-net.expect.xml} | 6 +- .../openvswitch-net.xml | 6 +- .../passthrough-address-crash.xml | 0 .../passthrough-duplicate.xml | 0 .../passthrough-pf.conf} | 4 +- .../passthrough-pf.xml | 0 .../ptr-domains-auto.conf | 0 .../ptr-domains-auto.expect.xml} | 10 +- .../ptr-domains-auto.hostsfile | 0 .../ptr-domains-auto.xml | 0 .../routed-network-no-dns-extra-elements.xml | 0 .../routed-network-no-dns.expect.xml} | 0 .../routed-network-no-dns.xml | 0 .../routed-network.conf | 0 .../routed-network.expect.xml} | 0 .../routed-network.xml | 0 .../set-mtu.conf} | 1 + .../set-mtu.expect.xml} | 0 .../set-mtu.xml | 0 .../vepa-net.expect.xml} | 0 .../vepa-net.xml | 0 ...workxml2xmltest.c => networkxmlconftest.c} | 256 +++++++++++++++--- tests/qemuxmlconftest.c | 6 +- tests/virschematest.c | 4 +- 200 files changed, 414 insertions(+), 627 deletions(-) copy src/network/{bridge_driver.h => bridge_driver_priv.h} (33%) delete mode 100644 tests/networkxml2confdata/isolated-network.xml delete mode 100644 tests/networkxml2confdata/nat-network-dns-hosts.xml delete mode 100644 tests/networkxml2confdata/nat-network-mtu.xml delete mode 100644 tests/networkxml2confdata/nat-network.xml delete mode 100644 tests/networkxml2confdata/netboot-network.xml delete mode 100644 tests/networkxml2confdata/netboot-proxy-network.xml delete mode 100644 tests/networkxml2confdata/open-network.xml delete mode 100644 tests/networkxml2confdata/routed-network.xml delete mode 100644 tests/networkxml2conftest.c delete mode 100644 tests/networkxml2xmlin/dnsmasq-options.xml delete mode 100644 tests/networkxml2xmlin/hostdev.xml delete mode 120000 tests/networkxml2xmlin/leasetime-hours.xml delete mode 120000 tests/networkxml2xmlin/leasetime-infinite.xml delete mode 120000 tests/networkxml2xmlin/leasetime-minutes.xml delete mode 120000 tests/networkxml2xmlin/leasetime-seconds.xml delete mode 100644 tests/networkxml2xmlin/nat-network-dns-forward-plain.xml delete mode 100644 tests/networkxml2xmlin/nat-network-dns-forwarders.xml delete mode 100644 tests/networkxml2xmlin/nat-network-dns-srv-record.xml delete mode 100644 tests/networkxml2xmlin/nat-network-dns-txt-record.xml delete mode 120000 tests/networkxml2xmlin/netboot-tftp.xml delete mode 100644 tests/networkxml2xmlin/routed-network-no-dns.xml delete mode 100644 tests/networkxml2xmlout/hostdev.xml delete mode 120000 tests/networkxml2xmlout/leasetime-hours.xml delete mode 120000 tests/networkxml2xmlout/leasetime-infinite.xml delete mode 120000 tests/networkxml2xmlout/leasetime-minutes.xml delete mode 120000 tests/networkxml2xmlout/leasetime-seconds.xml delete mode 100644 tests/networkxml2xmlout/nat-network-dns-forwarder-no-resolv.xml delete mode 120000 tests/networkxml2xmlout/netboot-tftp.xml delete mode 100644 tests/networkxml2xmlout/passthrough-address-crash.xml delete mode 100644 tests/networkxml2xmlout/passthrough-pf.xml rename tests/{networkxml2xmlout/8021Qbh-net.xml => networkxmlconfdata/8021Qbh-net.expect.xml} (90%) rename tests/{networkxml2xmlin => networkxmlconfdata}/8021Qbh-net.xml (90%) copy tests/{networkxml2confdata/leasetime-hours.conf => networkxmlconfdata/bandwidth-network.conf} (61%) rename tests/{networkxml2xmlout/bandwidth-network.xml => networkxmlconfdata/bandwidth-network.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/bandwidth-network.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/dhcp6-nat-network.conf (100%) rename tests/{networkxml2confdata/dhcp6host-routed-network.xml => networkxmlconfdata/dhcp6-nat-network.expect.xml} (65%) rename tests/{networkxml2confdata => networkxmlconfdata}/dhcp6-nat-network.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/dhcp6-nat-network.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/dhcp6-network.conf (100%) copy tests/{networkxml2confdata/dhcp6-network.xml => networkxmlconfdata/dhcp6-network.expect.xml} (87%) rename tests/{networkxml2confdata => networkxmlconfdata}/dhcp6-network.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/dhcp6-network.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/dhcp6host-routed-network.conf (100%) rename tests/{networkxml2xmlout/dhcp6host-routed-network.xml => networkxmlconfdata/dhcp6host-routed-network.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/dhcp6host-routed-network.hostsfile (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/dhcp6host-routed-network.xml (100%) rename tests/{networkxml2xmlout/direct-net.xml => networkxmlconfdata/direct-net.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/direct-net.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/dnsmasq-options.conf (100%) rename tests/{networkxml2xmlout/dnsmasq-options.xml => networkxmlconfdata/dnsmasq-options.expect.xml} (94%) rename tests/{networkxml2confdata => networkxmlconfdata}/dnsmasq-options.xml (100%) rename tests/{networkxml2xmlout/empty-allow-ipv6.xml => networkxmlconfdata/empty-allow-ipv6.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/empty-allow-ipv6.xml (100%) rename tests/{networkxml2xmlout/host-bridge-net.xml => networkxmlconfdata/host-bridge-net.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/host-bridge-net.xml (100%) rename tests/{networkxml2xmlout/host-bridge-no-flood.xml => networkxmlconfdata/host-bridge-no-flood.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/host-bridge-no-flood.xml (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/hostdev-duplicate.xml (100%) rename tests/{networkxml2xmlin/hostdev-pf-driver-model.xml => networkxmlconfdata/hostdev-pf-driver-model.expect.xml} (100%) copy tests/{networkxml2xmlout => networkxmlconfdata}/hostdev-pf-driver-model.xml (100%) rename tests/{networkxml2xmlin/hostdev-pf.xml => networkxmlconfdata/hostdev-pf.expect.xml} (100%) rename tests/{networkxml2xmlout => networkxmlconfdata}/hostdev-pf.xml (100%) copy tests/{networkxml2xmlout/hostdev-pf-driver-model.xml => networkxmlconfdata/hostdev.expect.xml} (48%) rename tests/{networkxml2xmlout/hostdev-pf-driver-model.xml => networkxmlconfdata/hostdev.xml} (48%) copy tests/{networkxml2confdata => networkxmlconfdata}/isolated-network.conf (100%) rename tests/{networkxml2xmlout/isolated-network.xml => networkxmlconfdata/isolated-network.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/isolated-network.xml (100%) rename tests/{networkxml2xmlout/isolated-ports.xml => networkxmlconfdata/isolated-ports.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/isolated-ports.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-hours.conf (100%) create mode 120000 tests/networkxmlconfdata/leasetime-hours.expect.xml rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-hours.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-hours.xml (94%) rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-infinite.conf (100%) create mode 120000 tests/networkxmlconfdata/leasetime-infinite.expect.xml rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-infinite.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-infinite.xml (94%) rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-minutes.conf (100%) create mode 120000 tests/networkxmlconfdata/leasetime-minutes.expect.xml rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-minutes.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-minutes.xml (94%) rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-seconds.conf (100%) create mode 120000 tests/networkxmlconfdata/leasetime-seconds.expect.xml rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-seconds.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/leasetime-seconds.xml (94%) rename tests/{networkxml2xmlout/metadata.xml => networkxmlconfdata/metadata.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/metadata.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-forward-plain.conf (100%) copy tests/{networkxml2xmlout/nat-network-dns-forward-plain.xml => networkxmlconfdata/nat-network-dns-forward-plain.expect.xml} (89%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-forward-plain.xml (100%) copy tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-forwarder-no-resolv.conf (100%) rename tests/{networkxml2xmlin/nat-network-dns-forwarder-no-resolv.xml => networkxmlconfdata/nat-network-dns-forwarder-no-resolv.expect.xml} (89%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-forwarder-no-resolv.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-forwarders.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-forwarders.xml => networkxmlconfdata/nat-network-dns-forwarders.expect.xml} (71%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-forwarders.xml (90%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-hosts.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-hosts.xml => networkxmlconfdata/nat-network-dns-hosts.expect.xml} (91%) rename tests/{networkxml2xmlin => networkxmlconfdata}/nat-network-dns-hosts.xml (95%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-local-domain.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-forward-plain.xml => networkxmlconfdata/nat-network-dns-local-domain.expect.xml} (76%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-local-domain.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-srv-record-minimal.conf (93%) rename tests/{networkxml2xmlout/nat-network-dns-srv-record-minimal.xml => networkxmlconfdata/nat-network-dns-srv-record-minimal.expect.xml} (88%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-srv-record-minimal.hostsfile (100%) copy tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-srv-record-minimal.xml (92%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-srv-record.conf (93%) rename tests/{networkxml2xmlout/nat-network-dns-srv-record.xml => networkxmlconfdata/nat-network-dns-srv-record.expect.xml} (58%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-srv-record.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-srv-record.xml (91%) copy tests/{networkxml2confdata/nat-network.conf => networkxmlconfdata/nat-network-dns-srv-records.conf} (90%) rename tests/{networkxml2xmlout/nat-network-dns-srv-records.xml => networkxmlconfdata/nat-network-dns-srv-records.expect.xml} (96%) copy tests/{networkxml2confdata/nat-network-dns-txt-record.hostsfile => networkxmlconfdata/nat-network-dns-srv-records.hostsfile} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/nat-network-dns-srv-records.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-txt-record.conf (100%) rename tests/{networkxml2xmlout/nat-network-dns-txt-record.xml => networkxmlconfdata/nat-network-dns-txt-record.expect.xml} (95%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-txt-record.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-dns-txt-record.xml (100%) copy tests/{networkxml2confdata/nat-network.conf => networkxmlconfdata/nat-network-explicit-flood.conf} (100%) rename tests/{networkxml2xmlout/nat-network-explicit-flood.xml => networkxmlconfdata/nat-network-explicit-flood.expect.xml} (95%) copy tests/{networkxml2confdata/nat-network-mtu.hostsfile => networkxmlconfdata/nat-network-explicit-flood.hostsfile} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/nat-network-explicit-flood.xml (100%) copy tests/{networkxml2confdata/nat-network.conf => networkxmlconfdata/nat-network-forward-nat-address.conf} (100%) rename tests/{networkxml2xmlout/nat-network-forward-nat-address.xml => networkxmlconfdata/nat-network-forward-nat-address.expect.xml} (96%) copy tests/{networkxml2confdata/nat-network-name-with-quotes.hostsfile => networkxmlconfdata/nat-network-forward-nat-address.hostsfile} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/nat-network-forward-nat-address.xml (100%) rename tests/{networkxml2confdata/nat-network-dns-forwarder-no-resolv.conf => networkxmlconfdata/nat-network-forward-nat-ipv6.conf} (90%) rename tests/{networkxml2xmlout/nat-network-forward-nat-ipv6.xml => networkxmlconfdata/nat-network-forward-nat-ipv6.expect.xml} (88%) rename tests/{networkxml2xmlin => networkxmlconfdata}/nat-network-forward-nat-ipv6.xml (100%) copy tests/{networkxml2confdata/nat-network.conf => networkxmlconfdata/nat-network-forward-nat-no-address.conf} (100%) rename tests/{networkxml2xmlout/nat-network-forward-nat-no-address.xml => networkxmlconfdata/nat-network-forward-nat-no-address.expect.xml} (95%) copy tests/{networkxml2confdata/nat-network.hostsfile => networkxmlconfdata/nat-network-forward-nat-no-address.hostsfile} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/nat-network-forward-nat-no-address.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-mtu.conf (100%) rename tests/{networkxml2xmlout/nat-network-mtu.xml => networkxmlconfdata/nat-network-mtu.expect.xml} (95%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-mtu.hostsfile (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/nat-network-mtu.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-name-with-quotes.conf (100%) rename tests/{networkxml2confdata/nat-network-dns-srv-record-minimal.xml => networkxmlconfdata/nat-network-name-with-quotes.expect.xml} (90%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-name-with-quotes.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network-name-with-quotes.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network.conf (100%) rename tests/{networkxml2xmlout/nat-network.xml => networkxmlconfdata/nat-network.expect.xml} (95%) rename tests/{networkxml2confdata => networkxmlconfdata}/nat-network.hostsfile (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/nat-network.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/netboot-network.conf (100%) rename tests/{networkxml2xmlout/netboot-network.xml => networkxmlconfdata/netboot-network.expect.xml} (91%) rename tests/{networkxml2xmlin => networkxmlconfdata}/netboot-network.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/netboot-proxy-network.conf (100%) rename tests/{networkxml2xmlout/netboot-proxy-network.xml => networkxmlconfdata/netboot-proxy-network.expect.xml} (91%) rename tests/{networkxml2xmlin => networkxmlconfdata}/netboot-proxy-network.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/netboot-tftp.conf (100%) create mode 120000 tests/networkxmlconfdata/netboot-tftp.expect.xml rename tests/{networkxml2confdata => networkxmlconfdata}/netboot-tftp.xml (87%) rename tests/{networkxml2xmlin => networkxmlconfdata}/open-network-with-forward-dev.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/open-network.conf (100%) rename tests/{networkxml2xmlout/open-network.xml => networkxmlconfdata/open-network.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/open-network.xml (100%) rename tests/{networkxml2xmlin/openvswitch-net.xml => networkxmlconfdata/openvswitch-net.expect.xml} (87%) rename tests/{networkxml2xmlout => networkxmlconfdata}/openvswitch-net.xml (87%) rename tests/{networkxml2xmlin => networkxmlconfdata}/passthrough-address-crash.xml (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/passthrough-duplicate.xml (100%) rename tests/{networkxml2confdata/routed-network-no-dns.conf => networkxmlconfdata/passthrough-pf.conf} (82%) rename tests/{networkxml2xmlin => networkxmlconfdata}/passthrough-pf.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/ptr-domains-auto.conf (100%) rename tests/{networkxml2xmlin/nat-network-dns-srv-record-minimal.xml => networkxmlconfdata/ptr-domains-auto.expect.xml} (76%) rename tests/{networkxml2confdata => networkxmlconfdata}/ptr-domains-auto.hostsfile (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/ptr-domains-auto.xml (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/routed-network-no-dns-extra-elements.xml (100%) rename tests/{networkxml2xmlout/routed-network-no-dns.xml => networkxmlconfdata/routed-network-no-dns.expect.xml} (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/routed-network-no-dns.xml (100%) rename tests/{networkxml2confdata => networkxmlconfdata}/routed-network.conf (100%) rename tests/{networkxml2xmlout/routed-network.xml => networkxmlconfdata/routed-network.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/routed-network.xml (100%) rename tests/{networkxml2confdata/isolated-network.conf => networkxmlconfdata/set-mtu.conf} (95%) rename tests/{networkxml2xmlout/set-mtu.xml => networkxmlconfdata/set-mtu.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/set-mtu.xml (100%) rename tests/{networkxml2xmlout/vepa-net.xml => networkxmlconfdata/vepa-net.expect.xml} (100%) rename tests/{networkxml2xmlin => networkxmlconfdata}/vepa-net.xml (100%) rename tests/{networkxml2xmltest.c => networkxmlconftest.c} (35%) -- 2.52.0

2 21