First series is here: https://www.redhat.com/archives/libvir-list/2016-January/msg01233.html This series does two main things: it conditionally enables QEMU_CAPS_DEVICE in the test suite (since that's all we support nowadays), and it unconditionally calls qemuDomainAssignAddresses for qemuxml2xml testing, since that's the only realistic XML parsing scenario in the qemu driver. The first 3 patches have been committed, but there's still a couple big churn patches in here but the actual code changes are small. v2: Remove accidentally squashed bits from patch #1 Rebase to master Cole Robinson (6): tests: qemuxml2argv: remove some QEMU_CAPS_DEVICE problem cases tests: Unconditionally enable QEMU_CAPS_DEVICE tests: qemuxml2xml: Allow test cases to pass in qemuCaps tests: utils: Add PreFormat callback for CompareXML2XML helper tests: qemuxml2xml: assign device addresses tests: qemu: More aarch64 virtio and pci tests tests/bhyvexml2xmltest.c | 3 +- tests/genericxml2xmltest.c | 3 +- tests/lxcxml2xmltest.c | 3 +- ...> qemuxml2argv-aarch64-virtio-pci-default.args} | 0 ...=> qemuxml2argv-aarch64-virtio-pci-default.xml} | 0 ...2argv-aarch64-virtio-pci-manual-addresses.args} | 0 ...l2argv-aarch64-virtio-pci-manual-addresses.xml} | 0 .../qemuxml2argv-blkiotune-device.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 7 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.args | 10 +- .../qemuxml2argv-boot-menu-disable.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 8 +- .../qemuxml2argv-boot-network.args | 7 +- .../qemuxml2argv-clock-catchup.args | 8 +- .../qemuxml2argv-clock-france.args | 8 +- .../qemuxml2argv-clock-hpet-off.args | 8 +- ...muxml2argv-clock-localtime-basis-localtime.args | 8 +- .../qemuxml2argv-clock-localtime.args | 7 +- .../qemuxml2argv-clock-timer-hyperv-rtc.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 8 +- .../qemuxml2argv-clock-variable.args | 8 +- .../qemuxml2argv-console-compat-auto.args | 7 +- .../qemuxml2argv-console-compat.args | 8 +- .../qemuxml2argv-cpu-Haswell-noTSX.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args | 5 +- .../qemuxml2argv-cpu-Haswell2.args | 5 +- .../qemuxml2argv-cpu-Haswell3.args | 5 +- .../qemuxml2argv-cpu-eoi-disabled.args | 5 +- .../qemuxml2argv-cpu-eoi-enabled.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 5 +- .../qemuxml2argv-cpu-exact2-nofallback.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 5 +- .../qemuxml2argv-cpu-fallback.args | 5 +- .../qemuxml2argv-cpu-host-kvmclock.args | 5 +- .../qemuxml2argv-cpu-host-model-fallback.args | 5 +- .../qemuxml2argv-cpu-host-model-vendor.args | 5 +- .../qemuxml2argv-cpu-host-model.args | 5 +- ...qemuxml2argv-cpu-host-passthrough-features.args | 8 +- .../qemuxml2argv-cpu-host-passthrough.args | 5 +- .../qemuxml2argv-cpu-kvmclock.args | 5 +- .../qemuxml2argv-cpu-minimum1.args | 5 +- .../qemuxml2argv-cpu-minimum2.args | 5 +- .../qemuxml2argv-cpu-numa-disjoint.args | 5 +- .../qemuxml2argv-cpu-numa-no-memory-element.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 5 +- .../qemuxml2argv-cpu-topology1.args | 5 +- .../qemuxml2argv-cpu-topology2.args | 5 +- .../qemuxml2argv-cpu-topology3.args | 5 +- .../qemuxml2argv-cputune-numatune.args | 7 +- .../qemuxml2argv-cputune-numatune.xml | 12 +- .../qemuxml2argv-cputune-zero-shares.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.args | 8 +- .../qemuxml2argv-default-kvm-host-arch.args | 5 +- .../qemuxml2argv-default-qemu-host-arch.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 15 +- .../qemuxml2argv-disk-cdrom-empty.args | 10 +- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 11 +- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 10 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 11 +- .../qemuxml2argv-disk-drive-boot-disk.args | 11 +- .../qemuxml2argv-disk-drive-cache-directsync.args | 11 +- .../qemuxml2argv-disk-drive-cache-unsafe.args | 12 +- .../qemuxml2argv-disk-drive-cache-v2-none.args | 12 +- .../qemuxml2argv-disk-drive-cache-v2-wb.args | 11 +- .../qemuxml2argv-disk-drive-cache-v2-wt.args | 11 +- .../qemuxml2argv-disk-drive-copy-on-read.args | 8 +- ...uxml2argv-disk-drive-error-policy-enospace.args | 13 +- .../qemuxml2argv-disk-drive-error-policy-stop.args | 13 +- ...gv-disk-drive-error-policy-wreport-rignore.args | 13 +- .../qemuxml2argv-disk-drive-fat.args | 8 +- .../qemuxml2argv-disk-drive-fmt-qcow.args | 11 +- .../qemuxml2argv-disk-drive-network-gluster.args | 13 +- ...qemuxml2argv-disk-drive-network-iscsi-auth.args | 12 +- .../qemuxml2argv-disk-drive-network-iscsi.args | 14 +- ...qemuxml2argv-disk-drive-network-nbd-export.args | 12 +- ...ml2argv-disk-drive-network-nbd-ipv6-export.args | 11 +- .../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 11 +- .../qemuxml2argv-disk-drive-network-nbd-unix.args | 12 +- .../qemuxml2argv-disk-drive-network-nbd.args | 11 +- .../qemuxml2argv-disk-drive-network-rbd-auth.args | 11 +- .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 11 +- .../qemuxml2argv-disk-drive-network-rbd.args | 26 +- .../qemuxml2argv-disk-drive-network-sheepdog.args | 12 +- ...qemuxml2argv-disk-drive-readonly-no-device.args | 13 +- .../qemuxml2argv-disk-drive-shared.args | 12 +- ...emuxml2argv-disk-floppy-tray-no-device-cap.args | 14 +- .../qemuxml2argvdata/qemuxml2argv-disk-floppy.args | 13 +- .../qemuxml2argv-disk-geometry.args | 10 +- .../qemuxml2argvdata/qemuxml2argv-disk-iscsi.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-disk-many.args | 16 +- .../qemuxml2argv-disk-snapshot.args | 17 +- .../qemuxml2argv-disk-usb-nosupport.xml} | 0 tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args | 23 - .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 19 +- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 13 +- .../qemuxml2argv-eoi-disabled.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 5 +- .../qemuxml2argv-fips-enabled.args | 8 +- .../qemuxml2argv-floppy-drive-fat.args | 8 +- .../qemuxml2argv-graphics-sdl-fullscreen.args | 7 +- .../qemuxml2argv-graphics-sdl.args | 7 +- .../qemuxml2argv-graphics-vnc-policy.args | 7 +- .../qemuxml2argv-graphics-vnc-sasl.args | 7 +- .../qemuxml2argv-graphics-vnc-socket.args | 7 +- .../qemuxml2argv-graphics-vnc-tls.args | 7 +- .../qemuxml2argv-graphics-vnc-websocket.args | 4 +- .../qemuxml2argv-graphics-vnc.args | 7 +- .../qemuxml2argv-hostdev-pci-address.args | 9 +- .../qemuxml2argv-hostdev-usb-address.args | 9 +- .../qemuxml2argv-hugepages-pages.args | 8 +- .../qemuxml2argv-hugepages-pages2.args | 8 +- .../qemuxml2argv-hugepages-pages3.args | 8 +- .../qemuxml2argv-hugepages-pages5.args | 8 +- .../qemuxml2argv-hugepages-pages6.args | 8 +- .../qemuxml2argv-hugepages-shared.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-hyperv-off.args | 5 +- .../qemuxml2argv-hyperv-panic.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 6 +- .../qemuxml2argv-input-usbmouse.args | 9 +- .../qemuxml2argv-input-usbtablet.args | 9 +- .../qemuxml2argv-iothreads-ids-partial.args | 7 +- .../qemuxml2argv-iothreads-ids.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-iothreads.args | 7 +- .../qemuxml2argv-kvm-features-off.args | 5 +- .../qemuxml2argv-kvm-features.args | 6 +- .../qemuxml2argv-kvm-pit-delay.args | 8 +- .../qemuxml2argv-kvm-pit-device.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-kvm.args | 6 +- .../qemuxml2argv-kvmclock+eoi-disabled.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args | 6 +- .../qemuxml2argv-machine-aliases1.args | 8 +- .../qemuxml2argv-machine-aliases2.args | 8 +- .../qemuxml2argv-machine-core-off.args | 7 +- .../qemuxml2argv-machine-core-on.args | 7 +- .../qemuxml2argv-machine-usb-opt.args | 8 +- .../qemuxml2argv-machine-vmport-opt.args | 8 +- .../qemuxml2argv-memory-hotplug.args | 8 +- .../qemuxml2argv-memtune-unlimited.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-memtune.args | 8 +- .../qemuxml2argv-migrate-numa-unaligned.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.args | 7 +- .../qemuxml2argv-minimal-msg-timestamp.args | 8 +- .../qemuxml2argv-minimal-s390.args | 21 - .../qemuxml2argvdata/qemuxml2argv-minimal-s390.xml | 21 - tests/qemuxml2argvdata/qemuxml2argv-minimal.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args | 7 +- .../qemuxml2argv-misc-disable-s3.args | 7 +- .../qemuxml2argv-misc-disable-suspends.args | 7 +- .../qemuxml2argv-misc-enable-s4.args | 7 +- .../qemuxml2argv-misc-no-reboot.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 6 +- .../qemuxml2argv-mlock-unsupported.args | 6 +- .../qemuxml2argvdata/qemuxml2argv-net-client.args | 9 +- .../qemuxml2argv-net-eth-ifname.args | 10 +- .../qemuxml2argv-net-eth-names.args | 11 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 10 +- tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 9 +- .../qemuxml2argvdata/qemuxml2argv-net-server.args | 9 +- tests/qemuxml2argvdata/qemuxml2argv-net-udp.args | 9 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 10 +- .../qemuxml2argvdata/qemuxml2argv-net-virtio.args | 10 +- .../qemuxml2argv-nographics-vga.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-nographics.args | 8 +- .../qemuxml2argv-nosharepages.args | 7 +- ...qemuxml2argv-numad-auto-memory-vcpu-cpuset.args | 8 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 8 +- ...muxml2argv-numad-auto-vcpu-static-numatune.args | 8 +- ...qemuxml2argv-numad-static-memory-auto-vcpu.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-numad.args | 8 +- ...qemuxml2argv-numatune-auto-nodeset-invalid.args | 8 +- .../qemuxml2argv-numatune-auto-prefer.args | 5 +- .../qemuxml2argv-numatune-memnode-no-memory.args | 5 +- .../qemuxml2argv-numatune-memnode.args | 5 +- .../qemuxml2argv-numatune-memory.args | 8 +- .../qemuxml2argv-parallel-tcp.args | 6 +- .../qemuxml2argv-pmu-feature-off.args | 6 +- .../qemuxml2argvdata/qemuxml2argv-pmu-feature.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 4 +- .../qemuxml2argv-pseries-nvram.args | 4 +- .../qemuxml2argv-pv-spinlock-disabled.args | 5 +- .../qemuxml2argv-pv-spinlock-enabled.args | 5 +- .../qemuxml2argv-qemu-ns-commandline-ns0.args | 8 +- .../qemuxml2argv-qemu-ns-commandline-ns1.args | 8 +- .../qemuxml2argv-qemu-ns-commandline.args | 8 +- ...emuxml2argv-qemu-ns-domain-commandline-ns0.args | 8 +- .../qemuxml2argv-qemu-ns-domain-commandline.args | 8 +- .../qemuxml2argv-qemu-ns-domain-ns0.args | 8 +- .../qemuxml2argv-qemu-ns-no-env.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 8 +- .../qemuxml2argv-reboot-timeout-disabled.args | 6 +- .../qemuxml2argv-reboot-timeout-enabled.args | 6 +- .../qemuxml2argv-restore-v2-fd.args | 10 +- .../qemuxml2argvdata/qemuxml2argv-restore-v2.args | 7 +- .../qemuxml2argv-seclabel-dac-none.args | 8 +- .../qemuxml2argv-seclabel-dynamic-baselabel.args | 8 +- .../qemuxml2argv-seclabel-dynamic-labelskip.args | 8 +- .../qemuxml2argv-seclabel-dynamic-override.args | 11 +- .../qemuxml2argv-seclabel-dynamic-relabel.args | 8 +- .../qemuxml2argv-seclabel-dynamic.args | 8 +- .../qemuxml2argv-seclabel-none.args | 8 +- .../qemuxml2argv-seclabel-static-labelskip.args | 8 +- .../qemuxml2argv-seclabel-static-relabel.args | 8 +- .../qemuxml2argv-seclabel-static.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-dev.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-many.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-pty.args | 8 +- .../qemuxml2argv-serial-spiceport-nospice.args | 8 +- .../qemuxml2argv-serial-tcp-telnet.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-tcp.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-udp.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-unix.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-smp.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-sound.args | 12 +- .../qemuxml2argv-video-qxl-nodevice.args | 14 +- .../qemuxml2argv-video-vga-nodevice.args | 12 +- .../qemuxml2argv-watchdog-dump.args | 12 +- .../qemuxml2argv-watchdog-injectnmi.args | 12 +- tests/qemuxml2argvdata/qemuxml2argv-watchdog.args | 9 +- tests/qemuxml2argvtest.c | 582 ++++++++++----------- .../qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml | 6 +- .../qemuxml2xmlout-aarch64-virtio-pci-default.xml | 69 +++ ...2xmlout-aarch64-virtio-pci-manual-addresses.xml | 53 ++ .../qemuxml2xmlout-balloon-device-auto.xml | 12 +- .../qemuxml2xmlout-balloon-device-period.xml | 8 +- .../qemuxml2xmlout-bios-nvram-os-interleave.xml | 12 +- .../qemuxml2xmlout-bios-nvram.xml | 12 +- .../qemuxml2xmlout-blkdeviotune.xml | 12 +- .../qemuxml2xmlout-blkiotune-device.xml | 12 +- .../qemuxml2xmlout-blkiotune.xml | 12 +- .../qemuxml2xmlout-boot-cdrom.xml | 8 +- .../qemuxml2xmlout-boot-floppy.xml | 8 +- ...muxml2xmlout-boot-menu-disable-with-timeout.xml | 12 +- .../qemuxml2xmlout-boot-menu-disable.xml | 12 +- ...emuxml2xmlout-boot-menu-enable-with-timeout.xml | 12 +- .../qemuxml2xmlout-boot-multi.xml | 12 +- .../qemuxml2xmlout-boot-network.xml | 8 +- .../qemuxml2xmlout-boot-order.xml | 14 +- .../qemuxml2xmlout-channel-guestfwd.xml | 12 +- .../qemuxml2xmlout-channel-virtio-auto.xml | 29 +- .../qemuxml2xmlout-channel-virtio-state-active.xml | 12 +- ...emuxml2xmlout-channel-virtio-state-inactive.xml | 12 +- .../qemuxml2xmlout-channel-virtio.xml | 12 +- .../qemuxml2xmlout-chardev-label.xml | 13 +- .../qemuxml2xmlout-clock-catchup.xml | 12 +- .../qemuxml2xmlout-clock-localtime.xml | 8 +- .../qemuxml2xmlout-clock-timer-hyperv-rtc.xml | 8 +- .../qemuxml2xmlout-clock-utc.xml | 8 +- .../qemuxml2xmlout-console-compat-auto.xml | 12 +- .../qemuxml2xmlout-console-compat.xml | 8 +- .../qemuxml2xmlout-console-compat2.xml | 12 +- .../qemuxml2xmlout-console-virtio-many.xml | 16 +- .../qemuxml2xmlout-console-virtio.xml | 16 +- .../qemuxml2xmlout-controller-usb-order.xml | 4 +- .../qemuxml2xmlout-cpu-empty.xml | 8 +- .../qemuxml2xmlout-cpu-eoi-disabled.xml | 8 +- .../qemuxml2xmlout-cpu-eoi-enabled.xml | 8 +- .../qemuxml2xmlout-cpu-host-kvmclock.xml | 8 +- .../qemuxml2xmlout-cpu-host-model-features.xml | 12 +- ...emuxml2xmlout-cpu-host-passthrough-features.xml | 12 +- .../qemuxml2xmlout-cpu-kvmclock.xml | 8 +- .../qemuxml2xmlout-cpu-numa-disjoint.xml | 8 +- .../qemuxml2xmlout-cpu-numa-disordered.xml | 8 +- .../qemuxml2xmlout-cpu-numa-memshared.xml | 8 +- .../qemuxml2xmlout-cpu-numa-no-memory-element.xml | 8 +- .../qemuxml2xmlout-cpu-numa1.xml | 8 +- .../qemuxml2xmlout-cpu-numa2.xml | 8 +- .../qemuxml2xmlout-cputune-iothreads.xml | 12 +- ...l2xmlout-cputune-iothreadsched-zeropriority.xml | 12 +- .../qemuxml2xmlout-cputune-iothreadsched.xml | 12 +- .../qemuxml2xmlout-cputune-numatune.xml | 14 +- .../qemuxml2xmlout-cputune-zero-shares.xml | 12 +- .../qemuxml2xmloutdata/qemuxml2xmlout-cputune.xml | 12 +- .../qemuxml2xmlout-default-kvm-host-arch.xml | 8 +- .../qemuxml2xmlout-default-qemu-host-arch.xml | 8 +- .../qemuxml2xmlout-disk-active-commit.xml | 12 +- .../qemuxml2xmloutdata/qemuxml2xmlout-disk-aio.xml | 12 +- .../qemuxml2xmlout-disk-backing-chains-active.xml | 13 +- ...qemuxml2xmlout-disk-backing-chains-inactive.xml | 13 +- .../qemuxml2xmlout-disk-cdrom-empty.xml | 8 +- .../qemuxml2xmlout-disk-cdrom.xml | 8 +- .../qemuxml2xmlout-disk-copy_on_read.xml | 13 +- .../qemuxml2xmlout-disk-drive-boot-cdrom.xml | 8 +- .../qemuxml2xmlout-disk-drive-boot-disk.xml | 8 +- .../qemuxml2xmlout-disk-drive-cache-directsync.xml | 8 +- .../qemuxml2xmlout-disk-drive-cache-unsafe.xml | 8 +- .../qemuxml2xmlout-disk-drive-cache-v2-none.xml | 8 +- .../qemuxml2xmlout-disk-drive-cache-v2-wb.xml | 8 +- .../qemuxml2xmlout-disk-drive-cache-v2-wt.xml | 8 +- .../qemuxml2xmlout-disk-drive-copy-on-read.xml | 12 +- .../qemuxml2xmlout-disk-drive-discard.xml | 12 +- ...xml2xmlout-disk-drive-error-policy-enospace.xml | 8 +- ...qemuxml2xmlout-disk-drive-error-policy-stop.xml | 8 +- ...out-disk-drive-error-policy-wreport-rignore.xml | 8 +- .../qemuxml2xmlout-disk-drive-fat.xml | 12 +- .../qemuxml2xmlout-disk-drive-fmt-qcow.xml | 8 +- .../qemuxml2xmlout-disk-drive-network-gluster.xml | 6 +- ...emuxml2xmlout-disk-drive-network-iscsi-auth.xml | 6 +- .../qemuxml2xmlout-disk-drive-network-iscsi.xml | 6 +- ...emuxml2xmlout-disk-drive-network-nbd-export.xml | 9 +- ...l2xmlout-disk-drive-network-nbd-ipv6-export.xml | 9 +- .../qemuxml2xmlout-disk-drive-network-nbd-ipv6.xml | 9 +- .../qemuxml2xmlout-disk-drive-network-nbd-unix.xml | 9 +- .../qemuxml2xmlout-disk-drive-network-nbd.xml | 9 +- .../qemuxml2xmlout-disk-drive-network-rbd-auth.xml | 9 +- ...uxml2xmlout-disk-drive-network-rbd-ceph-env.xml | 9 +- .../qemuxml2xmlout-disk-drive-network-rbd-ipv6.xml | 9 +- .../qemuxml2xmlout-disk-drive-network-rbd.xml | 12 +- .../qemuxml2xmlout-disk-drive-network-sheepdog.xml | 9 +- .../qemuxml2xmlout-disk-floppy.xml | 8 +- .../qemuxml2xmlout-disk-many.xml | 8 +- .../qemuxml2xmlout-disk-mirror-active.xml | 14 +- .../qemuxml2xmlout-disk-mirror-inactive.xml | 14 +- .../qemuxml2xmlout-disk-mirror-old-inactive.xml | 14 +- .../qemuxml2xmlout-disk-mirror-old.xml | 14 +- .../qemuxml2xmlout-disk-scsi-device-auto.xml | 16 +- .../qemuxml2xmlout-disk-scsi-device.xml | 16 +- .../qemuxml2xmlout-disk-scsi-disk-vpd.xml | 16 +- ...muxml2xmlout-disk-scsi-lun-passthrough-sgio.xml | 16 +- .../qemuxml2xmlout-disk-scsi-megasas.xml | 16 +- .../qemuxml2xmlout-disk-scsi-virtio-scsi.xml | 16 +- .../qemuxml2xmlout-disk-scsi-vscsi.xml | 16 +- .../qemuxml2xmlout-disk-source-pool-mode.xml | 12 +- .../qemuxml2xmlout-disk-source-pool.xml | 12 +- .../qemuxml2xmlout-disk-usb-device.xml} | 14 +- ...qemuxml2xmlout-disk-virtio-scsi-cmd_per_lun.xml | 9 +- .../qemuxml2xmlout-disk-virtio-scsi-ioeventfd.xml | 9 +- ...qemuxml2xmlout-disk-virtio-scsi-max_sectors.xml | 9 +- .../qemuxml2xmlout-disk-virtio-scsi-num_queues.xml | 9 +- .../qemuxml2xmlout-disk-virtio.xml | 10 +- .../qemuxml2xmlout-disk-xenvbd.xml | 8 +- .../qemuxml2xmlout-encrypted-disk.xml | 8 +- .../qemuxml2xmlout-eoi-disabled.xml | 8 +- .../qemuxml2xmlout-eoi-enabled.xml | 8 +- .../qemuxml2xmlout-event_idx.xml | 13 +- .../qemuxml2xmlout-floppy-drive-fat.xml | 12 +- .../qemuxml2xmlout-graphics-listen-network.xml | 13 +- .../qemuxml2xmlout-graphics-listen-network2.xml | 13 +- .../qemuxml2xmlout-graphics-sdl-fullscreen.xml | 9 +- .../qemuxml2xmlout-graphics-sdl.xml | 9 +- .../qemuxml2xmlout-graphics-spice-compression.xml | 14 +- .../qemuxml2xmlout-graphics-spice-qxl-vga.xml | 14 +- .../qemuxml2xmlout-graphics-spice-timeout.xml | 4 +- .../qemuxml2xmlout-graphics-spice.xml | 14 +- .../qemuxml2xmlout-graphics-vnc-sasl.xml | 9 +- .../qemuxml2xmlout-graphics-vnc-tls.xml | 9 +- .../qemuxml2xmlout-graphics-vnc-websocket.xml | 5 +- .../qemuxml2xmlout-graphics-vnc.xml | 9 +- .../qemuxml2xmlout-hostdev-pci-address.xml | 9 +- ...qemuxml2xmlout-hostdev-scsi-autogen-address.xml | 20 +- .../qemuxml2xmlout-hostdev-scsi-large-unit.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-lsi-iscsi.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-lsi.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-rawio.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-readonly.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-sgio.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-shareable.xml | 16 +- ...muxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-virtio-iscsi.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-virtio-scsi.xml | 16 +- .../qemuxml2xmlout-hostdev-usb-address.xml | 8 +- .../qemuxml2xmlout-hostdev-vfio.xml | 13 +- .../qemuxml2xmlout-hugepages-pages.xml | 12 +- .../qemuxml2xmlout-hugepages-pages2.xml | 12 +- .../qemuxml2xmlout-hugepages-pages3.xml | 12 +- .../qemuxml2xmlout-hugepages-shared.xml | 12 +- .../qemuxml2xmlout-hugepages.xml | 12 +- .../qemuxml2xmlout-hyperv-off.xml | 8 +- .../qemuxml2xmlout-hyperv-panic.xml | 4 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv.xml | 4 +- .../qemuxml2xmlout-input-usbmouse.xml | 8 +- .../qemuxml2xmlout-input-usbtablet.xml | 8 +- .../qemuxml2xmlout-interface-driver.xml | 13 +- .../qemuxml2xmlout-iothreads-disk-virtio-ccw.xml | 1 + .../qemuxml2xmlout-iothreads-disk.xml | 9 +- .../qemuxml2xmlout-iothreads-ids-partial.xml | 8 +- .../qemuxml2xmlout-iothreads-ids.xml | 8 +- .../qemuxml2xmlout-iothreads.xml | 8 +- .../qemuxml2xmlout-kvm-features-off.xml | 8 +- .../qemuxml2xmlout-kvm-features.xml | 4 +- .../qemuxml2xmloutdata/qemuxml2xmlout-kvmclock.xml | 4 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-lease.xml | 12 +- .../qemuxml2xmlout-machine-core-off.xml | 8 +- .../qemuxml2xmlout-machine-core-on.xml | 8 +- .../qemuxml2xmlout-memory-hotplug-dimm.xml | 12 +- .../qemuxml2xmlout-memory-hotplug-nonuma.xml | 8 +- .../qemuxml2xmlout-memory-hotplug.xml | 12 +- .../qemuxml2xmlout-memtune-unlimited.xml | 12 +- .../qemuxml2xmloutdata/qemuxml2xmlout-memtune.xml | 12 +- .../qemuxml2xmlout-metadata-duplicate.xml | 12 +- .../qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml | 12 +- .../qemuxml2xmloutdata/qemuxml2xmlout-migrate.xml | 8 +- .../qemuxml2xmloutdata/qemuxml2xmlout-minimal.xml | 12 +- .../qemuxml2xmlout-misc-acpi.xml | 8 +- .../qemuxml2xmlout-misc-disable-s3.xml | 8 +- .../qemuxml2xmlout-misc-disable-suspends.xml | 8 +- .../qemuxml2xmlout-misc-enable-s4.xml | 8 +- .../qemuxml2xmlout-misc-no-reboot.xml | 8 +- .../qemuxml2xmlout-misc-uuid.xml | 8 +- .../qemuxml2xmlout-net-bandwidth.xml | 4 +- .../qemuxml2xmlout-net-bandwidth2.xml | 4 +- .../qemuxml2xmlout-net-eth-ifname.xml | 9 +- .../qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml | 9 +- .../qemuxml2xmlout-net-hostdev-vfio.xml | 13 +- .../qemuxml2xmlout-net-hostdev.xml | 13 +- .../qemuxml2xmlout-net-midonet.xml | 13 +- .../qemuxml2xmlout-net-openvswitch.xml | 13 +- .../qemuxml2xmloutdata/qemuxml2xmlout-net-udp.xml | 13 +- .../qemuxml2xmloutdata/qemuxml2xmlout-net-user.xml | 9 +- .../qemuxml2xmlout-net-vhostuser.xml | 11 +- .../qemuxml2xmlout-net-virtio-device.xml | 13 +- .../qemuxml2xmlout-net-virtio-disable-offloads.xml | 13 +- ...qemuxml2xmlout-net-virtio-network-portgroup.xml | 15 +- .../qemuxml2xmlout-net-virtio.xml | 9 +- .../qemuxml2xmlout-nographics-vga.xml | 8 +- .../qemuxml2xmlout-nosharepages.xml | 8 +- ...emuxml2xmlout-numad-auto-memory-vcpu-cpuset.xml | 12 +- ...ad-auto-memory-vcpu-no-cpuset-and-placement.xml | 12 +- .../qemuxml2xmlout-numad-auto-vcpu-no-numatune.xml | 12 +- ...emuxml2xmlout-numad-static-vcpu-no-numatune.xml | 12 +- .../qemuxml2xmlout-numatune-auto-prefer.xml | 8 +- .../qemuxml2xmlout-numatune-memnode-no-memory.xml | 8 +- .../qemuxml2xmlout-numatune-memnode.xml | 8 +- .../qemuxml2xmlout-panic-double.xml | 4 +- .../qemuxml2xmlout-panic-isa.xml | 12 +- .../qemuxml2xmlout-panic-no-address.xml | 12 +- .../qemuxml2xmlout-panic-pseries.xml | 8 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-panic.xml | 12 +- .../qemuxml2xmlout-parallel-tcp.xml | 8 +- .../qemuxml2xmlout-pci-autoadd-addr.xml | 35 ++ .../qemuxml2xmlout-pci-autoadd-idx.xml | 41 +- .../qemuxml2xmlout-pci-bridge-many-disks.xml | 124 ++++- .../qemuxml2xmlout-pci-bridge.xml | 44 +- .../qemuxml2xmloutdata/qemuxml2xmlout-pci-rom.xml | 16 +- .../qemuxml2xmlout-pci-serial-dev-chardev.xml | 12 +- .../qemuxml2xmlout-pcie-root-port-too-many.xml | 62 --- .../qemuxml2xmlout-pcie-root-port.xml | 23 +- .../qemuxml2xmlout-pcie-root.xml | 15 +- .../qemuxml2xmlout-pcie-switch-downstream-port.xml | 69 ++- .../qemuxml2xmlout-pcie-switch-upstream-port.xml | 34 +- .../qemuxml2xmlout-pcihole64-gib.xml | 8 +- .../qemuxml2xmlout-pcihole64-none.xml | 8 +- .../qemuxml2xmlout-pcihole64-q35.xml | 16 +- .../qemuxml2xmlout-pcihole64.xml | 8 +- .../qemuxml2xmlout-pmu-feature-off.xml | 4 +- .../qemuxml2xmlout-pmu-feature.xml | 4 +- .../qemuxml2xmlout-pseries-nvram.xml | 4 +- .../qemuxml2xmlout-pseries-panic-missing.xml | 8 +- .../qemuxml2xmlout-pseries-panic-no-address.xml | 8 +- .../qemuxml2xmlout-pv-spinlock-disabled.xml | 8 +- .../qemuxml2xmlout-pv-spinlock-enabled.xml | 8 +- .../qemuxml2xmlout-q35-usb2-multi.xml | 28 +- .../qemuxml2xmlout-q35-usb2-reorder.xml | 28 +- .../qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2.xml | 14 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 22 +- .../qemuxml2xmlout-qemu-ns-no-env.xml | 8 +- .../qemuxml2xmlout-reboot-timeout-disabled.xml | 4 +- .../qemuxml2xmlout-reboot-timeout-enabled.xml | 4 +- .../qemuxml2xmlout-restore-v2.xml | 8 +- .../qemuxml2xmlout-s390-defaultconsole.xml | 3 +- .../qemuxml2xmlout-seclabel-dac-none.xml | 12 +- .../qemuxml2xmlout-seclabel-device-multiple.xml | 12 +- .../qemuxml2xmlout-seclabel-dynamic-baselabel.xml | 12 +- .../qemuxml2xmlout-seclabel-dynamic-labelskip.xml | 12 +- .../qemuxml2xmlout-seclabel-dynamic-none.xml | 12 +- .../qemuxml2xmlout-seclabel-dynamic-override.xml | 12 +- .../qemuxml2xmlout-seclabel-dynamic-relabel.xml | 12 +- .../qemuxml2xmlout-seclabel-none.xml | 12 +- .../qemuxml2xmlout-seclabel-static-labelskip.xml | 12 +- .../qemuxml2xmlout-seclabel-static.xml | 12 +- .../qemuxml2xmlout-serial-dev.xml | 8 +- .../qemuxml2xmlout-serial-file.xml | 8 +- .../qemuxml2xmlout-serial-many.xml | 8 +- .../qemuxml2xmlout-serial-pty.xml | 8 +- .../qemuxml2xmlout-serial-spiceport-nospice.xml | 12 +- .../qemuxml2xmlout-serial-spiceport.xml | 13 +- .../qemuxml2xmlout-serial-target-port-auto.xml | 12 +- .../qemuxml2xmlout-serial-tcp-telnet.xml | 8 +- .../qemuxml2xmlout-serial-tcp.xml | 8 +- .../qemuxml2xmlout-serial-udp.xml | 8 +- .../qemuxml2xmlout-serial-unix.xml | 8 +- .../qemuxml2xmlout-serial-vc.xml | 8 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml | 14 +- .../qemuxml2xmlout-smbios-multiple-type2.xml | 12 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios.xml | 12 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-smp.xml | 8 +- .../qemuxml2xmlout-sound-device.xml | 30 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-sound.xml | 16 +- .../qemuxml2xmlout-tap-vhost-incorrect.xml | 14 +- .../qemuxml2xmlout-tap-vhost.xml | 13 +- .../qemuxml2xmlout-tpm-passthrough.xml | 8 +- .../qemuxml2xmlout-usb-ich9-ehci-addr.xml | 25 +- .../qemuxml2xmlout-usb-redir-filter-version.xml | 8 +- .../qemuxml2xmlout-usb-redir-filter.xml | 4 +- .../qemuxml2xmlout-usb-redir.xml | 4 +- .../qemuxml2xmlout-vcpu-placement-static.xml | 3 + .../qemuxml2xmlout-vhost_queues.xml | 13 +- .../qemuxml2xmlout-video-virtio-gpu-device.xml | 13 +- .../qemuxml2xmlout-video-virtio-gpu-virgl.xml | 13 +- .../qemuxml2xmlout-virtio-input-passthrough.xml | 9 +- .../qemuxml2xmlout-virtio-input.xml | 16 +- .../qemuxml2xmlout-virtio-lun.xml | 13 +- .../qemuxml2xmlout-virtio-rng-egd.xml | 9 +- .../qemuxml2xmlout-virtio-rng-random.xml | 9 +- .../qemuxml2xmloutdata/qemuxml2xmlout-watchdog.xml | 8 +- tests/qemuxml2xmltest.c | 272 +++++++--- tests/testutils.c | 7 +- tests/testutils.h | 6 +- 517 files changed, 4082 insertions(+), 2119 deletions(-) rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-mmio-default-pci.args => qemuxml2argv-aarch64-virtio-pci-default.args} (100%) rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-mmio-default-pci.xml => qemuxml2argv-aarch64-virtio-pci-default.xml} (100%) rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-virtio-pci.args => qemuxml2argv-aarch64-virtio-pci-manual-addresses.args} (100%) rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-virtio-pci.xml => qemuxml2argv-aarch64-virtio-pci-manual-addresses.xml} (100%) rename tests/{qemuxml2xmloutdata/qemuxml2xmlout-disk-usb.xml => qemuxml2argvdata/qemuxml2argv-disk-usb-nosupport.xml} (100%) delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-manual-addresses.xml rename tests/{qemuxml2argvdata/qemuxml2argv-disk-usb.xml => qemuxml2xmloutdata/qemuxml2xmlout-disk-usb-device.xml} (70%) delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port-too-many.xml -- 2.5.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list