[libvirt] [PATCH for 3.11 1/2] tests: Drop qemuxml2argv- prefix for qemuxml2argv-*.xml test cases

Michal Privoznik mprivozn at redhat.com
Sat Dec 2 07:11:49 UTC 2017


These XMLs live in a separate directory, there's no need for them
to have a special prefix in addition. It also doesn't play nicely
with ':e' completion in Vim, finding proper file based on
qemuxml2argvtest.c is also needlessly complicated.

The files were renamed using the following commands. From
qemuxml2argvdata:

  for i in qemuxml2argv-*.xml; do mv $i ${i#qemuxml2argv-}; done

and then (to fix broken symlinks) from qemuxml2argvdata and
qemuxml2xmloutdata:

  for i in $(find . -xtype l); do \
      ln -sf $(readlink $i | sed 's/qemuxml2argv-//') $i;
  done

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 tests/qemuxml2argvtest.c                                                | 2 +-
 tests/qemuxml2xmltest.c                                                 | 2 +-
 ...gv-440fx-ide-address-conflict.xml => 440fx-ide-address-conflict.xml} | 0
 .../{qemuxml2argv-440fx-wrong-root.xml => 440fx-wrong-root.xml}         | 0
 ...argv-aarch64-aavmf-virtio-mmio.xml => aarch64-aavmf-virtio-mmio.xml} | 0
 .../{qemuxml2argv-aarch64-acpi-nouefi.xml => aarch64-acpi-nouefi.xml}   | 0
 .../{qemuxml2argv-aarch64-acpi-uefi.xml => aarch64-acpi-uefi.xml}       | 0
 ...xml2argv-aarch64-cpu-passthrough.xml => aarch64-cpu-passthrough.xml} | 0
 .../{qemuxml2argv-aarch64-gic-default.xml => aarch64-gic-default.xml}   | 0
 .../{qemuxml2argv-aarch64-gic-host.xml => aarch64-gic-host.xml}         | 0
 .../{qemuxml2argv-aarch64-gic-invalid.xml => aarch64-gic-invalid.xml}   | 0
 tests/qemuxml2argvdata/aarch64-gic-none-both.xml                        | 1 +
 .../{qemuxml2argv-aarch64-gic-none-tcg.xml => aarch64-gic-none-tcg.xml} | 0
 tests/qemuxml2argvdata/aarch64-gic-none-v2.xml                          | 1 +
 tests/qemuxml2argvdata/aarch64-gic-none-v3.xml                          | 1 +
 .../{qemuxml2argv-aarch64-gic-none.xml => aarch64-gic-none.xml}         | 0
 .../{qemuxml2argv-aarch64-gic-not-arm.xml => aarch64-gic-not-arm.xml}   | 0
 .../{qemuxml2argv-aarch64-gic-not-virt.xml => aarch64-gic-not-virt.xml} | 0
 .../{qemuxml2argv-aarch64-gic-v2.xml => aarch64-gic-v2.xml}             | 0
 .../{qemuxml2argv-aarch64-gic-v3.xml => aarch64-gic-v3.xml}             | 0
 .../{qemuxml2argv-aarch64-kvm-32-on-64.xml => aarch64-kvm-32-on-64.xml} | 0
 ...qemuxml2argv-aarch64-noacpi-nouefi.xml => aarch64-noacpi-nouefi.xml} | 0
 .../{qemuxml2argv-aarch64-noacpi-uefi.xml => aarch64-noacpi-uefi.xml}   | 0
 .../{qemuxml2argv-aarch64-pci-serial.xml => aarch64-pci-serial.xml}     | 0
 ...-usb-controller-nec-xhci.xml => aarch64-usb-controller-nec-xhci.xml} | 0
 ...sb-controller-qemu-xhci.xml => aarch64-usb-controller-qemu-xhci.xml} | 0
 ...qemuxml2argv-aarch64-video-default.xml => aarch64-video-default.xml} | 0
 ...arch64-video-virtio-gpu-pci.xml => aarch64-video-virtio-gpu-pci.xml} | 0
 ...6-virtio-pci-default.xml => aarch64-virt-2.6-virtio-pci-default.xml} | 0
 ...l2argv-aarch64-virt-default-nic.xml => aarch64-virt-default-nic.xml} | 0
 .../{qemuxml2argv-aarch64-virt-virtio.xml => aarch64-virt-virtio.xml}   | 0
 ...gv-aarch64-virtio-pci-default.xml => aarch64-virtio-pci-default.xml} | 0
 ...pci-manual-addresses.xml => aarch64-virtio-pci-manual-addresses.xml} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-acpi-table.xml => acpi-table.xml}  | 0
 .../{qemuxml2argv-arm-vexpressa9-basic.xml => arm-vexpressa9-basic.xml} | 0
 ...qemuxml2argv-arm-vexpressa9-nodevs.xml => arm-vexpressa9-nodevs.xml} | 0
 ...qemuxml2argv-arm-vexpressa9-virtio.xml => arm-vexpressa9-virtio.xml} | 0
 .../{qemuxml2argv-arm-virt-virtio.xml => arm-virt-virtio.xml}           | 0
 tests/qemuxml2argvdata/{qemuxml2argv-autoindex.xml => autoindex.xml}    | 0
 .../{qemuxml2argv-balloon-ccw-deflate.xml => balloon-ccw-deflate.xml}   | 0
 .../{qemuxml2argv-balloon-device-auto.xml => balloon-device-auto.xml}   | 0
 ...gv-balloon-device-deflate-off.xml => balloon-device-deflate-off.xml} | 0
 ...muxml2argv-balloon-device-deflate.xml => balloon-device-deflate.xml} | 0
 ...qemuxml2argv-balloon-device-period.xml => balloon-device-period.xml} | 0
 .../{qemuxml2argv-balloon-device.xml => balloon-device.xml}             | 0
 .../{qemuxml2argv-balloon-mmio-deflate.xml => balloon-mmio-deflate.xml} | 0
 ...l2argv-bios-nvram-os-interleave.xml => bios-nvram-os-interleave.xml} | 0
 .../{qemuxml2argv-bios-nvram-secure.xml => bios-nvram-secure.xml}       | 0
 tests/qemuxml2argvdata/{qemuxml2argv-bios-nvram.xml => bios-nvram.xml}  | 0
 tests/qemuxml2argvdata/{qemuxml2argv-bios.xml => bios.xml}              | 0
 ...muxml2argv-blkdeviotune-group-num.xml => blkdeviotune-group-num.xml} | 0
 ...xml2argv-blkdeviotune-max-length.xml => blkdeviotune-max-length.xml} | 0
 .../{qemuxml2argv-blkdeviotune-max.xml => blkdeviotune-max.xml}         | 0
 .../{qemuxml2argv-blkdeviotune.xml => blkdeviotune.xml}                 | 0
 .../{qemuxml2argv-blkiotune-device.xml => blkiotune-device.xml}         | 0
 tests/qemuxml2argvdata/{qemuxml2argv-blkiotune.xml => blkiotune.xml}    | 0
 tests/qemuxml2argvdata/{qemuxml2argv-boot-cdrom.xml => boot-cdrom.xml}  | 0
 ...muxml2argv-boot-complex-bootindex.xml => boot-complex-bootindex.xml} | 0
 .../{qemuxml2argv-boot-complex.xml => boot-complex.xml}                 | 0
 .../{qemuxml2argv-boot-dev+order.xml => boot-dev+order.xml}             | 0
 .../{qemuxml2argv-boot-floppy-q35.xml => boot-floppy-q35.xml}           | 0
 .../qemuxml2argvdata/{qemuxml2argv-boot-floppy.xml => boot-floppy.xml}  | 0
 ...isable-drive-bootindex.xml => boot-menu-disable-drive-bootindex.xml} | 0
 ...xml2argv-boot-menu-disable-drive.xml => boot-menu-disable-drive.xml} | 0
 ...menu-disable-with-timeout.xml => boot-menu-disable-with-timeout.xml} | 0
 .../{qemuxml2argv-boot-menu-disable.xml => boot-menu-disable.xml}       | 0
 ...gv-boot-menu-enable-bootindex.xml => boot-menu-enable-bootindex.xml} | 0
 ...th-timeout-invalid.xml => boot-menu-enable-with-timeout-invalid.xml} | 0
 ...t-menu-enable-with-timeout.xml => boot-menu-enable-with-timeout.xml} | 0
 .../{qemuxml2argv-boot-menu-enable.xml => boot-menu-enable.xml}         | 0
 tests/qemuxml2argvdata/{qemuxml2argv-boot-multi.xml => boot-multi.xml}  | 0
 .../{qemuxml2argv-boot-network.xml => boot-network.xml}                 | 0
 tests/qemuxml2argvdata/{qemuxml2argv-boot-order.xml => boot-order.xml}  | 0
 .../qemuxml2argvdata/{qemuxml2argv-boot-strict.xml => boot-strict.xml}  | 0
 .../{qemuxml2argv-bootindex-floppy-q35.xml => bootindex-floppy-q35.xml} | 0
 .../{qemuxml2argv-channel-guestfwd.xml => channel-guestfwd.xml}         | 0
 .../{qemuxml2argv-channel-spicevmc-old.xml => channel-spicevmc-old.xml} | 0
 .../{qemuxml2argv-channel-spicevmc.xml => channel-spicevmc.xml}         | 0
 ...l2argv-channel-unix-source-path.xml => channel-unix-source-path.xml} | 0
 .../{qemuxml2argv-channel-virtio-auto.xml => channel-virtio-auto.xml}   | 0
 ...muxml2argv-channel-virtio-autoadd.xml => channel-virtio-autoadd.xml} | 0
 ...argv-channel-virtio-autoassign.xml => channel-virtio-autoassign.xml} | 0
 ...muxml2argv-channel-virtio-default.xml => channel-virtio-default.xml} | 0
 .../{qemuxml2argv-channel-virtio-state.xml => channel-virtio-state.xml} | 0
 .../{qemuxml2argv-channel-virtio-unix.xml => channel-virtio-unix.xml}   | 0
 .../{qemuxml2argv-channel-virtio.xml => channel-virtio.xml}             | 0
 .../{qemuxml2argv-chardev-label.xml => chardev-label.xml}               | 0
 ...econnect-generated-path.xml => chardev-reconnect-generated-path.xml} | 0
 ...onnect-invalid-timeout.xml => chardev-reconnect-invalid-timeout.xml} | 0
 .../{qemuxml2argv-chardev-reconnect.xml => chardev-reconnect.xml}       | 0
 .../{qemuxml2argv-clock-catchup.xml => clock-catchup.xml}               | 0
 .../{qemuxml2argv-clock-france.xml => clock-france.xml}                 | 0
 .../{qemuxml2argv-clock-hpet-off.xml => clock-hpet-off.xml}             | 0
 ...ocaltime-basis-localtime.xml => clock-localtime-basis-localtime.xml} | 0
 .../{qemuxml2argv-clock-localtime.xml => clock-localtime.xml}           | 0
 ...muxml2argv-clock-timer-hyperv-rtc.xml => clock-timer-hyperv-rtc.xml} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-clock-utc.xml => clock-utc.xml}    | 0
 .../{qemuxml2argv-clock-variable.xml => clock-variable.xml}             | 0
 .../{qemuxml2argv-console-compat-2.xml => console-compat-2.xml}         | 0
 .../{qemuxml2argv-console-compat-auto.xml => console-compat-auto.xml}   | 0
 ...muxml2argv-console-compat-chardev.xml => console-compat-chardev.xml} | 0
 .../{qemuxml2argv-console-compat.xml => console-compat.xml}             | 0
 .../{qemuxml2argv-console-compat2.xml => console-compat2.xml}           | 0
 .../{qemuxml2argv-console-sclp.xml => console-sclp.xml}                 | 0
 .../{qemuxml2argv-console-virtio-ccw.xml => console-virtio-ccw.xml}     | 0
 .../{qemuxml2argv-console-virtio-many.xml => console-virtio-many.xml}   | 0
 .../{qemuxml2argv-console-virtio-s390.xml => console-virtio-s390.xml}   | 0
 .../{qemuxml2argv-console-virtio.xml => console-virtio.xml}             | 0
 .../{qemuxml2argv-controller-order.xml => controller-order.xml}         | 0
 .../{qemuxml2argv-controller-usb-order.xml => controller-usb-order.xml} | 0
 .../{qemuxml2argv-cpu-Haswell-noTSX.xml => cpu-Haswell-noTSX.xml}       | 0
 .../qemuxml2argvdata/{qemuxml2argv-cpu-Haswell.xml => cpu-Haswell.xml}  | 0
 .../{qemuxml2argv-cpu-Haswell2.xml => cpu-Haswell2.xml}                 | 0
 .../{qemuxml2argv-cpu-Haswell3.xml => cpu-Haswell3.xml}                 | 0
 .../{qemuxml2argv-cpu-cache-disable.xml => cpu-cache-disable.xml}       | 0
 .../{qemuxml2argv-cpu-cache-disable2.xml => cpu-cache-disable2.xml}     | 0
 .../{qemuxml2argv-cpu-cache-disable3.xml => cpu-cache-disable3.xml}     | 0
 .../{qemuxml2argv-cpu-cache-emulate-l2.xml => cpu-cache-emulate-l2.xml} | 0
 .../{qemuxml2argv-cpu-cache-emulate-l3.xml => cpu-cache-emulate-l3.xml} | 0
 ...l2argv-cpu-cache-passthrough-l3.xml => cpu-cache-passthrough-l3.xml} | 0
 ...qemuxml2argv-cpu-cache-passthrough.xml => cpu-cache-passthrough.xml} | 0
 ...muxml2argv-cpu-cache-passthrough2.xml => cpu-cache-passthrough2.xml} | 0
 ...muxml2argv-cpu-cache-passthrough3.xml => cpu-cache-passthrough3.xml} | 0
 ...muxml2argv-cpu-check-default-none.xml => cpu-check-default-none.xml} | 0
 ...xml2argv-cpu-check-default-none2.xml => cpu-check-default-none2.xml} | 0
 ...argv-cpu-check-default-partial.xml => cpu-check-default-partial.xml} | 0
 ...gv-cpu-check-default-partial2.xml => cpu-check-default-partial2.xml} | 0
 .../{qemuxml2argv-cpu-check-full.xml => cpu-check-full.xml}             | 0
 .../{qemuxml2argv-cpu-check-none.xml => cpu-check-none.xml}             | 0
 .../{qemuxml2argv-cpu-check-partial.xml => cpu-check-partial.xml}       | 0
 tests/qemuxml2argvdata/{qemuxml2argv-cpu-empty.xml => cpu-empty.xml}    | 0
 .../{qemuxml2argv-cpu-eoi-disabled.xml => cpu-eoi-disabled.xml}         | 0
 .../{qemuxml2argv-cpu-eoi-enabled.xml => cpu-eoi-enabled.xml}           | 0
 tests/qemuxml2argvdata/{qemuxml2argv-cpu-exact1.xml => cpu-exact1.xml}  | 0
 ...qemuxml2argv-cpu-exact2-nofallback.xml => cpu-exact2-nofallback.xml} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-cpu-exact2.xml => cpu-exact2.xml}  | 0
 .../{qemuxml2argv-cpu-fallback.xml => cpu-fallback.xml}                 | 0
 .../{qemuxml2argv-cpu-host-kvmclock.xml => cpu-host-kvmclock.xml}       | 0
 .../{qemuxml2argv-cpu-host-model-cmt.xml => cpu-host-model-cmt.xml}     | 0
 ...xml2argv-cpu-host-model-fallback.xml => cpu-host-model-fallback.xml} | 0
 ...xml2argv-cpu-host-model-features.xml => cpu-host-model-features.xml} | 0
 ...argv-cpu-host-model-nofallback.xml => cpu-host-model-nofallback.xml} | 0
 ...qemuxml2argv-cpu-host-model-vendor.xml => cpu-host-model-vendor.xml} | 0
 .../{qemuxml2argv-cpu-host-model.xml => cpu-host-model.xml}             | 0
 ...-host-passthrough-features.xml => cpu-host-passthrough-features.xml} | 0
 .../{qemuxml2argv-cpu-host-passthrough.xml => cpu-host-passthrough.xml} | 0
 .../{qemuxml2argv-cpu-hotplug-startup.xml => cpu-hotplug-startup.xml}   | 0
 .../{qemuxml2argv-cpu-kvmclock.xml => cpu-kvmclock.xml}                 | 0
 .../{qemuxml2argv-cpu-minimum1.xml => cpu-minimum1.xml}                 | 0
 .../{qemuxml2argv-cpu-minimum2.xml => cpu-minimum2.xml}                 | 0
 .../{qemuxml2argv-cpu-nofallback.xml => cpu-nofallback.xml}             | 0
 .../{qemuxml2argv-cpu-numa-disjoint.xml => cpu-numa-disjoint.xml}       | 0
 .../{qemuxml2argv-cpu-numa-disordered.xml => cpu-numa-disordered.xml}   | 0
 .../{qemuxml2argv-cpu-numa-memshared.xml => cpu-numa-memshared.xml}     | 0
 ...gv-cpu-numa-no-memory-element.xml => cpu-numa-no-memory-element.xml} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-cpu-numa1.xml => cpu-numa1.xml}    | 0
 tests/qemuxml2argvdata/{qemuxml2argv-cpu-numa2.xml => cpu-numa2.xml}    | 0
 tests/qemuxml2argvdata/{qemuxml2argv-cpu-numa3.xml => cpu-numa3.xml}    | 0
 ...argv-cpu-qemu-host-passthrough.xml => cpu-qemu-host-passthrough.xml} | 0
 .../{qemuxml2argv-cpu-s390-features.xml => cpu-s390-features.xml}       | 0
 .../{qemuxml2argv-cpu-s390-zEC12.xml => cpu-s390-zEC12.xml}             | 0
 .../qemuxml2argvdata/{qemuxml2argv-cpu-strict1.xml => cpu-strict1.xml}  | 0
 .../{qemuxml2argv-cpu-topology1.xml => cpu-topology1.xml}               | 0
 .../{qemuxml2argv-cpu-topology2.xml => cpu-topology2.xml}               | 0
 .../{qemuxml2argv-cpu-topology3.xml => cpu-topology3.xml}               | 0
 .../{qemuxml2argv-cpu-tsc-frequency.xml => cpu-tsc-frequency.xml}       | 0
 .../{qemuxml2argv-cputune-iothreads.xml => cputune-iothreads.xml}       | 0
 ...tune-iothreadsched-toomuch.xml => cputune-iothreadsched-toomuch.xml} | 0
 ...eadsched-zeropriority.xml => cputune-iothreadsched-zeropriority.xml} | 0
 ...qemuxml2argv-cputune-iothreadsched.xml => cputune-iothreadsched.xml} | 0
 .../{qemuxml2argv-cputune-numatune.xml => cputune-numatune.xml}         | 0
 ...argv-cputune-vcpusched-overlap.xml => cputune-vcpusched-overlap.xml} | 0
 .../{qemuxml2argv-cputune-zero-shares.xml => cputune-zero-shares.xml}   | 0
 tests/qemuxml2argvdata/{qemuxml2argv-cputune.xml => cputune.xml}        | 0
 .../{qemuxml2argv-debug-threads.xml => debug-threads.xml}               | 0
 ...qemuxml2argv-default-kvm-host-arch.xml => default-kvm-host-arch.xml} | 0
 ...muxml2argv-default-qemu-host-arch.xml => default-qemu-host-arch.xml} | 0
 .../{qemuxml2argv-disk-active-commit.xml => disk-active-commit.xml}     | 0
 tests/qemuxml2argvdata/{qemuxml2argv-disk-aio.xml => disk-aio.xml}      | 0
 .../{qemuxml2argv-disk-backing-chains.xml => disk-backing-chains.xml}   | 0
 .../{qemuxml2argv-disk-blockio.xml => disk-blockio.xml}                 | 0
 .../{qemuxml2argv-disk-cdrom-empty.xml => disk-cdrom-empty.xml}         | 0
 ...muxml2argv-disk-cdrom-network-ftp.xml => disk-cdrom-network-ftp.xml} | 0
 ...xml2argv-disk-cdrom-network-ftps.xml => disk-cdrom-network-ftps.xml} | 0
 ...xml2argv-disk-cdrom-network-http.xml => disk-cdrom-network-http.xml} | 0
 ...l2argv-disk-cdrom-network-https.xml => disk-cdrom-network-https.xml} | 0
 ...xml2argv-disk-cdrom-network-tftp.xml => disk-cdrom-network-tftp.xml} | 0
 ...k-cdrom-tray-no-device-cap.xml => disk-cdrom-tray-no-device-cap.xml} | 0
 .../{qemuxml2argv-disk-cdrom-tray.xml => disk-cdrom-tray.xml}           | 0
 tests/qemuxml2argvdata/{qemuxml2argv-disk-cdrom.xml => disk-cdrom.xml}  | 0
 .../{qemuxml2argv-disk-copy_on_read.xml => disk-copy_on_read.xml}       | 0
 ...isk-device-lun-type-invalid.xml => disk-device-lun-type-invalid.xml} | 0
 ...-disk-drive-address-conflict.xml => disk-drive-address-conflict.xml} | 0
 ...qemuxml2argv-disk-drive-boot-cdrom.xml => disk-drive-boot-cdrom.xml} | 0
 .../{qemuxml2argv-disk-drive-boot-disk.xml => disk-drive-boot-disk.xml} | 0
 ...-disk-drive-cache-directsync.xml => disk-drive-cache-directsync.xml} | 0
 ...xml2argv-disk-drive-cache-unsafe.xml => disk-drive-cache-unsafe.xml} | 0
 ...l2argv-disk-drive-cache-v2-none.xml => disk-drive-cache-v2-none.xml} | 0
 ...muxml2argv-disk-drive-cache-v2-wb.xml => disk-drive-cache-v2-wb.xml} | 0
 ...muxml2argv-disk-drive-cache-v2-wt.xml => disk-drive-cache-v2-wt.xml} | 0
 ...xml2argv-disk-drive-copy-on-read.xml => disk-drive-copy-on-read.xml} | 0
 ...l2argv-disk-drive-detect-zeroes.xml => disk-drive-detect-zeroes.xml} | 0
 .../{qemuxml2argv-disk-drive-discard.xml => disk-drive-discard.xml}     | 0
 ...e-error-policy-enospace.xml => disk-drive-error-policy-enospace.xml} | 0
 ...isk-drive-error-policy-stop.xml => disk-drive-error-policy-stop.xml} | 0
 ...-wreport-rignore.xml => disk-drive-error-policy-wreport-rignore.xml} | 0
 .../{qemuxml2argv-disk-drive-fmt-qcow.xml => disk-drive-fmt-qcow.xml}   | 0
 ...gv-disk-drive-network-gluster.xml => disk-drive-network-gluster.xml} | 0
 ...invalid.xml => disk-drive-network-iscsi-auth-secrettype-invalid.xml} | 0
 ...ecrettype.xml => disk-drive-network-iscsi-auth-wrong-secrettype.xml} | 0
 ...k-drive-network-iscsi-auth.xml => disk-drive-network-iscsi-auth.xml} | 0
 ...isk-drive-network-iscsi-lun.xml => disk-drive-network-iscsi-lun.xml} | 0
 ...l2argv-disk-drive-network-iscsi.xml => disk-drive-network-iscsi.xml} | 0
 ...k-drive-network-nbd-export.xml => disk-drive-network-nbd-export.xml} | 0
 ...twork-nbd-ipv6-export.xml => disk-drive-network-nbd-ipv6-export.xml} | 0
 ...-disk-drive-network-nbd-ipv6.xml => disk-drive-network-nbd-ipv6.xml} | 0
 ...-disk-drive-network-nbd-unix.xml => disk-drive-network-nbd-unix.xml} | 0
 ...muxml2argv-disk-drive-network-nbd.xml => disk-drive-network-nbd.xml} | 0
 ...ive-network-rbd-auth-AES.xml => disk-drive-network-rbd-auth-AES.xml} | 0
 ...-disk-drive-network-rbd-auth.xml => disk-drive-network-rbd-auth.xml} | 0
 ...ive-network-rbd-ceph-env.xml => disk-drive-network-rbd-ceph-env.xml} | 0
 ...-disk-drive-network-rbd-ipv6.xml => disk-drive-network-rbd-ipv6.xml} | 0
 ...ive-network-rbd-no-colon.xml => disk-drive-network-rbd-no-colon.xml} | 0
 ...muxml2argv-disk-drive-network-rbd.xml => disk-drive-network-rbd.xml} | 0
 ...-disk-drive-network-sheepdog.xml => disk-drive-network-sheepdog.xml} | 0
 ...ork-source-auth-both.xml => disk-drive-network-source-auth-both.xml} | 0
 ...drive-network-source-auth.xml => disk-drive-network-source-auth.xml} | 0
 ...ive-network-tlsx509-vxhs.xml => disk-drive-network-tlsx509-vxhs.xml} | 0
 ...xml2argv-disk-drive-network-vxhs.xml => disk-drive-network-vxhs.xml} | 0
 .../{qemuxml2argv-disk-drive-no-boot.xml => disk-drive-no-boot.xml}     | 0
 ...l2argv-disk-drive-readonly-disk.xml => disk-drive-readonly-disk.xml} | 0
 ...k-drive-readonly-no-device.xml => disk-drive-readonly-no-device.xml} | 0
 ...argv-disk-drive-shared-locking.xml => disk-drive-shared-locking.xml} | 0
 ...muxml2argv-disk-drive-shared-qcow.xml => disk-drive-shared-qcow.xml} | 0
 .../{qemuxml2argv-disk-drive-shared.xml => disk-drive-shared.xml}       | 0
 ...k-fdc-incompatible-address.xml => disk-fdc-incompatible-address.xml} | 0
 .../{qemuxml2argv-disk-floppy-pseries.xml => disk-floppy-pseries.xml}   | 0
 ...floppy-tray-no-device-cap.xml => disk-floppy-tray-no-device-cap.xml} | 0
 .../{qemuxml2argv-disk-floppy-tray.xml => disk-floppy-tray.xml}         | 0
 .../qemuxml2argvdata/{qemuxml2argv-disk-floppy.xml => disk-floppy.xml}  | 0
 .../{qemuxml2argv-disk-geometry.xml => disk-geometry.xml}               | 0
 ...scsi-address-conflict.xml => disk-hostdev-scsi-address-conflict.xml} | 0
 ...o-iscsi-auth-AES.xml => disk-hostdev-scsi-virtio-iscsi-auth-AES.xml} | 0
 .../{qemuxml2argv-disk-ide-drive-split.xml => disk-ide-drive-split.xml} | 0
 ...k-ide-incompatible-address.xml => disk-ide-incompatible-address.xml} | 0
 .../{qemuxml2argv-disk-ide-wwn.xml => disk-ide-wwn.xml}                 | 0
 .../{qemuxml2argv-disk-ioeventfd.xml => disk-ioeventfd.xml}             | 0
 tests/qemuxml2argvdata/{qemuxml2argv-disk-iscsi.xml => disk-iscsi.xml}  | 0
 tests/qemuxml2argvdata/{qemuxml2argv-disk-many.xml => disk-many.xml}    | 0
 .../{qemuxml2argv-disk-mirror-old.xml => disk-mirror-old.xml}           | 0
 .../qemuxml2argvdata/{qemuxml2argv-disk-mirror.xml => disk-mirror.xml}  | 0
 tests/qemuxml2argvdata/{qemuxml2argv-disk-order.xml => disk-order.xml}  | 0
 .../{qemuxml2argv-disk-same-targets.xml => disk-same-targets.xml}       | 0
 .../{qemuxml2argv-disk-sata-device.xml => disk-sata-device.xml}         | 0
 ...sata-incompatible-address.xml => disk-sata-incompatible-address.xml} | 0
 ...qemuxml2argv-disk-scsi-device-auto.xml => disk-scsi-device-auto.xml} | 0
 .../{qemuxml2argv-disk-scsi-device.xml => disk-scsi-device.xml}         | 0
 .../{qemuxml2argv-disk-scsi-disk-split.xml => disk-scsi-disk-split.xml} | 0
 ...scsi-disk-vpd-build-error.xml => disk-scsi-disk-vpd-build-error.xml} | 0
 .../{qemuxml2argv-disk-scsi-disk-vpd.xml => disk-scsi-disk-vpd.xml}     | 0
 .../{qemuxml2argv-disk-scsi-disk-wwn.xml => disk-scsi-disk-wwn.xml}     | 0
 ...scsi-incompatible-address.xml => disk-scsi-incompatible-address.xml} | 0
 ...scsi-lun-passthrough-sgio.xml => disk-scsi-lun-passthrough-sgio.xml} | 0
 ...argv-disk-scsi-lun-passthrough.xml => disk-scsi-lun-passthrough.xml} | 0
 .../{qemuxml2argv-disk-scsi-megasas.xml => disk-scsi-megasas.xml}       | 0
 .../{qemuxml2argv-disk-scsi-mptsas1068.xml => disk-scsi-mptsas1068.xml} | 0
 ...qemuxml2argv-disk-scsi-virtio-scsi.xml => disk-scsi-virtio-scsi.xml} | 0
 .../{qemuxml2argv-disk-scsi-vscsi.xml => disk-scsi-vscsi.xml}           | 0
 .../qemuxml2argvdata/{qemuxml2argv-disk-serial.xml => disk-serial.xml}  | 0
 .../{qemuxml2argv-disk-snapshot.xml => disk-snapshot.xml}               | 0
 ...qemuxml2argv-disk-source-pool-mode.xml => disk-source-pool-mode.xml} | 0
 .../{qemuxml2argv-disk-source-pool.xml => disk-source-pool.xml}         | 0
 .../{qemuxml2argv-disk-transient.xml => disk-transient.xml}             | 0
 ...argv-disk-usb-device-removable.xml => disk-usb-device-removable.xml} | 0
 .../{qemuxml2argv-disk-usb-device.xml => disk-usb-device.xml}           | 0
 .../{qemuxml2argv-disk-usb-nosupport.xml => disk-usb-nosupport.xml}     | 0
 .../{qemuxml2argv-disk-usb-pci.xml => disk-usb-pci.xml}                 | 0
 .../{qemuxml2argv-disk-virtio-ccw-many.xml => disk-virtio-ccw-many.xml} | 0
 .../{qemuxml2argv-disk-virtio-ccw.xml => disk-virtio-ccw.xml}           | 0
 ...l2argv-disk-virtio-drive-queues.xml => disk-virtio-drive-queues.xml} | 0
 .../{qemuxml2argv-disk-virtio-s390.xml => disk-virtio-s390.xml}         | 0
 .../{qemuxml2argv-disk-virtio-scsi-ccw.xml => disk-virtio-scsi-ccw.xml} | 0
 ...isk-virtio-scsi-cmd_per_lun.xml => disk-virtio-scsi-cmd_per_lun.xml} | 0
 ...gv-disk-virtio-scsi-ioeventfd.xml => disk-virtio-scsi-ioeventfd.xml} | 0
 ...isk-virtio-scsi-max_sectors.xml => disk-virtio-scsi-max_sectors.xml} | 0
 ...-disk-virtio-scsi-num_queues.xml => disk-virtio-scsi-num_queues.xml} | 0
 .../qemuxml2argvdata/{qemuxml2argv-disk-virtio.xml => disk-virtio.xml}  | 0
 .../{qemuxml2argv-encrypted-disk-usage.xml => encrypted-disk-usage.xml} | 0
 .../{qemuxml2argv-encrypted-disk.xml => encrypted-disk.xml}             | 0
 .../{qemuxml2argv-eoi-disabled.xml => eoi-disabled.xml}                 | 0
 .../qemuxml2argvdata/{qemuxml2argv-eoi-enabled.xml => eoi-enabled.xml}  | 0
 tests/qemuxml2argvdata/{qemuxml2argv-event_idx.xml => event_idx.xml}    | 0
 ...gv-fd-memory-no-numa-topology.xml => fd-memory-no-numa-topology.xml} | 0
 ...xml2argv-fd-memory-numa-topology.xml => fd-memory-numa-topology.xml} | 0
 ...l2argv-fd-memory-numa-topology2.xml => fd-memory-numa-topology2.xml} | 0
 ...l2argv-fd-memory-numa-topology3.xml => fd-memory-numa-topology3.xml} | 0
 .../{qemuxml2argv-fips-enabled.xml => fips-enabled.xml}                 | 0
 .../{qemuxml2argv-floppy-drive-fat.xml => floppy-drive-fat.xml}         | 0
 tests/qemuxml2argvdata/{qemuxml2argv-fs9p-ccw.xml => fs9p-ccw.xml}      | 0
 tests/qemuxml2argvdata/{qemuxml2argv-fs9p.xml => fs9p.xml}              | 0
 ...xml2argv-graphics-listen-network.xml => graphics-listen-network.xml} | 0
 ...l2argv-graphics-listen-network2.xml => graphics-listen-network2.xml} | 0
 ...xml2argv-graphics-sdl-fullscreen.xml => graphics-sdl-fullscreen.xml} | 0
 .../{qemuxml2argv-graphics-sdl.xml => graphics-sdl.xml}                 | 0
 ...ics-spice-agent-file-xfer.xml => graphics-spice-agent-file-xfer.xml} | 0
 ...argv-graphics-spice-agentmouse.xml => graphics-spice-agentmouse.xml} | 0
 ...ics-spice-auto-socket-cfg.xml => graphics-spice-auto-socket-cfg.xml} | 0
 ...gv-graphics-spice-auto-socket.xml => graphics-spice-auto-socket.xml} | 0
 ...gv-graphics-spice-compression.xml => graphics-spice-compression.xml} | 0
 ...muxml2argv-graphics-spice-no-args.xml => graphics-spice-no-args.xml} | 0
 ...muxml2argv-graphics-spice-qxl-vga.xml => graphics-spice-qxl-vga.xml} | 0
 .../{qemuxml2argv-graphics-spice-sasl.xml => graphics-spice-sasl.xml}   | 0
 ...qemuxml2argv-graphics-spice-socket.xml => graphics-spice-socket.xml} | 0
 ...muxml2argv-graphics-spice-timeout.xml => graphics-spice-timeout.xml} | 0
 ...l2argv-graphics-spice-usb-redir.xml => graphics-spice-usb-redir.xml} | 0
 .../{qemuxml2argv-graphics-spice.xml => graphics-spice.xml}             | 0
 ...raphics-vnc-auto-socket-cfg.xml => graphics-vnc-auto-socket-cfg.xml} | 0
 ...l2argv-graphics-vnc-auto-socket.xml => graphics-vnc-auto-socket.xml} | 0
 ...-graphics-vnc-no-listen-attr.xml => graphics-vnc-no-listen-attr.xml} | 0
 .../{qemuxml2argv-graphics-vnc-none.xml => graphics-vnc-none.xml}       | 0
 .../{qemuxml2argv-graphics-vnc-policy.xml => graphics-vnc-policy.xml}   | 0
 ...ve-generated-socket.xml => graphics-vnc-remove-generated-socket.xml} | 0
 .../{qemuxml2argv-graphics-vnc-sasl.xml => graphics-vnc-sasl.xml}       | 0
 ...s-vnc-socket-new-cmdline.xml => graphics-vnc-socket-new-cmdline.xml} | 0
 .../{qemuxml2argv-graphics-vnc-socket.xml => graphics-vnc-socket.xml}   | 0
 .../{qemuxml2argv-graphics-vnc-tls.xml => graphics-vnc-tls.xml}         | 0
 ...muxml2argv-graphics-vnc-websocket.xml => graphics-vnc-websocket.xml} | 0
 .../{qemuxml2argv-graphics-vnc.xml => graphics-vnc.xml}                 | 0
 ...valid-target-address.xml => hostdev-mdev-invalid-target-address.xml} | 0
 ...xml2argv-hostdev-mdev-precreated.xml => hostdev-mdev-precreated.xml} | 0
 ...dev-src-address-invalid.xml => hostdev-mdev-src-address-invalid.xml} | 0
 ...gv-hostdev-pci-address-device.xml => hostdev-pci-address-device.xml} | 0
 .../{qemuxml2argv-hostdev-pci-address.xml => hostdev-pci-address.xml}   | 0
 ...ostdev-scsi-autogen-address.xml => hostdev-scsi-autogen-address.xml} | 0
 .../{qemuxml2argv-hostdev-scsi-boot.xml => hostdev-scsi-boot.xml}       | 0
 ...xml2argv-hostdev-scsi-large-unit.xml => hostdev-scsi-large-unit.xml} | 0
 ...-hostdev-scsi-lsi-iscsi-auth.xml => hostdev-scsi-lsi-iscsi-auth.xml} | 0
 ...muxml2argv-hostdev-scsi-lsi-iscsi.xml => hostdev-scsi-lsi-iscsi.xml} | 0
 .../{qemuxml2argv-hostdev-scsi-lsi.xml => hostdev-scsi-lsi.xml}         | 0
 .../{qemuxml2argv-hostdev-scsi-rawio.xml => hostdev-scsi-rawio.xml}     | 0
 ...qemuxml2argv-hostdev-scsi-readonly.xml => hostdev-scsi-readonly.xml} | 0
 .../{qemuxml2argv-hostdev-scsi-sgio.xml => hostdev-scsi-sgio.xml}       | 0
 ...muxml2argv-hostdev-scsi-shareable.xml => hostdev-scsi-shareable.xml} | 0
 ...-hostdev-scsi-vhost-scsi-ccw.xml => hostdev-scsi-vhost-scsi-ccw.xml} | 0
 ...-hostdev-scsi-vhost-scsi-pci.xml => hostdev-scsi-vhost-scsi-pci.xml} | 0
 ...ev-scsi-virtio-iscsi-auth.xml => hostdev-scsi-virtio-iscsi-auth.xml} | 0
 ...argv-hostdev-scsi-virtio-iscsi.xml => hostdev-scsi-virtio-iscsi.xml} | 0
 ...l2argv-hostdev-scsi-virtio-scsi.xml => hostdev-scsi-virtio-scsi.xml} | 0
 ...-usb-address-device-boot.xml => hostdev-usb-address-device-boot.xml} | 0
 ...gv-hostdev-usb-address-device.xml => hostdev-usb-address-device.xml} | 0
 .../{qemuxml2argv-hostdev-usb-address.xml => hostdev-usb-address.xml}   | 0
 ...l2argv-hostdev-vfio-multidomain.xml => hostdev-vfio-multidomain.xml} | 0
 .../{qemuxml2argv-hostdev-vfio.xml => hostdev-vfio.xml}                 | 0
 ...s-drive-address-conflict.xml => hostdevs-drive-address-conflict.xml} | 0
 .../{qemuxml2argv-hotplug-base.xml => hotplug-base.xml}                 | 0
 ...-hugepages-memaccess-invalid.xml => hugepages-memaccess-invalid.xml} | 0
 .../{qemuxml2argv-hugepages-memaccess.xml => hugepages-memaccess.xml}   | 0
 .../{qemuxml2argv-hugepages-memaccess2.xml => hugepages-memaccess2.xml} | 0
 .../{qemuxml2argv-hugepages-numa.xml => hugepages-numa.xml}             | 0
 .../{qemuxml2argv-hugepages-pages.xml => hugepages-pages.xml}           | 0
 .../{qemuxml2argv-hugepages-pages2.xml => hugepages-pages2.xml}         | 0
 .../{qemuxml2argv-hugepages-pages3.xml => hugepages-pages3.xml}         | 0
 .../{qemuxml2argv-hugepages-pages4.xml => hugepages-pages4.xml}         | 0
 .../{qemuxml2argv-hugepages-pages5.xml => hugepages-pages5.xml}         | 0
 .../{qemuxml2argv-hugepages-pages6.xml => hugepages-pages6.xml}         | 0
 .../{qemuxml2argv-hugepages-pages7.xml => hugepages-pages7.xml}         | 0
 .../{qemuxml2argv-hugepages-shared.xml => hugepages-shared.xml}         | 0
 tests/qemuxml2argvdata/{qemuxml2argv-hugepages.xml => hugepages.xml}    | 0
 tests/qemuxml2argvdata/{qemuxml2argv-hyperv-off.xml => hyperv-off.xml}  | 0
 .../{qemuxml2argv-hyperv-panic.xml => hyperv-panic.xml}                 | 0
 tests/qemuxml2argvdata/{qemuxml2argv-hyperv.xml => hyperv.xml}          | 0
 .../{qemuxml2argv-input-usbmouse-addr.xml => input-usbmouse-addr.xml}   | 0
 .../{qemuxml2argv-input-usbmouse.xml => input-usbmouse.xml}             | 0
 .../{qemuxml2argv-input-usbtablet.xml => input-usbtablet.xml}           | 0
 ...l2argv-intel-iommu-caching-mode.xml => intel-iommu-caching-mode.xml} | 0
 ...l2argv-intel-iommu-device-iotlb.xml => intel-iommu-device-iotlb.xml} | 0
 .../{qemuxml2argv-intel-iommu-eim.xml => intel-iommu-eim.xml}           | 0
 .../{qemuxml2argv-intel-iommu-machine.xml => intel-iommu-machine.xml}   | 0
 .../qemuxml2argvdata/{qemuxml2argv-intel-iommu.xml => intel-iommu.xml}  | 0
 .../{qemuxml2argv-interface-driver.xml => interface-driver.xml}         | 0
 .../{qemuxml2argv-interface-server.xml => interface-server.xml}         | 0
 ...argv-iothreads-disk-virtio-ccw.xml => iothreads-disk-virtio-ccw.xml} | 0
 .../{qemuxml2argv-iothreads-disk.xml => iothreads-disk.xml}             | 0
 ...qemuxml2argv-iothreads-ids-partial.xml => iothreads-ids-partial.xml} | 0
 .../{qemuxml2argv-iothreads-ids.xml => iothreads-ids.xml}               | 0
 .../{qemuxml2argv-iothreads-nocap.xml => iothreads-nocap.xml}           | 0
 ...argv-iothreads-virtio-scsi-ccw.xml => iothreads-virtio-scsi-ccw.xml} | 0
 ...argv-iothreads-virtio-scsi-pci.xml => iothreads-virtio-scsi-pci.xml} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-iothreads.xml => iothreads.xml}    | 0
 .../{qemuxml2argv-kvm-features-off.xml => kvm-features-off.xml}         | 0
 .../{qemuxml2argv-kvm-features.xml => kvm-features.xml}                 | 0
 .../{qemuxml2argv-kvm-pit-delay.xml => kvm-pit-delay.xml}               | 0
 .../{qemuxml2argv-kvm-pit-discard.xml => kvm-pit-discard.xml}           | 0
 tests/qemuxml2argvdata/{qemuxml2argv-kvm.xml => kvm.xml}                | 0
 ...qemuxml2argv-kvmclock+eoi-disabled.xml => kvmclock+eoi-disabled.xml} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-kvmclock.xml => kvmclock.xml}      | 0
 tests/qemuxml2argvdata/{qemuxml2argv-lease.xml => lease.xml}            | 0
 .../{qemuxml2argv-luks-disk-invalid.xml => luks-disk-invalid.xml}       | 0
 ...muxml2argv-luks-disks-source-both.xml => luks-disks-source-both.xml} | 0
 .../{qemuxml2argv-luks-disks-source.xml => luks-disks-source.xml}       | 0
 tests/qemuxml2argvdata/{qemuxml2argv-luks-disks.xml => luks-disks.xml}  | 0
 ...l2argv-mach-virt-console-native.xml => mach-virt-console-native.xml} | 0
 ...l2argv-mach-virt-console-virtio.xml => mach-virt-console-virtio.xml} | 0
 ...rt-serial+console-native.xml => mach-virt-serial+console-native.xml} | 0
 ...xml2argv-mach-virt-serial-compat.xml => mach-virt-serial-compat.xml} | 0
 ...-serial-invalid-machine.xml => mach-virt-serial-invalid-machine.xml} | 0
 ...xml2argv-mach-virt-serial-native.xml => mach-virt-serial-native.xml} | 0
 .../{qemuxml2argv-mach-virt-serial-pci.xml => mach-virt-serial-pci.xml} | 0
 .../{qemuxml2argv-mach-virt-serial-usb.xml => mach-virt-serial-usb.xml} | 0
 ...-machine-aeskeywrap-off-argv.xml => machine-aeskeywrap-off-argv.xml} | 0
 ...gv-machine-aeskeywrap-off-cap.xml => machine-aeskeywrap-off-cap.xml} | 0
 ...-machine-aeskeywrap-off-caps.xml => machine-aeskeywrap-off-caps.xml} | 0
 ...gv-machine-aeskeywrap-on-argv.xml => machine-aeskeywrap-on-argv.xml} | 0
 ...argv-machine-aeskeywrap-on-cap.xml => machine-aeskeywrap-on-cap.xml} | 0
 ...gv-machine-aeskeywrap-on-caps.xml => machine-aeskeywrap-on-caps.xml} | 0
 .../{qemuxml2argv-machine-aliases1.xml => machine-aliases1.xml}         | 0
 .../{qemuxml2argv-machine-aliases2.xml => machine-aliases2.xml}         | 0
 .../{qemuxml2argv-machine-core-cfg-off.xml => machine-core-cfg-off.xml} | 0
 .../{qemuxml2argv-machine-core-off.xml => machine-core-off.xml}         | 0
 .../{qemuxml2argv-machine-core-on.xml => machine-core-on.xml}           | 0
 ...-machine-deakeywrap-off-argv.xml => machine-deakeywrap-off-argv.xml} | 0
 ...gv-machine-deakeywrap-off-cap.xml => machine-deakeywrap-off-cap.xml} | 0
 ...-machine-deakeywrap-off-caps.xml => machine-deakeywrap-off-caps.xml} | 0
 ...gv-machine-deakeywrap-on-argv.xml => machine-deakeywrap-on-argv.xml} | 0
 ...argv-machine-deakeywrap-on-cap.xml => machine-deakeywrap-on-cap.xml} | 0
 ...gv-machine-deakeywrap-on-caps.xml => machine-deakeywrap-on-caps.xml} | 0
 ...argv-machine-keywrap-none-argv.xml => machine-keywrap-none-argv.xml} | 0
 ...argv-machine-keywrap-none-caps.xml => machine-keywrap-none-caps.xml} | 0
 .../{qemuxml2argv-machine-keywrap-none.xml => machine-keywrap-none.xml} | 0
 ...isks-nets-s390.xml => machine-loadparm-multiple-disks-nets-s390.xml} | 0
 ...argv-machine-loadparm-net-s390.xml => machine-loadparm-net-s390.xml} | 0
 ...arm-s390-char-invalid.xml => machine-loadparm-s390-char-invalid.xml} | 0
 ...dparm-s390-len-invalid.xml => machine-loadparm-s390-len-invalid.xml} | 0
 ...qemuxml2argv-machine-loadparm-s390.xml => machine-loadparm-s390.xml} | 0
 .../{qemuxml2argv-machine-smm-opt.xml => machine-smm-opt.xml}           | 0
 .../{qemuxml2argv-machine-usb-opt.xml => machine-usb-opt.xml}           | 0
 .../{qemuxml2argv-machine-vmport-opt.xml => machine-vmport-opt.xml}     | 0
 tests/qemuxml2argvdata/{qemuxml2argv-master-key.xml => master-key.xml}  | 0
 .../{qemuxml2argv-memory-align-fail.xml => memory-align-fail.xml}       | 0
 ...l2argv-memory-hotplug-dimm-addr.xml => memory-hotplug-dimm-addr.xml} | 0
 .../{qemuxml2argv-memory-hotplug-dimm.xml => memory-hotplug-dimm.xml}   | 0
 ...qemuxml2argv-memory-hotplug-nonuma.xml => memory-hotplug-nonuma.xml} | 0
 ...emory-hotplug-nvdimm-access.xml => memory-hotplug-nvdimm-access.xml} | 0
 ...-memory-hotplug-nvdimm-label.xml => memory-hotplug-nvdimm-label.xml} | 0
 ...qemuxml2argv-memory-hotplug-nvdimm.xml => memory-hotplug-nvdimm.xml} | 0
 ...-memory-hotplug-ppc64-nonuma.xml => memory-hotplug-ppc64-nonuma.xml} | 0
 .../{qemuxml2argv-memory-hotplug.xml => memory-hotplug.xml}             | 0
 .../{qemuxml2argv-memorybacking-set.xml => memorybacking-set.xml}       | 0
 .../{qemuxml2argv-memorybacking-unset.xml => memorybacking-unset.xml}   | 0
 .../{qemuxml2argv-memtune-unlimited.xml => memtune-unlimited.xml}       | 0
 tests/qemuxml2argvdata/{qemuxml2argv-memtune.xml => memtune.xml}        | 0
 .../{qemuxml2argv-metadata-duplicate.xml => metadata-duplicate.xml}     | 0
 tests/qemuxml2argvdata/{qemuxml2argv-metadata.xml => metadata.xml}      | 0
 ...muxml2argv-migrate-numa-unaligned.xml => migrate-numa-unaligned.xml} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-migrate.xml => migrate.xml}        | 0
 ...qemuxml2argv-minimal-msg-timestamp.xml => minimal-msg-timestamp.xml} | 0
 .../{qemuxml2argv-minimal-no-memory.xml => minimal-no-memory.xml}       | 0
 tests/qemuxml2argvdata/{qemuxml2argv-minimal.xml => minimal.xml}        | 0
 tests/qemuxml2argvdata/{qemuxml2argv-misc-acpi.xml => misc-acpi.xml}    | 0
 .../{qemuxml2argv-misc-disable-s3.xml => misc-disable-s3.xml}           | 0
 ...qemuxml2argv-misc-disable-suspends.xml => misc-disable-suspends.xml} | 0
 .../{qemuxml2argv-misc-enable-s4.xml => misc-enable-s4.xml}             | 0
 .../{qemuxml2argv-misc-no-reboot.xml => misc-no-reboot.xml}             | 0
 tests/qemuxml2argvdata/{qemuxml2argv-misc-uuid.xml => misc-uuid.xml}    | 0
 .../{qemuxml2argv-missing-machine.xml => missing-machine.xml}           | 0
 tests/qemuxml2argvdata/{qemuxml2argv-mlock-off.xml => mlock-off.xml}    | 0
 tests/qemuxml2argvdata/{qemuxml2argv-mlock-on.xml => mlock-on.xml}      | 0
 .../{qemuxml2argv-mlock-unsupported.xml => mlock-unsupported.xml}       | 0
 .../{qemuxml2argv-monitor-json.xml => monitor-json.xml}                 | 0
 ...l2argv-multifunction-pci-device.xml => multifunction-pci-device.xml} | 0
 .../qemuxml2argvdata/{qemuxml2argv-name-escape.xml => name-escape.xml}  | 0
 .../{qemuxml2argv-net-bandwidth.xml => net-bandwidth.xml}               | 0
 .../{qemuxml2argv-net-bandwidth2.xml => net-bandwidth2.xml}             | 0
 tests/qemuxml2argvdata/{qemuxml2argv-net-client.xml => net-client.xml}  | 0
 .../{qemuxml2argv-net-coalesce.xml => net-coalesce.xml}                 | 0
 .../{qemuxml2argv-net-eth-hostip.xml => net-eth-hostip.xml}             | 0
 .../{qemuxml2argv-net-eth-ifname.xml => net-eth-ifname.xml}             | 0
 .../{qemuxml2argv-net-eth-names.xml => net-eth-names.xml}               | 0
 tests/qemuxml2argvdata/{qemuxml2argv-net-eth.xml => net-eth.xml}        | 0
 .../{qemuxml2argv-net-hostdev-fail.xml => net-hostdev-fail.xml}         | 0
 ...xml2argv-net-hostdev-multidomain.xml => net-hostdev-multidomain.xml} | 0
 ...et-hostdev-vfio-multidomain.xml => net-hostdev-vfio-multidomain.xml} | 0
 .../{qemuxml2argv-net-hostdev-vfio.xml => net-hostdev-vfio.xml}         | 0
 .../qemuxml2argvdata/{qemuxml2argv-net-hostdev.xml => net-hostdev.xml}  | 0
 tests/qemuxml2argvdata/{qemuxml2argv-net-mcast.xml => net-mcast.xml}    | 0
 .../qemuxml2argvdata/{qemuxml2argv-net-midonet.xml => net-midonet.xml}  | 0
 tests/qemuxml2argvdata/{qemuxml2argv-net-mtu.xml => net-mtu.xml}        | 0
 .../{qemuxml2argv-net-openvswitch.xml => net-openvswitch.xml}           | 0
 tests/qemuxml2argvdata/{qemuxml2argv-net-server.xml => net-server.xml}  | 0
 tests/qemuxml2argvdata/{qemuxml2argv-net-udp.xml => net-udp.xml}        | 0
 .../{qemuxml2argv-net-user-addr.xml => net-user-addr.xml}               | 0
 tests/qemuxml2argvdata/{qemuxml2argv-net-user.xml => net-user.xml}      | 0
 .../{qemuxml2argv-net-vhostuser-fail.xml => net-vhostuser-fail.xml}     | 0
 .../{qemuxml2argv-net-vhostuser-multiq.xml => net-vhostuser-multiq.xml} | 0
 .../{qemuxml2argv-net-vhostuser.xml => net-vhostuser.xml}               | 0
 .../{qemuxml2argv-net-virtio-ccw.xml => net-virtio-ccw.xml}             | 0
 .../{qemuxml2argv-net-virtio-device.xml => net-virtio-device.xml}       | 0
 ...-net-virtio-disable-offloads.xml => net-virtio-disable-offloads.xml} | 0
 .../{qemuxml2argv-net-virtio-netdev.xml => net-virtio-netdev.xml}       | 0
 ...et-virtio-network-portgroup.xml => net-virtio-network-portgroup.xml} | 0
 ...euesize-invalid-size.xml => net-virtio-rxqueuesize-invalid-size.xml} | 0
 ...l2argv-net-virtio-rxtxqueuesize.xml => net-virtio-rxtxqueuesize.xml} | 0
 .../{qemuxml2argv-net-virtio-s390.xml => net-virtio-s390.xml}           | 0
 tests/qemuxml2argvdata/{qemuxml2argv-net-virtio.xml => net-virtio.xml}  | 0
 .../{qemuxml2argv-no-kvm-pit-device.xml => no-kvm-pit-device.xml}       | 0
 .../qemuxml2argvdata/{qemuxml2argv-no-shutdown.xml => no-shutdown.xml}  | 0
 .../{qemuxml2argv-nographics-display.xml => nographics-display.xml}     | 0
 .../{qemuxml2argv-nographics-vga.xml => nographics-vga.xml}             | 0
 tests/qemuxml2argvdata/{qemuxml2argv-nographics.xml => nographics.xml}  | 0
 .../{qemuxml2argv-nosharepages.xml => nosharepages.xml}                 | 0
 ...ad-auto-memory-vcpu-cpuset.xml => numad-auto-memory-vcpu-cpuset.xml} | 0
 ...placement.xml => numad-auto-memory-vcpu-no-cpuset-and-placement.xml} | 0
 ...-numad-auto-vcpu-no-numatune.xml => numad-auto-vcpu-no-numatune.xml} | 0
 ...ne-no-nodeset.xml => numad-auto-vcpu-static-numatune-no-nodeset.xml} | 0
 ...uto-vcpu-static-numatune.xml => numad-auto-vcpu-static-numatune.xml} | 0
 ...ad-static-memory-auto-vcpu.xml => numad-static-memory-auto-vcpu.xml} | 0
 ...ad-static-vcpu-no-numatune.xml => numad-static-vcpu-no-numatune.xml} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-numad.xml => numad.xml}            | 0
 ...atune-auto-nodeset-invalid.xml => numatune-auto-nodeset-invalid.xml} | 0
 .../{qemuxml2argv-numatune-auto-prefer.xml => numatune-auto-prefer.xml} | 0
 .../{qemuxml2argv-numatune-distances.xml => numatune-distances.xml}     | 0
 ...gv-numatune-memnode-no-memory.xml => numatune-memnode-no-memory.xml} | 0
 ...muxml2argv-numatune-memnode-nocpu.xml => numatune-memnode-nocpu.xml} | 0
 .../{qemuxml2argv-numatune-memnode.xml => numatune-memnode.xml}         | 0
 ...atune-memnodes-problematic.xml => numatune-memnodes-problematic.xml} | 0
 ...e-memory-invalid-nodeset.xml => numatune-memory-invalid-nodeset.xml} | 0
 .../{qemuxml2argv-numatune-memory.xml => numatune-memory.xml}           | 0
 ...-exceed-hostnode.xml => numatune-static-nodeset-exceed-hostnode.xml} | 0
 .../{qemuxml2argv-panic-double.xml => panic-double.xml}                 | 0
 tests/qemuxml2argvdata/{qemuxml2argv-panic-isa.xml => panic-isa.xml}    | 0
 .../{qemuxml2argv-panic-no-address.xml => panic-no-address.xml}         | 0
 .../{qemuxml2argv-panic-pseries.xml => panic-pseries.xml}               | 0
 tests/qemuxml2argvdata/{qemuxml2argv-panic.xml => panic.xml}            | 0
 ...l2argv-parallel-parport-chardev.xml => parallel-parport-chardev.xml} | 0
 .../{qemuxml2argv-parallel-tcp-chardev.xml => parallel-tcp-chardev.xml} | 0
 .../{qemuxml2argv-pci-autoadd-addr.xml => pci-autoadd-addr.xml}         | 0
 .../{qemuxml2argv-pci-autoadd-idx.xml => pci-autoadd-idx.xml}           | 0
 .../{qemuxml2argv-pci-autofill-addr.xml => pci-autofill-addr.xml}       | 0
 ...gv-pci-bridge-duplicate-index.xml => pci-bridge-duplicate-index.xml} | 0
 ...qemuxml2argv-pci-bridge-many-disks.xml => pci-bridge-many-disks.xml} | 0
 ...negative-index-invalid.xml => pci-bridge-negative-index-invalid.xml} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-pci-bridge.xml => pci-bridge.xml}  | 0
 .../{qemuxml2argv-pci-bus-invalid.xml => pci-bus-invalid.xml}           | 0
 .../{qemuxml2argv-pci-domain-invalid.xml => pci-domain-invalid.xml}     | 0
 ...l2argv-pci-expander-bus-bad-bus.xml => pci-expander-bus-bad-bus.xml} | 0
 ...ci-expander-bus-bad-machine.xml => pci-expander-bus-bad-machine.xml} | 0
 ...argv-pci-expander-bus-bad-node.xml => pci-expander-bus-bad-node.xml} | 0
 .../{qemuxml2argv-pci-expander-bus.xml => pci-expander-bus.xml}         | 0
 .../{qemuxml2argv-pci-function-invalid.xml => pci-function-invalid.xml} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-pci-many.xml => pci-many.xml}      | 0
 tests/qemuxml2argvdata/{qemuxml2argv-pci-rom.xml => pci-rom.xml}        | 0
 .../{qemuxml2argv-pci-root-address.xml => pci-root-address.xml}         | 0
 ...muxml2argv-pci-root-nonzero-index.xml => pci-root-nonzero-index.xml} | 0
 ...muxml2argv-pci-serial-dev-chardev.xml => pci-serial-dev-chardev.xml} | 0
 .../{qemuxml2argv-pci-slot-invalid.xml => pci-slot-invalid.xml}         | 0
 ...argv-pcie-expander-bus-bad-bus.xml => pcie-expander-bus-bad-bus.xml} | 0
 ...e-expander-bus-bad-machine.xml => pcie-expander-bus-bad-machine.xml} | 0
 .../{qemuxml2argv-pcie-expander-bus.xml => pcie-expander-bus.xml}       | 0
 ...cie-root-port-model-generic.xml => pcie-root-port-model-generic.xml} | 0
 ...cie-root-port-model-ioh3420.xml => pcie-root-port-model-ioh3420.xml} | 0
 ...xml2argv-pcie-root-port-too-many.xml => pcie-root-port-too-many.xml} | 0
 .../{qemuxml2argv-pcie-root-port.xml => pcie-root-port.xml}             | 0
 tests/qemuxml2argvdata/{qemuxml2argv-pcie-root.xml => pcie-root.xml}    | 0
 ...-pcie-switch-downstream-port.xml => pcie-switch-downstream-port.xml} | 0
 ...argv-pcie-switch-upstream-port.xml => pcie-switch-upstream-port.xml} | 0
 .../{qemuxml2argv-pcihole64-gib.xml => pcihole64-gib.xml}               | 0
 .../{qemuxml2argv-pcihole64-none.xml => pcihole64-none.xml}             | 0
 .../{qemuxml2argv-pcihole64-q35.xml => pcihole64-q35.xml}               | 0
 tests/qemuxml2argvdata/{qemuxml2argv-pcihole64.xml => pcihole64.xml}    | 0
 .../{qemuxml2argv-pmu-feature-off.xml => pmu-feature-off.xml}           | 0
 .../qemuxml2argvdata/{qemuxml2argv-pmu-feature.xml => pmu-feature.xml}  | 0
 tests/qemuxml2argvdata/{qemuxml2argv-ppc-dtb.xml => ppc-dtb.xml}        | 0
 tests/qemuxml2argvdata/ppc64-usb-controller-legacy.xml                  | 1 +
 tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.xml               | 1 +
 .../{qemuxml2argv-ppc64-usb-controller.xml => ppc64-usb-controller.xml} | 0
 .../{qemuxml2argv-ppce500-serial.xml => ppce500-serial.xml}             | 0
 .../{qemuxml2argv-pseries-basic.xml => pseries-basic.xml}               | 0
 ...muxml2argv-pseries-console-native.xml => pseries-console-native.xml} | 0
 ...muxml2argv-pseries-console-virtio.xml => pseries-console-virtio.xml} | 0
 ...argv-pseries-cpu-compat-power9.xml => pseries-cpu-compat-power9.xml} | 0
 .../{qemuxml2argv-pseries-cpu-compat.xml => pseries-cpu-compat.xml}     | 0
 .../{qemuxml2argv-pseries-cpu-exact.xml => pseries-cpu-exact.xml}       | 0
 .../{qemuxml2argv-pseries-cpu-le.xml => pseries-cpu-le.xml}             | 0
 ...ries-default-phb-numa-node.xml => pseries-default-phb-numa-node.xml} | 0
 .../{qemuxml2argv-pseries-disk.xml => pseries-disk.xml}                 | 0
 .../{qemuxml2argv-pseries-hostdevs-1.xml => pseries-hostdevs-1.xml}     | 0
 .../{qemuxml2argv-pseries-hostdevs-2.xml => pseries-hostdevs-2.xml}     | 0
 .../{qemuxml2argv-pseries-hostdevs-3.xml => pseries-hostdevs-3.xml}     | 0
 ...ing-invalid-machine.xml => pseries-hpt-resizing-invalid-machine.xml} | 0
 .../{qemuxml2argv-pseries-hpt-resizing.xml => pseries-hpt-resizing.xml} | 0
 .../{qemuxml2argv-pseries-many-buses-1.xml => pseries-many-buses-1.xml} | 0
 .../{qemuxml2argv-pseries-many-buses-2.xml => pseries-many-buses-2.xml} | 0
 .../{qemuxml2argv-pseries-many-devices.xml => pseries-many-devices.xml} | 0
 .../{qemuxml2argv-pseries-no-parallel.xml => pseries-no-parallel.xml}   | 0
 .../{qemuxml2argv-pseries-nvram.xml => pseries-nvram.xml}               | 0
 ...qemuxml2argv-pseries-panic-address.xml => pseries-panic-address.xml} | 0
 ...qemuxml2argv-pseries-panic-missing.xml => pseries-panic-missing.xml} | 0
 ...l2argv-pseries-panic-no-address.xml => pseries-panic-no-address.xml} | 0
 ...-pseries-phb-default-missing.xml => pseries-phb-default-missing.xml} | 0
 ...nvalid-target-index-1.xml => pseries-phb-invalid-target-index-1.xml} | 0
 ...nvalid-target-index-2.xml => pseries-phb-invalid-target-index-2.xml} | 0
 ...nvalid-target-index-3.xml => pseries-phb-invalid-target-index-3.xml} | 0
 ...qemuxml2argv-pseries-phb-numa-node.xml => pseries-phb-numa-node.xml} | 0
 .../{qemuxml2argv-pseries-phb-simple.xml => pseries-phb-simple.xml}     | 0
 ...ries-serial+console-native.xml => pseries-serial+console-native.xml} | 0
 ...qemuxml2argv-pseries-serial-compat.xml => pseries-serial-compat.xml} | 0
 ...es-serial-invalid-machine.xml => pseries-serial-invalid-machine.xml} | 0
 ...qemuxml2argv-pseries-serial-native.xml => pseries-serial-native.xml} | 0
 .../{qemuxml2argv-pseries-serial-pci.xml => pseries-serial-pci.xml}     | 0
 .../{qemuxml2argv-pseries-serial-usb.xml => pseries-serial-usb.xml}     | 0
 .../{qemuxml2argv-pseries-usb-default.xml => pseries-usb-default.xml}   | 0
 .../{qemuxml2argv-pseries-usb-kbd.xml => pseries-usb-kbd.xml}           | 0
 .../{qemuxml2argv-pseries-usb-multi.xml => pseries-usb-multi.xml}       | 0
 ...argv-pseries-vio-address-clash.xml => pseries-vio-address-clash.xml} | 0
 ...argv-pseries-vio-user-assigned.xml => pseries-vio-user-assigned.xml} | 0
 .../qemuxml2argvdata/{qemuxml2argv-pseries-vio.xml => pseries-vio.xml}  | 0
 .../{qemuxml2argv-pv-spinlock-disabled.xml => pv-spinlock-disabled.xml} | 0
 .../{qemuxml2argv-pv-spinlock-enabled.xml => pv-spinlock-enabled.xml}   | 0
 .../{qemuxml2argv-q35-acpi-nouefi.xml => q35-acpi-nouefi.xml}           | 0
 .../{qemuxml2argv-q35-acpi-uefi.xml => q35-acpi-uefi.xml}               | 0
 ...l2argv-q35-default-devices-only.xml => q35-default-devices-only.xml} | 0
 .../{qemuxml2argv-q35-dmi-bad-address1.xml => q35-dmi-bad-address1.xml} | 0
 .../{qemuxml2argv-q35-dmi-bad-address2.xml => q35-dmi-bad-address2.xml} | 0
 .../{qemuxml2argv-q35-multifunction.xml => q35-multifunction.xml}       | 0
 .../{qemuxml2argv-q35-noacpi-nouefi.xml => q35-noacpi-nouefi.xml}       | 0
 .../{qemuxml2argv-q35-noacpi-uefi.xml => q35-noacpi-uefi.xml}           | 0
 ...qemuxml2argv-q35-pci-force-address.xml => q35-pci-force-address.xml} | 0
 .../{qemuxml2argv-q35-pcie-autoadd.xml => q35-pcie-autoadd.xml}         | 0
 tests/qemuxml2argvdata/{qemuxml2argv-q35-pcie.xml => q35-pcie.xml}      | 0
 ...xml2argv-q35-pm-disable-fallback.xml => q35-pm-disable-fallback.xml} | 0
 .../{qemuxml2argv-q35-pm-disable.xml => q35-pm-disable.xml}             | 0
 .../{qemuxml2argv-q35-usb2-multi.xml => q35-usb2-multi.xml}             | 0
 .../{qemuxml2argv-q35-usb2-reorder.xml => q35-usb2-reorder.xml}         | 0
 tests/qemuxml2argvdata/{qemuxml2argv-q35-usb2.xml => q35-usb2.xml}      | 0
 ...muxml2argv-q35-virt-manager-basic.xml => q35-virt-manager-basic.xml} | 0
 tests/qemuxml2argvdata/q35-virtio-pci.xml                               | 1 +
 .../{qemuxml2argv-q35-wrong-root.xml => q35-wrong-root.xml}             | 0
 tests/qemuxml2argvdata/{qemuxml2argv-q35.xml => q35.xml}                | 0
 .../qemuxml2argvdata/{qemuxml2argv-qemu-ns-alt.xml => qemu-ns-alt.xml}  | 0
 ...xml2argv-qemu-ns-commandline-ns0.xml => qemu-ns-commandline-ns0.xml} | 0
 ...xml2argv-qemu-ns-commandline-ns1.xml => qemu-ns-commandline-ns1.xml} | 0
 .../{qemuxml2argv-qemu-ns-commandline.xml => qemu-ns-commandline.xml}   | 0
 ...ns-domain-commandline-ns0.xml => qemu-ns-domain-commandline-ns0.xml} | 0
 ...gv-qemu-ns-domain-commandline.xml => qemu-ns-domain-commandline.xml} | 0
 .../{qemuxml2argv-qemu-ns-domain-ns0.xml => qemu-ns-domain-ns0.xml}     | 0
 .../{qemuxml2argv-qemu-ns-no-env.xml => qemu-ns-no-env.xml}             | 0
 tests/qemuxml2argvdata/{qemuxml2argv-qemu-ns.xml => qemu-ns.xml}        | 0
 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-both.xml           | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v2.xml             | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v3.xml             | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.xml     | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-qemu-xhci.xml  | 1 -
 tests/qemuxml2argvdata/qemuxml2argv-q35-virtio-pci.xml                  | 1 -
 .../qemuxml2argv-usb-controller-default-unavailable-q35.xml             | 1 -
 .../qemuxml2argv-usb-controller-explicit-unavailable-q35.xml            | 1 -
 .../qemuxml2argv-usb-controller-qemu-xhci-unavailable.xml               | 1 -
 ...xml2argv-reboot-timeout-disabled.xml => reboot-timeout-disabled.xml} | 0
 ...muxml2argv-reboot-timeout-enabled.xml => reboot-timeout-enabled.xml} | 0
 .../{qemuxml2argv-restore-v2-fd.xml => restore-v2-fd.xml}               | 0
 tests/qemuxml2argvdata/{qemuxml2argv-restore-v2.xml => restore-v2.xml}  | 0
 ...low-bogus-usb-controller.xml => s390-allow-bogus-usb-controller.xml} | 0
 ...argv-s390-allow-bogus-usb-none.xml => s390-allow-bogus-usb-none.xml} | 0
 .../{qemuxml2argv-s390-defaultconsole.xml => s390-defaultconsole.xml}   | 0
 .../{qemuxml2argv-s390-no-parallel.xml => s390-no-parallel.xml}         | 0
 .../{qemuxml2argv-s390-panic-address.xml => s390-panic-address.xml}     | 0
 .../{qemuxml2argv-s390-panic-missing.xml => s390-panic-missing.xml}     | 0
 ...qemuxml2argv-s390-panic-no-address.xml => s390-panic-no-address.xml} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-s390-panic.xml => s390-panic.xml}  | 0
 .../{qemuxml2argv-s390-serial-2.xml => s390-serial-2.xml}               | 0
 .../{qemuxml2argv-s390-serial-console.xml => s390-serial-console.xml}   | 0
 .../qemuxml2argvdata/{qemuxml2argv-s390-serial.xml => s390-serial.xml}  | 0
 .../{qemuxml2argv-seclabel-dac-none.xml => seclabel-dac-none.xml}       | 0
 ...gv-seclabel-device-duplicates.xml => seclabel-device-duplicates.xml} | 0
 ...l2argv-seclabel-device-multiple.xml => seclabel-device-multiple.xml} | 0
 ...gv-seclabel-dynamic-baselabel.xml => seclabel-dynamic-baselabel.xml} | 0
 ...gv-seclabel-dynamic-labelskip.xml => seclabel-dynamic-labelskip.xml} | 0
 ...label-dynamic-none-relabel.xml => seclabel-dynamic-none-relabel.xml} | 0
 ...qemuxml2argv-seclabel-dynamic-none.xml => seclabel-dynamic-none.xml} | 0
 ...argv-seclabel-dynamic-override.xml => seclabel-dynamic-override.xml} | 0
 ...l2argv-seclabel-dynamic-relabel.xml => seclabel-dynamic-relabel.xml} | 0
 .../{qemuxml2argv-seclabel-dynamic.xml => seclabel-dynamic.xml}         | 0
 .../{qemuxml2argv-seclabel-multiple.xml => seclabel-multiple.xml}       | 0
 .../{qemuxml2argv-seclabel-none.xml => seclabel-none.xml}               | 0
 ...argv-seclabel-static-labelskip.xml => seclabel-static-labelskip.xml} | 0
 ...xml2argv-seclabel-static-relabel.xml => seclabel-static-relabel.xml} | 0
 .../{qemuxml2argv-seclabel-static.xml => seclabel-static.xml}           | 0
 ...argv-serial-dev-chardev-iobase.xml => serial-dev-chardev-iobase.xml} | 0
 .../{qemuxml2argv-serial-dev-chardev.xml => serial-dev-chardev.xml}     | 0
 .../{qemuxml2argv-serial-file-chardev.xml => serial-file-chardev.xml}   | 0
 .../{qemuxml2argv-serial-file-log.xml => serial-file-log.xml}           | 0
 .../{qemuxml2argv-serial-many-chardev.xml => serial-many-chardev.xml}   | 0
 .../{qemuxml2argv-serial-pty-chardev.xml => serial-pty-chardev.xml}     | 0
 tests/qemuxml2argvdata/{qemuxml2argv-serial-pty.xml => serial-pty.xml}  | 0
 ...l2argv-serial-spiceport-nospice.xml => serial-spiceport-nospice.xml} | 0
 .../{qemuxml2argv-serial-spiceport.xml => serial-spiceport.xml}         | 0
 ...xml2argv-serial-target-port-auto.xml => serial-target-port-auto.xml} | 0
 .../{qemuxml2argv-serial-tcp-chardev.xml => serial-tcp-chardev.xml}     | 0
 ...argv-serial-tcp-telnet-chardev.xml => serial-tcp-telnet-chardev.xml} | 0
 ...p-tlsx509-chardev-notls.xml => serial-tcp-tlsx509-chardev-notls.xml} | 0
 ...tlsx509-chardev-verify.xml => serial-tcp-tlsx509-chardev-verify.xml} | 0
 ...gv-serial-tcp-tlsx509-chardev.xml => serial-tcp-tlsx509-chardev.xml} | 0
 ...tlsx509-secret-chardev.xml => serial-tcp-tlsx509-secret-chardev.xml} | 0
 .../{qemuxml2argv-serial-udp-chardev.xml => serial-udp-chardev.xml}     | 0
 .../{qemuxml2argv-serial-unix-chardev.xml => serial-unix-chardev.xml}   | 0
 .../{qemuxml2argv-serial-vc-chardev.xml => serial-vc-chardev.xml}       | 0
 ...qemuxml2argv-shmem-invalid-address.xml => shmem-invalid-address.xml} | 0
 .../{qemuxml2argv-shmem-invalid-size.xml => shmem-invalid-size.xml}     | 0
 .../{qemuxml2argv-shmem-msi-only.xml => shmem-msi-only.xml}             | 0
 .../{qemuxml2argv-shmem-plain-doorbell.xml => shmem-plain-doorbell.xml} | 0
 .../{qemuxml2argv-shmem-small-size.xml => shmem-small-size.xml}         | 0
 tests/qemuxml2argvdata/{qemuxml2argv-shmem.xml => shmem.xml}            | 0
 .../{qemuxml2argv-smartcard-controller.xml => smartcard-controller.xml} | 0
 ...-smartcard-host-certificates.xml => smartcard-host-certificates.xml} | 0
 .../{qemuxml2argv-smartcard-host.xml => smartcard-host.xml}             | 0
 ...card-passthrough-spicevmc.xml => smartcard-passthrough-spicevmc.xml} | 0
 ...argv-smartcard-passthrough-tcp.xml => smartcard-passthrough-tcp.xml} | 0
 .../qemuxml2argvdata/{qemuxml2argv-smbios-date.xml => smbios-date.xml}  | 0
 ...qemuxml2argv-smbios-multiple-type2.xml => smbios-multiple-type2.xml} | 0
 .../{qemuxml2argv-smbios-uuid-match.xml => smbios-uuid-match.xml}       | 0
 tests/qemuxml2argvdata/{qemuxml2argv-smbios.xml => smbios.xml}          | 0
 tests/qemuxml2argvdata/{qemuxml2argv-smp.xml => smp.xml}                | 0
 .../{qemuxml2argv-sound-device.xml => sound-device.xml}                 | 0
 tests/qemuxml2argvdata/{qemuxml2argv-sound.xml => sound.xml}            | 0
 .../{qemuxml2argv-tap-vhost-incorrect.xml => tap-vhost-incorrect.xml}   | 0
 tests/qemuxml2argvdata/{qemuxml2argv-tap-vhost.xml => tap-vhost.xml}    | 0
 ...muxml2argv-tpm-no-backend-invalid.xml => tpm-no-backend-invalid.xml} | 0
 .../{qemuxml2argv-tpm-passthrough.xml => tpm-passthrough.xml}           | 0
 .../{qemuxml2argv-usb-bus-missing.xml => usb-bus-missing.xml}           | 0
 ...gv-usb-controller-default-q35.xml => usb-controller-default-q35.xml} | 0
 tests/qemuxml2argvdata/usb-controller-default-unavailable-q35.xml       | 1 +
 ...-usb-controller-explicit-q35.xml => usb-controller-explicit-q35.xml} | 0
 tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.xml      | 1 +
 ...ontroller-qemu-xhci-limit.xml => usb-controller-qemu-xhci-limit.xml} | 0
 tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xml         | 1 +
 ...l2argv-usb-controller-qemu-xhci.xml => usb-controller-qemu-xhci.xml} | 0
 ...argv-usb-controller-xhci-limit.xml => usb-controller-xhci-limit.xml} | 0
 .../{qemuxml2argv-usb-controller-xhci.xml => usb-controller-xhci.xml}   | 0
 .../{qemuxml2argv-usb-controller.xml => usb-controller.xml}             | 0
 ...muxml2argv-usb-hub-autoadd-deluxe.xml => usb-hub-autoadd-deluxe.xml} | 0
 .../{qemuxml2argv-usb-hub-autoadd.xml => usb-hub-autoadd.xml}           | 0
 .../{qemuxml2argv-usb-hub-conflict.xml => usb-hub-conflict.xml}         | 0
 .../{qemuxml2argv-usb-hub-nonexistent.xml => usb-hub-nonexistent.xml}   | 0
 tests/qemuxml2argvdata/{qemuxml2argv-usb-hub.xml => usb-hub.xml}        | 0
 .../{qemuxml2argv-usb-ich9-autoassign.xml => usb-ich9-autoassign.xml}   | 0
 .../{qemuxml2argv-usb-ich9-companion.xml => usb-ich9-companion.xml}     | 0
 .../{qemuxml2argv-usb-ich9-ehci-addr.xml => usb-ich9-ehci-addr.xml}     | 0
 ...qemuxml2argv-usb-ich9-no-companion.xml => usb-ich9-no-companion.xml} | 0
 .../{qemuxml2argv-usb-long-port-path.xml => usb-long-port-path.xml}     | 0
 .../{qemuxml2argv-usb-none-hub.xml => usb-none-hub.xml}                 | 0
 .../{qemuxml2argv-usb-none-other.xml => usb-none-other.xml}             | 0
 .../{qemuxml2argv-usb-none-usbtablet.xml => usb-none-usbtablet.xml}     | 0
 tests/qemuxml2argvdata/{qemuxml2argv-usb-none.xml => usb-none.xml}      | 0
 .../{qemuxml2argv-usb-piix3-controller.xml => usb-piix3-controller.xml} | 0
 .../{qemuxml2argv-usb-port-autoassign.xml => usb-port-autoassign.xml}   | 0
 .../{qemuxml2argv-usb-port-missing.xml => usb-port-missing.xml}         | 0
 ...muxml2argv-usb-ports-out-of-range.xml => usb-ports-out-of-range.xml} | 0
 tests/qemuxml2argvdata/{qemuxml2argv-usb-ports.xml => usb-ports.xml}    | 0
 .../{qemuxml2argv-usb-redir-boot.xml => usb-redir-boot.xml}             | 0
 ...l2argv-usb-redir-filter-version.xml => usb-redir-filter-version.xml} | 0
 .../{qemuxml2argv-usb-redir-filter.xml => usb-redir-filter.xml}         | 0
 tests/qemuxml2argvdata/{qemuxml2argv-usb-redir.xml => usb-redir.xml}    | 0
 ...oo-long-port-path-invalid.xml => usb-too-long-port-path-invalid.xml} | 0
 .../{qemuxml2argv-usb-xhci-autoassign.xml => usb-xhci-autoassign.xml}   | 0
 tests/qemuxml2argvdata/{qemuxml2argv-usb1-usb2.xml => usb1-usb2.xml}    | 0
 .../{qemuxml2argv-user-aliases.xml => user-aliases.xml}                 | 0
 .../{qemuxml2argv-user-aliases2.xml => user-aliases2.xml}               | 0
 ...qemuxml2argv-vcpu-placement-static.xml => vcpu-placement-static.xml} | 0
 .../{qemuxml2argv-vhost_queues-invalid.xml => vhost_queues-invalid.xml} | 0
 .../{qemuxml2argv-vhost_queues.xml => vhost_queues.xml}                 | 0
 ...ideo-device-pciaddr-default.xml => video-device-pciaddr-default.xml} | 0
 .../{qemuxml2argv-video-invalid.xml => video-invalid.xml}               | 0
 ...xml2argv-video-qxl-device-vgamem.xml => video-qxl-device-vgamem.xml} | 0
 ...xml2argv-video-qxl-device-vram64.xml => video-qxl-device-vram64.xml} | 0
 .../{qemuxml2argv-video-qxl-device.xml => video-qxl-device.xml}         | 0
 .../{qemuxml2argv-video-qxl-heads.xml => video-qxl-heads.xml}           | 0
 .../{qemuxml2argv-video-qxl-nodevice.xml => video-qxl-nodevice.xml}     | 0
 .../{qemuxml2argv-video-qxl-noheads.xml => video-qxl-noheads.xml}       | 0
 ...-video-qxl-sec-device-vgamem.xml => video-qxl-sec-device-vgamem.xml} | 0
 ...-video-qxl-sec-device-vram64.xml => video-qxl-sec-device-vram64.xml} | 0
 .../{qemuxml2argv-video-qxl-sec-device.xml => video-qxl-sec-device.xml} | 0
 ...xml2argv-video-vga-device-vgamem.xml => video-vga-device-vgamem.xml} | 0
 .../{qemuxml2argv-video-vga-device.xml => video-vga-device.xml}         | 0
 .../{qemuxml2argv-video-vga-nodevice.xml => video-vga-nodevice.xml}     | 0
 .../{qemuxml2argv-video-vga-qxl-heads.xml => video-vga-qxl-heads.xml}   | 0
 ...xml2argv-video-virtio-gpu-device.xml => video-virtio-gpu-device.xml} | 0
 ...gv-video-virtio-gpu-secondary.xml => video-virtio-gpu-secondary.xml} | 0
 ...argv-video-virtio-gpu-spice-gl.xml => video-virtio-gpu-spice-gl.xml} | 0
 ...muxml2argv-video-virtio-gpu-virgl.xml => video-virtio-gpu-virgl.xml} | 0
 .../{qemuxml2argv-video-virtio-vga.xml => video-virtio-vga.xml}         | 0
 ...l2argv-virtio-input-passthrough.xml => virtio-input-passthrough.xml} | 0
 .../{qemuxml2argv-virtio-input.xml => virtio-input.xml}                 | 0
 tests/qemuxml2argvdata/{qemuxml2argv-virtio-lun.xml => virtio-lun.xml}  | 0
 .../{qemuxml2argv-virtio-options.xml => virtio-options.xml}             | 0
 .../{qemuxml2argv-virtio-rng-ccw.xml => virtio-rng-ccw.xml}             | 0
 .../{qemuxml2argv-virtio-rng-default.xml => virtio-rng-default.xml}     | 0
 .../{qemuxml2argv-virtio-rng-egd-crash.xml => virtio-rng-egd-crash.xml} | 0
 .../{qemuxml2argv-virtio-rng-egd.xml => virtio-rng-egd.xml}             | 0
 .../{qemuxml2argv-virtio-rng-multiple.xml => virtio-rng-multiple.xml}   | 0
 .../{qemuxml2argv-virtio-rng-random.xml => virtio-rng-random.xml}       | 0
 tests/qemuxml2argvdata/{qemuxml2argv-vmcoreinfo.xml => vmcoreinfo.xml}  | 0
 .../{qemuxml2argv-watchdog-device.xml => watchdog-device.xml}           | 0
 .../{qemuxml2argv-watchdog-diag288.xml => watchdog-diag288.xml}         | 0
 .../{qemuxml2argv-watchdog-dump.xml => watchdog-dump.xml}               | 0
 .../{qemuxml2argv-watchdog-injectnmi.xml => watchdog-injectnmi.xml}     | 0
 tests/qemuxml2argvdata/{qemuxml2argv-watchdog.xml => watchdog.xml}      | 0
 .../{qemuxml2argv-x86-kvm-32-on-64.xml => x86-kvm-32-on-64.xml}         | 0
 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-default.xml         | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-host.xml            | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-both.xml       | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v2.xml         | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v3.xml         | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none.xml            | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v2.xml              | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-v3.xml              | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-group-num.xml      | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max-length.xml     | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune-max.xml            | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-detect-zeroes.xml    | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk-usage.xml        | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi-ccw.xml | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-vhost-scsi-pci.xml | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess.xml         | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess2.xml        | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages4.xml            | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages5.xml            | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages6.xml            | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages7.xml            | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-caching-mode.xml    | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-device-iotlb.xml    | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-eim.xml             | 2 +-
 .../qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm-access.xml  | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm-label.xml | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nvdimm.xml       | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml               | 2 +-
 .../qemuxml2xmlout-serial-tcp-tlsx509-chardev-notls.xml                 | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-user-aliases.xml                | 2 +-
 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml              | 2 +-
 837 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 385a54615..1255d1845 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -437,7 +437,7 @@ testCompareXMLToArgv(const void *data)
     if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0)
         goto cleanup;
 
-    if (virAsprintf(&xml, "%s/qemuxml2argvdata/qemuxml2argv-%s.xml",
+    if (virAsprintf(&xml, "%s/qemuxml2argvdata/%s.xml",
                     abs_srcdir, info->name) < 0 ||
         virAsprintf(&args, "%s/qemuxml2argvdata/qemuxml2argv-%s.args",
                     abs_srcdir, info->name) < 0)
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 146a67ee2..a930adf64 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -306,7 +306,7 @@ testInfoSet(struct testInfo *info,
     if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0)
         goto error;
 
-    if (virAsprintf(&info->inName, "%s/qemuxml2argvdata/qemuxml2argv-%s.xml",
+    if (virAsprintf(&info->inName, "%s/qemuxml2argvdata/%s.xml",
                     abs_srcdir, name) < 0)
         goto error;
 
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-440fx-ide-address-conflict.xml b/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-440fx-ide-address-conflict.xml
rename to tests/qemuxml2argvdata/440fx-ide-address-conflict.xml
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-440fx-wrong-root.xml b/tests/qemuxml2argvdata/440fx-wrong-root.xml
similarity index 100%
rename from tests/qemuxml2argvdata/qemuxml2argv-440fx-wrong-root.xml
rename to tests/qemuxml2argvdata/440fx-wrong-root.xml
<cut/>
-- 
2.13.6




More information about the libvir-list mailing list