[libvirt] [PATCH 3/4] test: Drop useless prefix for qemuxml2xmldata test data

Michal Privoznik mprivozn at redhat.com
Tue Dec 5 08:01:18 UTC 2017


There's no reason for the files to have qemuxml2xmlout- prefix
since they all live under qemuxml2xmloutdata directory.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 tests/qemuxml2xmltest.c                                           | 8 ++++----
 ...arch64-aavmf-virtio-mmio.xml => aarch64-aavmf-virtio-mmio.xml} | 0
 ...xml2xmlout-aarch64-gic-default.xml => aarch64-gic-default.xml} | 0
 .../{qemuxml2xmlout-aarch64-gic-host.xml => aarch64-gic-host.xml} | 0
 ...xmlout-aarch64-gic-none-both.xml => aarch64-gic-none-both.xml} | 0
 ...l2xmlout-aarch64-gic-none-tcg.xml => aarch64-gic-none-tcg.xml} | 0
 ...xml2xmlout-aarch64-gic-none-v2.xml => aarch64-gic-none-v2.xml} | 0
 ...xml2xmlout-aarch64-gic-none-v3.xml => aarch64-gic-none-v3.xml} | 0
 .../{qemuxml2xmlout-aarch64-gic-none.xml => aarch64-gic-none.xml} | 0
 .../{qemuxml2xmlout-aarch64-gic-v2.xml => aarch64-gic-v2.xml}     | 0
 .../{qemuxml2xmlout-aarch64-gic-v3.xml => aarch64-gic-v3.xml}     | 0
 ...muxml2xmlout-aarch64-pci-serial.xml => aarch64-pci-serial.xml} | 0
 ...xmlout-aarch64-video-default.xml => aarch64-video-default.xml} | 0
 ...-video-virtio-gpu-pci.xml => aarch64-video-virtio-gpu-pci.xml} | 0
 ...ch64-virtio-pci-default.xml => aarch64-virtio-pci-default.xml} | 0
 ...nual-addresses.xml => aarch64-virtio-pci-manual-addresses.xml} | 0
 .../{qemuxml2xmlout-acpi-table.xml => acpi-table.xml}             | 0
 .../{qemuxml2xmlout-autoindex.xml => autoindex.xml}               | 0
 ...xml2xmlout-balloon-device-auto.xml => balloon-device-auto.xml} | 0
 ...xmlout-balloon-device-period.xml => balloon-device-period.xml} | 0
 ...-bios-nvram-os-interleave.xml => bios-nvram-os-interleave.xml} | 0
 .../{qemuxml2xmlout-bios-nvram.xml => bios-nvram.xml}             | 0
 ...lout-blkdeviotune-group-num.xml => blkdeviotune-group-num.xml} | 0
 ...ut-blkdeviotune-max-length.xml => blkdeviotune-max-length.xml} | 0
 .../{qemuxml2xmlout-blkdeviotune-max.xml => blkdeviotune-max.xml} | 0
 .../{qemuxml2xmlout-blkdeviotune.xml => blkdeviotune.xml}         | 0
 .../{qemuxml2xmlout-blkiotune-device.xml => blkiotune-device.xml} | 0
 .../{qemuxml2xmlout-blkiotune.xml => blkiotune.xml}               | 0
 .../{qemuxml2xmlout-boot-cdrom.xml => boot-cdrom.xml}             | 0
 .../{qemuxml2xmlout-boot-floppy-q35.xml => boot-floppy-q35.xml}   | 0
 .../{qemuxml2xmlout-boot-floppy.xml => boot-floppy.xml}           | 0
 ...isable-with-timeout.xml => boot-menu-disable-with-timeout.xml} | 0
 ...qemuxml2xmlout-boot-menu-disable.xml => boot-menu-disable.xml} | 0
 ...-enable-with-timeout.xml => boot-menu-enable-with-timeout.xml} | 0
 .../{qemuxml2xmlout-boot-multi.xml => boot-multi.xml}             | 0
 .../{qemuxml2xmlout-boot-network.xml => boot-network.xml}         | 0
 .../{qemuxml2xmlout-boot-order.xml => boot-order.xml}             | 0
 ...l2xmlout-bootindex-floppy-q35.xml => bootindex-floppy-q35.xml} | 0
 .../{qemuxml2xmlout-channel-guestfwd.xml => channel-guestfwd.xml} | 0
 ...-channel-unix-source-path.xml => channel-unix-source-path.xml} | 0
 ...xml2xmlout-channel-virtio-auto.xml => channel-virtio-auto.xml} | 0
 ...el-virtio-state-active.xml => channel-virtio-state-active.xml} | 0
 ...irtio-state-inactive.xml => channel-virtio-state-inactive.xml} | 0
 .../{qemuxml2xmlout-channel-virtio.xml => channel-virtio.xml}     | 0
 .../{qemuxml2xmlout-chardev-label.xml => chardev-label.xml}       | 0
 .../{qemuxml2xmlout-clock-catchup.xml => clock-catchup.xml}       | 0
 .../{qemuxml2xmlout-clock-localtime.xml => clock-localtime.xml}   | 0
 ...lout-clock-timer-hyperv-rtc.xml => clock-timer-hyperv-rtc.xml} | 0
 .../{qemuxml2xmlout-clock-utc.xml => clock-utc.xml}               | 0
 ...xml2xmlout-console-compat-auto.xml => console-compat-auto.xml} | 0
 .../{qemuxml2xmlout-console-compat.xml => console-compat.xml}     | 0
 .../{qemuxml2xmlout-console-compat2.xml => console-compat2.xml}   | 0
 ...xml2xmlout-console-virtio-many.xml => console-virtio-many.xml} | 0
 .../{qemuxml2xmlout-console-virtio.xml => console-virtio.xml}     | 0
 ...l2xmlout-controller-usb-order.xml => controller-usb-order.xml} | 0
 ...lout-cpu-check-default-none.xml => cpu-check-default-none.xml} | 0
 ...ut-cpu-check-default-none2.xml => cpu-check-default-none2.xml} | 0
 ...pu-check-default-partial.xml => cpu-check-default-partial.xml} | 0
 ...-check-default-partial2.xml => cpu-check-default-partial2.xml} | 0
 .../{qemuxml2xmlout-cpu-check-full.xml => cpu-check-full.xml}     | 0
 .../{qemuxml2xmlout-cpu-check-none.xml => cpu-check-none.xml}     | 0
 ...qemuxml2xmlout-cpu-check-partial.xml => cpu-check-partial.xml} | 0
 .../{qemuxml2xmlout-cpu-empty.xml => cpu-empty.xml}               | 0
 .../{qemuxml2xmlout-cpu-eoi-disabled.xml => cpu-eoi-disabled.xml} | 0
 .../{qemuxml2xmlout-cpu-eoi-enabled.xml => cpu-eoi-enabled.xml}   | 0
 ...qemuxml2xmlout-cpu-host-kvmclock.xml => cpu-host-kvmclock.xml} | 0
 ...ut-cpu-host-model-features.xml => cpu-host-model-features.xml} | 0
 ...passthrough-features.xml => cpu-host-passthrough-features.xml} | 0
 .../{qemuxml2xmlout-cpu-kvmclock.xml => cpu-kvmclock.xml}         | 0
 ...qemuxml2xmlout-cpu-numa-disjoint.xml => cpu-numa-disjoint.xml} | 0
 ...xml2xmlout-cpu-numa-disordered.xml => cpu-numa-disordered.xml} | 0
 ...muxml2xmlout-cpu-numa-memshared.xml => cpu-numa-memshared.xml} | 0
 ...-numa-no-memory-element.xml => cpu-numa-no-memory-element.xml} | 0
 .../{qemuxml2xmlout-cpu-numa1.xml => cpu-numa1.xml}               | 0
 .../{qemuxml2xmlout-cpu-numa2.xml => cpu-numa2.xml}               | 0
 ...qemuxml2xmlout-cputune-iothreads.xml => cputune-iothreads.xml} | 0
 ...ed-zeropriority.xml => cputune-iothreadsched-zeropriority.xml} | 0
 ...xmlout-cputune-iothreadsched.xml => cputune-iothreadsched.xml} | 0
 .../{qemuxml2xmlout-cputune-numatune.xml => cputune-numatune.xml} | 0
 ...xml2xmlout-cputune-zero-shares.xml => cputune-zero-shares.xml} | 0
 .../{qemuxml2xmlout-cputune.xml => cputune.xml}                   | 0
 ...xmlout-default-kvm-host-arch.xml => default-kvm-host-arch.xml} | 0
 ...lout-default-qemu-host-arch.xml => default-qemu-host-arch.xml} | 0
 ...muxml2xmlout-disk-active-commit.xml => disk-active-commit.xml} | 0
 .../{qemuxml2xmlout-disk-aio.xml => disk-aio.xml}                 | 0
 ...k-backing-chains-active.xml => disk-backing-chains-active.xml} | 0
 ...cking-chains-inactive.xml => disk-backing-chains-inactive.xml} | 0
 .../{qemuxml2xmlout-disk-cdrom-empty.xml => disk-cdrom-empty.xml} | 0
 .../{qemuxml2xmlout-disk-cdrom.xml => disk-cdrom.xml}             | 0
 ...qemuxml2xmlout-disk-copy_on_read.xml => disk-copy_on_read.xml} | 0
 ...xmlout-disk-drive-boot-cdrom.xml => disk-drive-boot-cdrom.xml} | 0
 ...l2xmlout-disk-drive-boot-disk.xml => disk-drive-boot-disk.xml} | 0
 ...drive-cache-directsync.xml => disk-drive-cache-directsync.xml} | 0
 ...ut-disk-drive-cache-unsafe.xml => disk-drive-cache-unsafe.xml} | 0
 ...-disk-drive-cache-v2-none.xml => disk-drive-cache-v2-none.xml} | 0
 ...lout-disk-drive-cache-v2-wb.xml => disk-drive-cache-v2-wb.xml} | 0
 ...lout-disk-drive-cache-v2-wt.xml => disk-drive-cache-v2-wt.xml} | 0
 ...ut-disk-drive-copy-on-read.xml => disk-drive-copy-on-read.xml} | 0
 ...-disk-drive-detect-zeroes.xml => disk-drive-detect-zeroes.xml} | 0
 ...muxml2xmlout-disk-drive-discard.xml => disk-drive-discard.xml} | 0
 ...r-policy-enospace.xml => disk-drive-error-policy-enospace.xml} | 0
 ...ive-error-policy-stop.xml => disk-drive-error-policy-stop.xml} | 0
 ...rt-rignore.xml => disk-drive-error-policy-wreport-rignore.xml} | 0
 .../{qemuxml2xmlout-disk-drive-fat.xml => disk-drive-fat.xml}     | 0
 ...xml2xmlout-disk-drive-fmt-qcow.xml => disk-drive-fmt-qcow.xml} | 0
 ...k-drive-network-gluster.xml => disk-drive-network-gluster.xml} | 0
 ...e-network-iscsi-auth.xml => disk-drive-network-iscsi-auth.xml} | 0
 ...-disk-drive-network-iscsi.xml => disk-drive-network-iscsi.xml} | 0
 ...e-network-nbd-export.xml => disk-drive-network-nbd-export.xml} | 0
 ...nbd-ipv6-export.xml => disk-drive-network-nbd-ipv6-export.xml} | 0
 ...drive-network-nbd-ipv6.xml => disk-drive-network-nbd-ipv6.xml} | 0
 ...drive-network-nbd-unix.xml => disk-drive-network-nbd-unix.xml} | 0
 ...lout-disk-drive-network-nbd.xml => disk-drive-network-nbd.xml} | 0
 ...drive-network-rbd-auth.xml => disk-drive-network-rbd-auth.xml} | 0
 ...twork-rbd-ceph-env.xml => disk-drive-network-rbd-ceph-env.xml} | 0
 ...drive-network-rbd-ipv6.xml => disk-drive-network-rbd-ipv6.xml} | 0
 ...lout-disk-drive-network-rbd.xml => disk-drive-network-rbd.xml} | 0
 ...drive-network-sheepdog.xml => disk-drive-network-sheepdog.xml} | 0
 ...network-source-auth.xml => disk-drive-network-source-auth.xml} | 0
 ...twork-tlsx509-vxhs.xml => disk-drive-network-tlsx509-vxhs.xml} | 0
 ...ut-disk-drive-network-vxhs.xml => disk-drive-network-vxhs.xml} | 0
 .../{qemuxml2xmlout-disk-floppy.xml => disk-floppy.xml}           | 0
 .../{qemuxml2xmlout-disk-many.xml => disk-many.xml}               | 0
 ...muxml2xmlout-disk-mirror-active.xml => disk-mirror-active.xml} | 0
 ...l2xmlout-disk-mirror-inactive.xml => disk-mirror-inactive.xml} | 0
 ...-disk-mirror-old-inactive.xml => disk-mirror-old-inactive.xml} | 0
 .../{qemuxml2xmlout-disk-mirror-old.xml => disk-mirror-old.xml}   | 0
 ...xmlout-disk-scsi-device-auto.xml => disk-scsi-device-auto.xml} | 0
 .../{qemuxml2xmlout-disk-scsi-device.xml => disk-scsi-device.xml} | 0
 ...muxml2xmlout-disk-scsi-disk-vpd.xml => disk-scsi-disk-vpd.xml} | 0
 ...un-passthrough-sgio.xml => disk-scsi-lun-passthrough-sgio.xml} | 0
 ...qemuxml2xmlout-disk-scsi-megasas.xml => disk-scsi-megasas.xml} | 0
 ...l2xmlout-disk-scsi-mptsas1068.xml => disk-scsi-mptsas1068.xml} | 0
 ...xmlout-disk-scsi-virtio-scsi.xml => disk-scsi-virtio-scsi.xml} | 0
 .../{qemuxml2xmlout-disk-scsi-vscsi.xml => disk-scsi-vscsi.xml}   | 0
 .../{qemuxml2xmlout-disk-serial.xml => disk-serial.xml}           | 0
 ...xmlout-disk-source-pool-mode.xml => disk-source-pool-mode.xml} | 0
 .../{qemuxml2xmlout-disk-source-pool.xml => disk-source-pool.xml} | 0
 .../{qemuxml2xmlout-disk-usb-device.xml => disk-usb-device.xml}   | 0
 ...-disk-virtio-drive-queues.xml => disk-virtio-drive-queues.xml} | 0
 ...rtio-scsi-cmd_per_lun.xml => disk-virtio-scsi-cmd_per_lun.xml} | 0
 ...k-virtio-scsi-ioeventfd.xml => disk-virtio-scsi-ioeventfd.xml} | 0
 ...rtio-scsi-max_sectors.xml => disk-virtio-scsi-max_sectors.xml} | 0
 ...virtio-scsi-num_queues.xml => disk-virtio-scsi-num_queues.xml} | 0
 .../{qemuxml2xmlout-disk-virtio.xml => disk-virtio.xml}           | 0
 ...l2xmlout-encrypted-disk-usage.xml => encrypted-disk-usage.xml} | 0
 .../{qemuxml2xmlout-encrypted-disk.xml => encrypted-disk.xml}     | 0
 .../{qemuxml2xmlout-eoi-disabled.xml => eoi-disabled.xml}         | 0
 .../{qemuxml2xmlout-eoi-enabled.xml => eoi-enabled.xml}           | 0
 .../{qemuxml2xmlout-event_idx.xml => event_idx.xml}               | 0
 .../{qemuxml2xmlout-floppy-drive-fat.xml => floppy-drive-fat.xml} | 0
 ...ut-graphics-listen-network.xml => graphics-listen-network.xml} | 0
 ...-graphics-listen-network2.xml => graphics-listen-network2.xml} | 0
 ...ut-graphics-sdl-fullscreen.xml => graphics-sdl-fullscreen.xml} | 0
 .../{qemuxml2xmlout-graphics-sdl.xml => graphics-sdl.xml}         | 0
 ...ice-auto-socket-cfg.xml => graphics-spice-auto-socket-cfg.xml} | 0
 ...phics-spice-auto-socket.xml => graphics-spice-auto-socket.xml} | 0
 ...phics-spice-compression.xml => graphics-spice-compression.xml} | 0
 ...lout-graphics-spice-qxl-vga.xml => graphics-spice-qxl-vga.xml} | 0
 ...xmlout-graphics-spice-socket.xml => graphics-spice-socket.xml} | 0
 ...lout-graphics-spice-timeout.xml => graphics-spice-timeout.xml} | 0
 .../{qemuxml2xmlout-graphics-spice.xml => graphics-spice.xml}     | 0
 ...s-vnc-auto-socket-cfg.xml => graphics-vnc-auto-socket-cfg.xml} | 0
 ...-graphics-vnc-auto-socket.xml => graphics-vnc-auto-socket.xml} | 0
 ...ics-vnc-no-listen-attr.xml => graphics-vnc-no-listen-attr.xml} | 0
 ...active.xml => graphics-vnc-remove-generated-socket-active.xml} | 0
 ...tive.xml => graphics-vnc-remove-generated-socket-inactive.xml} | 0
 ...qemuxml2xmlout-graphics-vnc-sasl.xml => graphics-vnc-sasl.xml} | 0
 ...xml2xmlout-graphics-vnc-socket.xml => graphics-vnc-socket.xml} | 0
 .../{qemuxml2xmlout-graphics-vnc-tls.xml => graphics-vnc-tls.xml} | 0
 ...lout-graphics-vnc-websocket.xml => graphics-vnc-websocket.xml} | 0
 .../{qemuxml2xmlout-graphics-vnc.xml => graphics-vnc.xml}         | 0
 ...ut-hostdev-mdev-precreated.xml => hostdev-mdev-precreated.xml} | 0
 ...xml2xmlout-hostdev-pci-address.xml => hostdev-pci-address.xml} | 0
 ...-scsi-autogen-address.xml => hostdev-scsi-autogen-address.xml} | 0
 ...ut-hostdev-scsi-large-unit.xml => hostdev-scsi-large-unit.xml} | 0
 ...ev-scsi-lsi-iscsi-auth.xml => hostdev-scsi-lsi-iscsi-auth.xml} | 0
 ...lout-hostdev-scsi-lsi-iscsi.xml => hostdev-scsi-lsi-iscsi.xml} | 0
 .../{qemuxml2xmlout-hostdev-scsi-lsi.xml => hostdev-scsi-lsi.xml} | 0
 ...muxml2xmlout-hostdev-scsi-rawio.xml => hostdev-scsi-rawio.xml} | 0
 ...xmlout-hostdev-scsi-readonly.xml => hostdev-scsi-readonly.xml} | 0
 ...qemuxml2xmlout-hostdev-scsi-sgio.xml => hostdev-scsi-sgio.xml} | 0
 ...lout-hostdev-scsi-shareable.xml => hostdev-scsi-shareable.xml} | 0
 ...ev-scsi-vhost-scsi-ccw.xml => hostdev-scsi-vhost-scsi-ccw.xml} | 0
 ...ev-scsi-vhost-scsi-pci.xml => hostdev-scsi-vhost-scsi-pci.xml} | 0
 ...i-virtio-iscsi-auth.xml => hostdev-scsi-virtio-iscsi-auth.xml} | 0
 ...ostdev-scsi-virtio-iscsi.xml => hostdev-scsi-virtio-iscsi.xml} | 0
 ...-hostdev-scsi-virtio-scsi.xml => hostdev-scsi-virtio-scsi.xml} | 0
 ...xml2xmlout-hostdev-usb-address.xml => hostdev-usb-address.xml} | 0
 .../{qemuxml2xmlout-hostdev-vfio.xml => hostdev-vfio.xml}         | 0
 ...xml2xmlout-hugepages-memaccess.xml => hugepages-memaccess.xml} | 0
 ...l2xmlout-hugepages-memaccess2.xml => hugepages-memaccess2.xml} | 0
 .../{qemuxml2xmlout-hugepages-pages.xml => hugepages-pages.xml}   | 0
 .../{qemuxml2xmlout-hugepages-pages2.xml => hugepages-pages2.xml} | 0
 .../{qemuxml2xmlout-hugepages-pages3.xml => hugepages-pages3.xml} | 0
 .../{qemuxml2xmlout-hugepages-pages4.xml => hugepages-pages4.xml} | 0
 .../{qemuxml2xmlout-hugepages-pages5.xml => hugepages-pages5.xml} | 0
 .../{qemuxml2xmlout-hugepages-pages6.xml => hugepages-pages6.xml} | 0
 .../{qemuxml2xmlout-hugepages-pages7.xml => hugepages-pages7.xml} | 0
 .../{qemuxml2xmlout-hugepages-shared.xml => hugepages-shared.xml} | 0
 .../{qemuxml2xmlout-hugepages.xml => hugepages.xml}               | 0
 .../{qemuxml2xmlout-hyperv-off.xml => hyperv-off.xml}             | 0
 .../{qemuxml2xmlout-hyperv-panic.xml => hyperv-panic.xml}         | 0
 .../qemuxml2xmloutdata/{qemuxml2xmlout-hyperv.xml => hyperv.xml}  | 0
 .../{qemuxml2xmlout-input-usbmouse.xml => input-usbmouse.xml}     | 0
 .../{qemuxml2xmlout-input-usbtablet.xml => input-usbtablet.xml}   | 0
 ...-intel-iommu-caching-mode.xml => intel-iommu-caching-mode.xml} | 0
 ...-intel-iommu-device-iotlb.xml => intel-iommu-device-iotlb.xml} | 0
 .../{qemuxml2xmlout-intel-iommu-eim.xml => intel-iommu-eim.xml}   | 0
 ...xml2xmlout-intel-iommu-machine.xml => intel-iommu-machine.xml} | 0
 .../{qemuxml2xmlout-intel-iommu.xml => intel-iommu.xml}           | 0
 .../{qemuxml2xmlout-interface-driver.xml => interface-driver.xml} | 0
 .../{qemuxml2xmlout-interface-server.xml => interface-server.xml} | 0
 ...othreads-disk-virtio-ccw.xml => iothreads-disk-virtio-ccw.xml} | 0
 .../{qemuxml2xmlout-iothreads-disk.xml => iothreads-disk.xml}     | 0
 ...xmlout-iothreads-ids-partial.xml => iothreads-ids-partial.xml} | 0
 .../{qemuxml2xmlout-iothreads-ids.xml => iothreads-ids.xml}       | 0
 ...othreads-virtio-scsi-ccw.xml => iothreads-virtio-scsi-ccw.xml} | 0
 ...othreads-virtio-scsi-pci.xml => iothreads-virtio-scsi-pci.xml} | 0
 .../{qemuxml2xmlout-iothreads.xml => iothreads.xml}               | 0
 .../{qemuxml2xmlout-kvm-features-off.xml => kvm-features-off.xml} | 0
 .../{qemuxml2xmlout-kvm-features.xml => kvm-features.xml}         | 0
 .../{qemuxml2xmlout-kvmclock.xml => kvmclock.xml}                 | 0
 tests/qemuxml2xmloutdata/{qemuxml2xmlout-lease.xml => lease.xml}  | 0
 ...qemuxml2xmlout-luks-disks-source.xml => luks-disks-source.xml} | 0
 .../{qemuxml2xmlout-luks-disks.xml => luks-disks.xml}             | 0
 tests/qemuxml2xmloutdata/mach-virt-console-native.xml             | 1 +
 ...-mach-virt-console-virtio.xml => mach-virt-console-virtio.xml} | 0
 tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml      | 1 +
 ...ut-mach-virt-serial-compat.xml => mach-virt-serial-compat.xml} | 0
 tests/qemuxml2xmloutdata/mach-virt-serial-native.xml              | 1 +
 ...l2xmlout-mach-virt-serial-pci.xml => mach-virt-serial-pci.xml} | 0
 ...l2xmlout-mach-virt-serial-usb.xml => mach-virt-serial-usb.xml} | 0
 .../{qemuxml2xmlout-machine-core-off.xml => machine-core-off.xml} | 0
 .../{qemuxml2xmlout-machine-core-on.xml => machine-core-on.xml}   | 0
 ...ets-s390.xml => machine-loadparm-multiple-disks-nets-s390.xml} | 0
 ...xml2xmlout-memory-hotplug-dimm.xml => memory-hotplug-dimm.xml} | 0
 ...xmlout-memory-hotplug-nonuma.xml => memory-hotplug-nonuma.xml} | 0
 ...hotplug-nvdimm-access.xml => memory-hotplug-nvdimm-access.xml} | 0
 ...y-hotplug-nvdimm-label.xml => memory-hotplug-nvdimm-label.xml} | 0
 ...xmlout-memory-hotplug-nvdimm.xml => memory-hotplug-nvdimm.xml} | 0
 .../{qemuxml2xmlout-memory-hotplug.xml => memory-hotplug.xml}     | 0
 ...qemuxml2xmlout-memorybacking-set.xml => memorybacking-set.xml} | 0
 ...xml2xmlout-memorybacking-unset.xml => memorybacking-unset.xml} | 0
 ...qemuxml2xmlout-memtune-unlimited.xml => memtune-unlimited.xml} | 0
 .../{qemuxml2xmlout-memtune.xml => memtune.xml}                   | 0
 ...muxml2xmlout-metadata-duplicate.xml => metadata-duplicate.xml} | 0
 .../{qemuxml2xmlout-metadata.xml => metadata.xml}                 | 0
 .../{qemuxml2xmlout-migrate.xml => migrate.xml}                   | 0
 .../{qemuxml2xmlout-minimal.xml => minimal.xml}                   | 0
 .../{qemuxml2xmlout-misc-acpi.xml => misc-acpi.xml}               | 0
 .../{qemuxml2xmlout-misc-disable-s3.xml => misc-disable-s3.xml}   | 0
 ...xmlout-misc-disable-suspends.xml => misc-disable-suspends.xml} | 0
 .../{qemuxml2xmlout-misc-enable-s4.xml => misc-enable-s4.xml}     | 0
 .../{qemuxml2xmlout-misc-no-reboot.xml => misc-no-reboot.xml}     | 0
 .../{qemuxml2xmlout-misc-uuid.xml => misc-uuid.xml}               | 0
 .../{qemuxml2xmlout-net-bandwidth.xml => net-bandwidth.xml}       | 0
 .../{qemuxml2xmlout-net-bandwidth2.xml => net-bandwidth2.xml}     | 0
 .../{qemuxml2xmlout-net-coalesce.xml => net-coalesce.xml}         | 0
 .../{qemuxml2xmlout-net-eth-hostip.xml => net-eth-hostip.xml}     | 0
 .../{qemuxml2xmlout-net-eth-ifname.xml => net-eth-ifname.xml}     | 0
 .../{qemuxml2xmlout-net-eth.xml => net-eth.xml}                   | 0
 .../{qemuxml2xmlout-net-hostdev-vfio.xml => net-hostdev-vfio.xml} | 0
 .../{qemuxml2xmlout-net-hostdev.xml => net-hostdev.xml}           | 0
 .../{qemuxml2xmlout-net-midonet.xml => net-midonet.xml}           | 0
 .../{qemuxml2xmlout-net-mtu.xml => net-mtu.xml}                   | 0
 .../{qemuxml2xmlout-net-openvswitch.xml => net-openvswitch.xml}   | 0
 .../{qemuxml2xmlout-net-udp.xml => net-udp.xml}                   | 0
 .../{qemuxml2xmlout-net-user-addr.xml => net-user-addr.xml}       | 0
 .../{qemuxml2xmlout-net-user.xml => net-user.xml}                 | 0
 .../{qemuxml2xmlout-net-vhostuser.xml => net-vhostuser.xml}       | 0
 ...qemuxml2xmlout-net-virtio-device.xml => net-virtio-device.xml} | 0
 ...irtio-disable-offloads.xml => net-virtio-disable-offloads.xml} | 0
 ...tio-network-portgroup.xml => net-virtio-network-portgroup.xml} | 0
 ...-net-virtio-rxtxqueuesize.xml => net-virtio-rxtxqueuesize.xml} | 0
 .../{qemuxml2xmlout-net-virtio.xml => net-virtio.xml}             | 0
 .../{qemuxml2xmlout-nographics-vga.xml => nographics-vga.xml}     | 0
 .../{qemuxml2xmlout-nosharepages.xml => nosharepages.xml}         | 0
 ...o-memory-vcpu-cpuset.xml => numad-auto-memory-vcpu-cpuset.xml} | 0
 ...ent.xml => numad-auto-memory-vcpu-no-cpuset-and-placement.xml} | 0
 ...-auto-vcpu-no-numatune.xml => numad-auto-vcpu-no-numatune.xml} | 0
 ...tic-vcpu-no-numatune.xml => numad-static-vcpu-no-numatune.xml} | 0
 ...l2xmlout-numatune-auto-prefer.xml => numatune-auto-prefer.xml} | 0
 ...atune-memnode-no-memory.xml => numatune-memnode-no-memory.xml} | 0
 .../{qemuxml2xmlout-numatune-memnode.xml => numatune-memnode.xml} | 0
 .../{qemuxml2xmlout-panic-double.xml => panic-double.xml}         | 0
 .../{qemuxml2xmlout-panic-isa.xml => panic-isa.xml}               | 0
 .../{qemuxml2xmlout-panic-no-address.xml => panic-no-address.xml} | 0
 .../{qemuxml2xmlout-panic-pseries.xml => panic-pseries.xml}       | 0
 tests/qemuxml2xmloutdata/{qemuxml2xmlout-panic.xml => panic.xml}  | 0
 .../{qemuxml2xmlout-parallel-tcp.xml => parallel-tcp.xml}         | 0
 .../{qemuxml2xmlout-pci-autoadd-addr.xml => pci-autoadd-addr.xml} | 0
 .../{qemuxml2xmlout-pci-autoadd-idx.xml => pci-autoadd-idx.xml}   | 0
 ...qemuxml2xmlout-pci-autofill-addr.xml => pci-autofill-addr.xml} | 0
 ...xmlout-pci-bridge-many-disks.xml => pci-bridge-many-disks.xml} | 0
 .../{qemuxml2xmlout-pci-bridge.xml => pci-bridge.xml}             | 0
 .../{qemuxml2xmlout-pci-expander-bus.xml => pci-expander-bus.xml} | 0
 .../{qemuxml2xmlout-pci-many.xml => pci-many.xml}                 | 0
 .../{qemuxml2xmlout-pci-rom.xml => pci-rom.xml}                   | 0
 ...lout-pci-serial-dev-chardev.xml => pci-serial-dev-chardev.xml} | 0
 ...qemuxml2xmlout-pcie-expander-bus.xml => pcie-expander-bus.xml} | 0
 ...ot-port-model-generic.xml => pcie-root-port-model-generic.xml} | 0
 ...ot-port-model-ioh3420.xml => pcie-root-port-model-ioh3420.xml} | 0
 .../{qemuxml2xmlout-pcie-root-port.xml => pcie-root-port.xml}     | 0
 .../{qemuxml2xmlout-pcie-root.xml => pcie-root.xml}               | 0
 ...switch-downstream-port.xml => pcie-switch-downstream-port.xml} | 0
 ...cie-switch-upstream-port.xml => pcie-switch-upstream-port.xml} | 0
 .../{qemuxml2xmlout-pcihole64-gib.xml => pcihole64-gib.xml}       | 0
 .../{qemuxml2xmlout-pcihole64-none.xml => pcihole64-none.xml}     | 0
 .../{qemuxml2xmlout-pcihole64-q35.xml => pcihole64-q35.xml}       | 0
 .../{qemuxml2xmlout-pcihole64.xml => pcihole64.xml}               | 0
 .../{qemuxml2xmlout-pmu-feature-off.xml => pmu-feature-off.xml}   | 0
 .../{qemuxml2xmlout-pmu-feature.xml => pmu-feature.xml}           | 0
 ...-usb-controller-legacy.xml => ppc64-usb-controller-legacy.xml} | 0
 ...l2xmlout-ppc64-usb-controller.xml => ppc64-usb-controller.xml} | 0
 tests/qemuxml2xmloutdata/pseries-console-native.xml               | 1 +
 ...lout-pseries-console-virtio.xml => pseries-console-virtio.xml} | 0
 ...series-cpu-compat-power9.xml => pseries-cpu-compat-power9.xml} | 0
 ...muxml2xmlout-pseries-cpu-compat.xml => pseries-cpu-compat.xml} | 0
 ...qemuxml2xmlout-pseries-cpu-exact.xml => pseries-cpu-exact.xml} | 0
 ...muxml2xmlout-pseries-hostdevs-1.xml => pseries-hostdevs-1.xml} | 0
 ...muxml2xmlout-pseries-hostdevs-2.xml => pseries-hostdevs-2.xml} | 0
 ...muxml2xmlout-pseries-hostdevs-3.xml => pseries-hostdevs-3.xml} | 0
 ...l2xmlout-pseries-hpt-resizing.xml => pseries-hpt-resizing.xml} | 0
 ...l2xmlout-pseries-many-buses-1.xml => pseries-many-buses-1.xml} | 0
 ...l2xmlout-pseries-many-buses-2.xml => pseries-many-buses-2.xml} | 0
 ...l2xmlout-pseries-many-devices.xml => pseries-many-devices.xml} | 0
 .../{qemuxml2xmlout-pseries-nvram.xml => pseries-nvram.xml}       | 0
 ...xmlout-pseries-panic-missing.xml => pseries-panic-missing.xml} | 0
 ...-pseries-panic-no-address.xml => pseries-panic-no-address.xml} | 0
 ...es-phb-default-missing.xml => pseries-phb-default-missing.xml} | 0
 ...xmlout-pseries-phb-numa-node.xml => pseries-phb-numa-node.xml} | 0
 ...muxml2xmlout-pseries-phb-simple.xml => pseries-phb-simple.xml} | 0
 tests/qemuxml2xmloutdata/pseries-serial+console-native.xml        | 1 +
 tests/qemuxml2xmloutdata/pseries-serial-compat.xml                | 1 +
 ...xmlout-pseries-serial-native.xml => pseries-serial-native.xml} | 0
 ...muxml2xmlout-pseries-serial-pci.xml => pseries-serial-pci.xml} | 0
 ...muxml2xmlout-pseries-serial-usb.xml => pseries-serial-usb.xml} | 0
 ...l2xmlout-pv-spinlock-disabled.xml => pv-spinlock-disabled.xml} | 0
 ...xml2xmlout-pv-spinlock-enabled.xml => pv-spinlock-enabled.xml} | 0
 ...-q35-default-devices-only.xml => q35-default-devices-only.xml} | 0
 ...qemuxml2xmlout-q35-multifunction.xml => q35-multifunction.xml} | 0
 ...xmlout-q35-pci-force-address.xml => q35-pci-force-address.xml} | 0
 .../{qemuxml2xmlout-q35-pcie-autoadd.xml => q35-pcie-autoadd.xml} | 0
 .../{qemuxml2xmlout-q35-pcie.xml => q35-pcie.xml}                 | 0
 .../{qemuxml2xmlout-q35-usb2-multi.xml => q35-usb2-multi.xml}     | 0
 .../{qemuxml2xmlout-q35-usb2-reorder.xml => q35-usb2-reorder.xml} | 0
 .../{qemuxml2xmlout-q35-usb2.xml => q35-usb2.xml}                 | 0
 ...lout-q35-virt-manager-basic.xml => q35-virt-manager-basic.xml} | 0
 .../{qemuxml2xmlout-q35-virtio-pci.xml => q35-virtio-pci.xml}     | 0
 tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35.xml => q35.xml}      | 0
 .../{qemuxml2xmlout-qemu-ns-no-env.xml => qemu-ns-no-env.xml}     | 0
 .../qemuxml2xmlout-mach-virt-console-native.xml                   | 1 -
 .../qemuxml2xmlout-mach-virt-serial+console-native.xml            | 1 -
 .../qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-native.xml | 1 -
 .../qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-native.xml  | 1 -
 .../qemuxml2xmlout-pseries-serial+console-native.xml              | 1 -
 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-compat.xml | 1 -
 ...ut-reboot-timeout-disabled.xml => reboot-timeout-disabled.xml} | 0
 ...lout-reboot-timeout-enabled.xml => reboot-timeout-enabled.xml} | 0
 .../{qemuxml2xmlout-restore-v2.xml => restore-v2.xml}             | 0
 ...xml2xmlout-s390-defaultconsole.xml => s390-defaultconsole.xml} | 0
 ...muxml2xmlout-s390-panic-missing.xml => s390-panic-missing.xml} | 0
 ...xmlout-s390-panic-no-address.xml => s390-panic-no-address.xml} | 0
 .../{qemuxml2xmlout-s390-panic.xml => s390-panic.xml}             | 0
 .../{qemuxml2xmlout-s390-serial-2.xml => s390-serial-2.xml}       | 0
 ...xml2xmlout-s390-serial-console.xml => s390-serial-console.xml} | 0
 .../{qemuxml2xmlout-s390-serial.xml => s390-serial.xml}           | 0
 ...qemuxml2xmlout-seclabel-dac-none.xml => seclabel-dac-none.xml} | 0
 ...-seclabel-device-multiple.xml => seclabel-device-multiple.xml} | 0
 ...label-dynamic-baselabel.xml => seclabel-dynamic-baselabel.xml} | 0
 ...label-dynamic-labelskip.xml => seclabel-dynamic-labelskip.xml} | 0
 ...dynamic-none-relabel.xml => seclabel-dynamic-none-relabel.xml} | 0
 ...xmlout-seclabel-dynamic-none.xml => seclabel-dynamic-none.xml} | 0
 ...eclabel-dynamic-override.xml => seclabel-dynamic-override.xml} | 0
 ...-seclabel-dynamic-relabel.xml => seclabel-dynamic-relabel.xml} | 0
 .../{qemuxml2xmlout-seclabel-none.xml => seclabel-none.xml}       | 0
 ...eclabel-static-labelskip.xml => seclabel-static-labelskip.xml} | 0
 .../{qemuxml2xmlout-seclabel-static.xml => seclabel-static.xml}   | 0
 .../{qemuxml2xmlout-serial-dev.xml => serial-dev.xml}             | 0
 .../{qemuxml2xmlout-serial-file.xml => serial-file.xml}           | 0
 .../{qemuxml2xmlout-serial-many.xml => serial-many.xml}           | 0
 .../{qemuxml2xmlout-serial-pty.xml => serial-pty.xml}             | 0
 ...-serial-spiceport-nospice.xml => serial-spiceport-nospice.xml} | 0
 .../{qemuxml2xmlout-serial-spiceport.xml => serial-spiceport.xml} | 0
 ...ut-serial-target-port-auto.xml => serial-target-port-auto.xml} | 0
 ...qemuxml2xmlout-serial-tcp-telnet.xml => serial-tcp-telnet.xml} | 0
 ...509-chardev-notls.xml => serial-tcp-tlsx509-chardev-notls.xml} | 0
 ...ial-tcp-tlsx509-chardev.xml => serial-tcp-tlsx509-chardev.xml} | 0
 .../{qemuxml2xmlout-serial-tcp.xml => serial-tcp.xml}             | 0
 .../{qemuxml2xmlout-serial-udp.xml => serial-udp.xml}             | 0
 .../{qemuxml2xmlout-serial-unix.xml => serial-unix.xml}           | 0
 .../{qemuxml2xmlout-serial-vc.xml => serial-vc.xml}               | 0
 ...l2xmlout-shmem-plain-doorbell.xml => shmem-plain-doorbell.xml} | 0
 tests/qemuxml2xmloutdata/{qemuxml2xmlout-shmem.xml => shmem.xml}  | 0
 ...l2xmlout-smartcard-controller.xml => smartcard-controller.xml} | 0
 ...card-host-certificates.xml => smartcard-host-certificates.xml} | 0
 .../{qemuxml2xmlout-smartcard-host.xml => smartcard-host.xml}     | 0
 ...assthrough-spicevmc.xml => smartcard-passthrough-spicevmc.xml} | 0
 ...martcard-passthrough-tcp.xml => smartcard-passthrough-tcp.xml} | 0
 ...xmlout-smbios-multiple-type2.xml => smbios-multiple-type2.xml} | 0
 .../qemuxml2xmloutdata/{qemuxml2xmlout-smbios.xml => smbios.xml}  | 0
 tests/qemuxml2xmloutdata/{qemuxml2xmlout-smp.xml => smp.xml}      | 0
 .../{qemuxml2xmlout-sound-device.xml => sound-device.xml}         | 0
 tests/qemuxml2xmloutdata/{qemuxml2xmlout-sound.xml => sound.xml}  | 0
 ...xml2xmlout-tap-vhost-incorrect.xml => tap-vhost-incorrect.xml} | 0
 .../{qemuxml2xmlout-tap-vhost.xml => tap-vhost.xml}               | 0
 .../{qemuxml2xmlout-tpm-passthrough.xml => tpm-passthrough.xml}   | 0
 ...-controller-default-q35.xml => usb-controller-default-q35.xml} | 0
 ...ontroller-explicit-q35.xml => usb-controller-explicit-q35.xml} | 0
 .../{qemuxml2xmlout-usb-controller.xml => usb-controller.xml}     | 0
 ...muxml2xmlout-usb-ich9-ehci-addr.xml => usb-ich9-ehci-addr.xml} | 0
 .../{qemuxml2xmlout-usb-none.xml => usb-none.xml}                 | 0
 ...l2xmlout-usb-piix3-controller.xml => usb-piix3-controller.xml} | 0
 .../{qemuxml2xmlout-usb-port-missing.xml => usb-port-missing.xml} | 0
 ...-usb-redir-filter-version.xml => usb-redir-filter-version.xml} | 0
 .../{qemuxml2xmlout-usb-redir-filter.xml => usb-redir-filter.xml} | 0
 .../{qemuxml2xmlout-usb-redir.xml => usb-redir.xml}               | 0
 .../{qemuxml2xmlout-user-aliases.xml => user-aliases.xml}         | 0
 ...xmlout-vcpu-placement-static.xml => vcpu-placement-static.xml} | 0
 .../{qemuxml2xmlout-vhost_queues.xml => vhost_queues.xml}         | 0
 ...evice-pciaddr-default.xml => video-device-pciaddr-default.xml} | 0
 .../{qemuxml2xmlout-video-qxl-heads.xml => video-qxl-heads.xml}   | 0
 ...qemuxml2xmlout-video-qxl-noheads.xml => video-qxl-noheads.xml} | 0
 ...ut-video-virtio-gpu-device.xml => video-virtio-gpu-device.xml} | 0
 ...eo-virtio-gpu-secondary.xml => video-virtio-gpu-secondary.xml} | 0
 ...ideo-virtio-gpu-spice-gl.xml => video-virtio-gpu-spice-gl.xml} | 0
 ...lout-video-virtio-gpu-virgl.xml => video-virtio-gpu-virgl.xml} | 0
 ...-virtio-input-passthrough.xml => virtio-input-passthrough.xml} | 0
 .../{qemuxml2xmlout-virtio-input.xml => virtio-input.xml}         | 0
 .../{qemuxml2xmlout-virtio-lun.xml => virtio-lun.xml}             | 0
 .../{qemuxml2xmlout-virtio-options.xml => virtio-options.xml}     | 0
 .../{qemuxml2xmlout-virtio-rng-egd.xml => virtio-rng-egd.xml}     | 0
 ...qemuxml2xmlout-virtio-rng-random.xml => virtio-rng-random.xml} | 0
 .../{qemuxml2xmlout-vmcoreinfo.xml => vmcoreinfo.xml}             | 0
 .../{qemuxml2xmlout-watchdog.xml => watchdog.xml}                 | 0
 436 files changed, 10 insertions(+), 10 deletions(-)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml => aarch64-aavmf-virtio-mmio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-gic-default.xml => aarch64-gic-default.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-gic-host.xml => aarch64-gic-host.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-gic-none-both.xml => aarch64-gic-none-both.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-gic-none-tcg.xml => aarch64-gic-none-tcg.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-gic-none-v2.xml => aarch64-gic-none-v2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-gic-none-v3.xml => aarch64-gic-none-v3.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-gic-none.xml => aarch64-gic-none.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-gic-v2.xml => aarch64-gic-v2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-gic-v3.xml => aarch64-gic-v3.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-pci-serial.xml => aarch64-pci-serial.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-video-default.xml => aarch64-video-default.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-video-virtio-gpu-pci.xml => aarch64-video-virtio-gpu-pci.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-virtio-pci-default.xml => aarch64-virtio-pci-default.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-virtio-pci-manual-addresses.xml => aarch64-virtio-pci-manual-addresses.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-acpi-table.xml => acpi-table.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-autoindex.xml => autoindex.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-balloon-device-auto.xml => balloon-device-auto.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-balloon-device-period.xml => balloon-device-period.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-bios-nvram-os-interleave.xml => bios-nvram-os-interleave.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-bios-nvram.xml => bios-nvram.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-blkdeviotune-group-num.xml => blkdeviotune-group-num.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-blkdeviotune-max-length.xml => blkdeviotune-max-length.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-blkdeviotune-max.xml => blkdeviotune-max.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-blkdeviotune.xml => blkdeviotune.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-blkiotune-device.xml => blkiotune-device.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-blkiotune.xml => blkiotune.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-boot-cdrom.xml => boot-cdrom.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-boot-floppy-q35.xml => boot-floppy-q35.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-boot-floppy.xml => boot-floppy.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-boot-menu-disable-with-timeout.xml => boot-menu-disable-with-timeout.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-boot-menu-disable.xml => boot-menu-disable.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-boot-menu-enable-with-timeout.xml => boot-menu-enable-with-timeout.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-boot-multi.xml => boot-multi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-boot-network.xml => boot-network.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-boot-order.xml => boot-order.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-bootindex-floppy-q35.xml => bootindex-floppy-q35.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-channel-guestfwd.xml => channel-guestfwd.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-channel-unix-source-path.xml => channel-unix-source-path.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-channel-virtio-auto.xml => channel-virtio-auto.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-channel-virtio-state-active.xml => channel-virtio-state-active.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-channel-virtio-state-inactive.xml => channel-virtio-state-inactive.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-channel-virtio.xml => channel-virtio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-chardev-label.xml => chardev-label.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-clock-catchup.xml => clock-catchup.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-clock-localtime.xml => clock-localtime.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-clock-timer-hyperv-rtc.xml => clock-timer-hyperv-rtc.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-clock-utc.xml => clock-utc.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-console-compat-auto.xml => console-compat-auto.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-console-compat.xml => console-compat.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-console-compat2.xml => console-compat2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-console-virtio-many.xml => console-virtio-many.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-console-virtio.xml => console-virtio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-controller-usb-order.xml => controller-usb-order.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-check-default-none.xml => cpu-check-default-none.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-check-default-none2.xml => cpu-check-default-none2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-check-default-partial.xml => cpu-check-default-partial.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-check-default-partial2.xml => cpu-check-default-partial2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-check-full.xml => cpu-check-full.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-check-none.xml => cpu-check-none.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-check-partial.xml => cpu-check-partial.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-empty.xml => cpu-empty.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-eoi-disabled.xml => cpu-eoi-disabled.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-eoi-enabled.xml => cpu-eoi-enabled.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-host-kvmclock.xml => cpu-host-kvmclock.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-host-model-features.xml => cpu-host-model-features.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-host-passthrough-features.xml => cpu-host-passthrough-features.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-kvmclock.xml => cpu-kvmclock.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-numa-disjoint.xml => cpu-numa-disjoint.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-numa-disordered.xml => cpu-numa-disordered.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-numa-memshared.xml => cpu-numa-memshared.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-numa-no-memory-element.xml => cpu-numa-no-memory-element.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-numa1.xml => cpu-numa1.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cpu-numa2.xml => cpu-numa2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cputune-iothreads.xml => cputune-iothreads.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cputune-iothreadsched-zeropriority.xml => cputune-iothreadsched-zeropriority.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cputune-iothreadsched.xml => cputune-iothreadsched.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cputune-numatune.xml => cputune-numatune.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cputune-zero-shares.xml => cputune-zero-shares.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-cputune.xml => cputune.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-default-kvm-host-arch.xml => default-kvm-host-arch.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-default-qemu-host-arch.xml => default-qemu-host-arch.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-active-commit.xml => disk-active-commit.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-aio.xml => disk-aio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-backing-chains-active.xml => disk-backing-chains-active.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-backing-chains-inactive.xml => disk-backing-chains-inactive.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-cdrom-empty.xml => disk-cdrom-empty.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-cdrom.xml => disk-cdrom.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-copy_on_read.xml => disk-copy_on_read.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-boot-cdrom.xml => disk-drive-boot-cdrom.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-boot-disk.xml => disk-drive-boot-disk.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-cache-directsync.xml => disk-drive-cache-directsync.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-cache-unsafe.xml => disk-drive-cache-unsafe.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-cache-v2-none.xml => disk-drive-cache-v2-none.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-cache-v2-wb.xml => disk-drive-cache-v2-wb.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-cache-v2-wt.xml => disk-drive-cache-v2-wt.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-copy-on-read.xml => disk-drive-copy-on-read.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-detect-zeroes.xml => disk-drive-detect-zeroes.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-discard.xml => disk-drive-discard.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-error-policy-enospace.xml => disk-drive-error-policy-enospace.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-error-policy-stop.xml => disk-drive-error-policy-stop.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-error-policy-wreport-rignore.xml => disk-drive-error-policy-wreport-rignore.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-fat.xml => disk-drive-fat.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-fmt-qcow.xml => disk-drive-fmt-qcow.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-gluster.xml => disk-drive-network-gluster.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-iscsi-auth.xml => disk-drive-network-iscsi-auth.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-iscsi.xml => disk-drive-network-iscsi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-nbd-export.xml => disk-drive-network-nbd-export.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-nbd-ipv6-export.xml => disk-drive-network-nbd-ipv6-export.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-nbd-ipv6.xml => disk-drive-network-nbd-ipv6.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-nbd-unix.xml => disk-drive-network-nbd-unix.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-nbd.xml => disk-drive-network-nbd.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-rbd-auth.xml => disk-drive-network-rbd-auth.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-rbd-ceph-env.xml => disk-drive-network-rbd-ceph-env.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-rbd-ipv6.xml => disk-drive-network-rbd-ipv6.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-rbd.xml => disk-drive-network-rbd.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-sheepdog.xml => disk-drive-network-sheepdog.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-source-auth.xml => disk-drive-network-source-auth.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-tlsx509-vxhs.xml => disk-drive-network-tlsx509-vxhs.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-drive-network-vxhs.xml => disk-drive-network-vxhs.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-floppy.xml => disk-floppy.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-many.xml => disk-many.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-mirror-active.xml => disk-mirror-active.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-mirror-inactive.xml => disk-mirror-inactive.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-mirror-old-inactive.xml => disk-mirror-old-inactive.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-mirror-old.xml => disk-mirror-old.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-scsi-device-auto.xml => disk-scsi-device-auto.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-scsi-device.xml => disk-scsi-device.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-scsi-disk-vpd.xml => disk-scsi-disk-vpd.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-scsi-lun-passthrough-sgio.xml => disk-scsi-lun-passthrough-sgio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-scsi-megasas.xml => disk-scsi-megasas.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-scsi-mptsas1068.xml => disk-scsi-mptsas1068.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-scsi-virtio-scsi.xml => disk-scsi-virtio-scsi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-scsi-vscsi.xml => disk-scsi-vscsi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-serial.xml => disk-serial.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-source-pool-mode.xml => disk-source-pool-mode.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-source-pool.xml => disk-source-pool.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-usb-device.xml => disk-usb-device.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-virtio-drive-queues.xml => disk-virtio-drive-queues.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-virtio-scsi-cmd_per_lun.xml => disk-virtio-scsi-cmd_per_lun.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-virtio-scsi-ioeventfd.xml => disk-virtio-scsi-ioeventfd.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-virtio-scsi-max_sectors.xml => disk-virtio-scsi-max_sectors.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-virtio-scsi-num_queues.xml => disk-virtio-scsi-num_queues.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-virtio.xml => disk-virtio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-encrypted-disk-usage.xml => encrypted-disk-usage.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-encrypted-disk.xml => encrypted-disk.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-eoi-disabled.xml => eoi-disabled.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-eoi-enabled.xml => eoi-enabled.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-event_idx.xml => event_idx.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-floppy-drive-fat.xml => floppy-drive-fat.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-listen-network.xml => graphics-listen-network.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-listen-network2.xml => graphics-listen-network2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-sdl-fullscreen.xml => graphics-sdl-fullscreen.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-sdl.xml => graphics-sdl.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-spice-auto-socket-cfg.xml => graphics-spice-auto-socket-cfg.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-spice-auto-socket.xml => graphics-spice-auto-socket.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-spice-compression.xml => graphics-spice-compression.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-spice-qxl-vga.xml => graphics-spice-qxl-vga.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-spice-socket.xml => graphics-spice-socket.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-spice-timeout.xml => graphics-spice-timeout.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-spice.xml => graphics-spice.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc-auto-socket-cfg.xml => graphics-vnc-auto-socket-cfg.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc-auto-socket.xml => graphics-vnc-auto-socket.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc-no-listen-attr.xml => graphics-vnc-no-listen-attr.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc-remove-generated-socket-active.xml => graphics-vnc-remove-generated-socket-active.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc-remove-generated-socket-inactive.xml => graphics-vnc-remove-generated-socket-inactive.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc-sasl.xml => graphics-vnc-sasl.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc-socket.xml => graphics-vnc-socket.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc-tls.xml => graphics-vnc-tls.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc-websocket.xml => graphics-vnc-websocket.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-graphics-vnc.xml => graphics-vnc.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-mdev-precreated.xml => hostdev-mdev-precreated.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-pci-address.xml => hostdev-pci-address.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-autogen-address.xml => hostdev-scsi-autogen-address.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-large-unit.xml => hostdev-scsi-large-unit.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml => hostdev-scsi-lsi-iscsi-auth.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-lsi-iscsi.xml => hostdev-scsi-lsi-iscsi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-lsi.xml => hostdev-scsi-lsi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-rawio.xml => hostdev-scsi-rawio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-readonly.xml => hostdev-scsi-readonly.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-sgio.xml => hostdev-scsi-sgio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-shareable.xml => hostdev-scsi-shareable.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-vhost-scsi-ccw.xml => hostdev-scsi-vhost-scsi-ccw.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-vhost-scsi-pci.xml => hostdev-scsi-vhost-scsi-pci.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml => hostdev-scsi-virtio-iscsi-auth.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-virtio-iscsi.xml => hostdev-scsi-virtio-iscsi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-scsi-virtio-scsi.xml => hostdev-scsi-virtio-scsi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-usb-address.xml => hostdev-usb-address.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hostdev-vfio.xml => hostdev-vfio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-memaccess.xml => hugepages-memaccess.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-memaccess2.xml => hugepages-memaccess2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-pages.xml => hugepages-pages.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-pages2.xml => hugepages-pages2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-pages3.xml => hugepages-pages3.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-pages4.xml => hugepages-pages4.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-pages5.xml => hugepages-pages5.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-pages6.xml => hugepages-pages6.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-pages7.xml => hugepages-pages7.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages-shared.xml => hugepages-shared.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hugepages.xml => hugepages.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hyperv-off.xml => hyperv-off.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hyperv-panic.xml => hyperv-panic.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-hyperv.xml => hyperv.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-input-usbmouse.xml => input-usbmouse.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-input-usbtablet.xml => input-usbtablet.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-intel-iommu-caching-mode.xml => intel-iommu-caching-mode.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-intel-iommu-device-iotlb.xml => intel-iommu-device-iotlb.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-intel-iommu-eim.xml => intel-iommu-eim.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-intel-iommu-machine.xml => intel-iommu-machine.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-intel-iommu.xml => intel-iommu.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-interface-driver.xml => interface-driver.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-interface-server.xml => interface-server.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-iothreads-disk-virtio-ccw.xml => iothreads-disk-virtio-ccw.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-iothreads-disk.xml => iothreads-disk.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-iothreads-ids-partial.xml => iothreads-ids-partial.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-iothreads-ids.xml => iothreads-ids.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-iothreads-virtio-scsi-ccw.xml => iothreads-virtio-scsi-ccw.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-iothreads-virtio-scsi-pci.xml => iothreads-virtio-scsi-pci.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-iothreads.xml => iothreads.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-kvm-features-off.xml => kvm-features-off.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-kvm-features.xml => kvm-features.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-kvmclock.xml => kvmclock.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-lease.xml => lease.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-luks-disks-source.xml => luks-disks-source.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-luks-disks.xml => luks-disks.xml} (100%)
 create mode 120000 tests/qemuxml2xmloutdata/mach-virt-console-native.xml
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-mach-virt-console-virtio.xml => mach-virt-console-virtio.xml} (100%)
 create mode 120000 tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-mach-virt-serial-compat.xml => mach-virt-serial-compat.xml} (100%)
 create mode 120000 tests/qemuxml2xmloutdata/mach-virt-serial-native.xml
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-mach-virt-serial-pci.xml => mach-virt-serial-pci.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-mach-virt-serial-usb.xml => mach-virt-serial-usb.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-machine-core-off.xml => machine-core-off.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-machine-core-on.xml => machine-core-on.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-machine-loadparm-multiple-disks-nets-s390.xml => machine-loadparm-multiple-disks-nets-s390.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memory-hotplug-dimm.xml => memory-hotplug-dimm.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memory-hotplug-nonuma.xml => memory-hotplug-nonuma.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memory-hotplug-nvdimm-access.xml => memory-hotplug-nvdimm-access.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memory-hotplug-nvdimm-label.xml => memory-hotplug-nvdimm-label.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memory-hotplug-nvdimm.xml => memory-hotplug-nvdimm.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memory-hotplug.xml => memory-hotplug.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memorybacking-set.xml => memorybacking-set.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memorybacking-unset.xml => memorybacking-unset.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memtune-unlimited.xml => memtune-unlimited.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-memtune.xml => memtune.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-metadata-duplicate.xml => metadata-duplicate.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-metadata.xml => metadata.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-migrate.xml => migrate.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-minimal.xml => minimal.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-misc-acpi.xml => misc-acpi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-misc-disable-s3.xml => misc-disable-s3.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-misc-disable-suspends.xml => misc-disable-suspends.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-misc-enable-s4.xml => misc-enable-s4.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-misc-no-reboot.xml => misc-no-reboot.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-misc-uuid.xml => misc-uuid.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-bandwidth.xml => net-bandwidth.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-bandwidth2.xml => net-bandwidth2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-coalesce.xml => net-coalesce.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-eth-hostip.xml => net-eth-hostip.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-eth-ifname.xml => net-eth-ifname.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-eth.xml => net-eth.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-hostdev-vfio.xml => net-hostdev-vfio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-hostdev.xml => net-hostdev.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-midonet.xml => net-midonet.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-mtu.xml => net-mtu.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-openvswitch.xml => net-openvswitch.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-udp.xml => net-udp.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-user-addr.xml => net-user-addr.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-user.xml => net-user.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-vhostuser.xml => net-vhostuser.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-virtio-device.xml => net-virtio-device.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-virtio-disable-offloads.xml => net-virtio-disable-offloads.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-virtio-network-portgroup.xml => net-virtio-network-portgroup.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-virtio-rxtxqueuesize.xml => net-virtio-rxtxqueuesize.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-virtio.xml => net-virtio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-nographics-vga.xml => nographics-vga.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-nosharepages.xml => nosharepages.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-numad-auto-memory-vcpu-cpuset.xml => numad-auto-memory-vcpu-cpuset.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-numad-auto-memory-vcpu-no-cpuset-and-placement.xml => numad-auto-memory-vcpu-no-cpuset-and-placement.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-numad-auto-vcpu-no-numatune.xml => numad-auto-vcpu-no-numatune.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-numad-static-vcpu-no-numatune.xml => numad-static-vcpu-no-numatune.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-numatune-auto-prefer.xml => numatune-auto-prefer.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-numatune-memnode-no-memory.xml => numatune-memnode-no-memory.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-numatune-memnode.xml => numatune-memnode.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-panic-double.xml => panic-double.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-panic-isa.xml => panic-isa.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-panic-no-address.xml => panic-no-address.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-panic-pseries.xml => panic-pseries.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-panic.xml => panic.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-parallel-tcp.xml => parallel-tcp.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pci-autoadd-addr.xml => pci-autoadd-addr.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pci-autoadd-idx.xml => pci-autoadd-idx.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pci-autofill-addr.xml => pci-autofill-addr.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pci-bridge-many-disks.xml => pci-bridge-many-disks.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pci-bridge.xml => pci-bridge.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pci-expander-bus.xml => pci-expander-bus.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pci-many.xml => pci-many.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pci-rom.xml => pci-rom.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pci-serial-dev-chardev.xml => pci-serial-dev-chardev.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcie-expander-bus.xml => pcie-expander-bus.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcie-root-port-model-generic.xml => pcie-root-port-model-generic.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcie-root-port-model-ioh3420.xml => pcie-root-port-model-ioh3420.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcie-root-port.xml => pcie-root-port.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcie-root.xml => pcie-root.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcie-switch-downstream-port.xml => pcie-switch-downstream-port.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcie-switch-upstream-port.xml => pcie-switch-upstream-port.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcihole64-gib.xml => pcihole64-gib.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcihole64-none.xml => pcihole64-none.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcihole64-q35.xml => pcihole64-q35.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pcihole64.xml => pcihole64.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pmu-feature-off.xml => pmu-feature-off.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pmu-feature.xml => pmu-feature.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-ppc64-usb-controller-legacy.xml => ppc64-usb-controller-legacy.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-ppc64-usb-controller.xml => ppc64-usb-controller.xml} (100%)
 create mode 120000 tests/qemuxml2xmloutdata/pseries-console-native.xml
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-console-virtio.xml => pseries-console-virtio.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-cpu-compat-power9.xml => pseries-cpu-compat-power9.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-cpu-compat.xml => pseries-cpu-compat.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-cpu-exact.xml => pseries-cpu-exact.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-hostdevs-1.xml => pseries-hostdevs-1.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-hostdevs-2.xml => pseries-hostdevs-2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-hostdevs-3.xml => pseries-hostdevs-3.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-hpt-resizing.xml => pseries-hpt-resizing.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-many-buses-1.xml => pseries-many-buses-1.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-many-buses-2.xml => pseries-many-buses-2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-many-devices.xml => pseries-many-devices.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-nvram.xml => pseries-nvram.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-panic-missing.xml => pseries-panic-missing.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-panic-no-address.xml => pseries-panic-no-address.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-phb-default-missing.xml => pseries-phb-default-missing.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-phb-numa-node.xml => pseries-phb-numa-node.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-phb-simple.xml => pseries-phb-simple.xml} (100%)
 create mode 120000 tests/qemuxml2xmloutdata/pseries-serial+console-native.xml
 create mode 120000 tests/qemuxml2xmloutdata/pseries-serial-compat.xml
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-serial-native.xml => pseries-serial-native.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-serial-pci.xml => pseries-serial-pci.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-serial-usb.xml => pseries-serial-usb.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pv-spinlock-disabled.xml => pv-spinlock-disabled.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-pv-spinlock-enabled.xml => pv-spinlock-enabled.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-default-devices-only.xml => q35-default-devices-only.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-multifunction.xml => q35-multifunction.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-pci-force-address.xml => q35-pci-force-address.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-pcie-autoadd.xml => q35-pcie-autoadd.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-pcie.xml => q35-pcie.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-usb2-multi.xml => q35-usb2-multi.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-usb2-reorder.xml => q35-usb2-reorder.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-usb2.xml => q35-usb2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-virt-manager-basic.xml => q35-virt-manager-basic.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35-virtio-pci.xml => q35-virtio-pci.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-q35.xml => q35.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-qemu-ns-no-env.xml => qemu-ns-no-env.xml} (100%)
 delete mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-native.xml
 delete mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial+console-native.xml
 delete mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-native.xml
 delete mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-native.xml
 delete mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial+console-native.xml
 delete mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-compat.xml
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-reboot-timeout-disabled.xml => reboot-timeout-disabled.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-reboot-timeout-enabled.xml => reboot-timeout-enabled.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-restore-v2.xml => restore-v2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-defaultconsole.xml => s390-defaultconsole.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-panic-missing.xml => s390-panic-missing.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-panic-no-address.xml => s390-panic-no-address.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-panic.xml => s390-panic.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-serial-2.xml => s390-serial-2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-serial-console.xml => s390-serial-console.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-serial.xml => s390-serial.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-dac-none.xml => seclabel-dac-none.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-device-multiple.xml => seclabel-device-multiple.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-dynamic-baselabel.xml => seclabel-dynamic-baselabel.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-dynamic-labelskip.xml => seclabel-dynamic-labelskip.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-dynamic-none-relabel.xml => seclabel-dynamic-none-relabel.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-dynamic-none.xml => seclabel-dynamic-none.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-dynamic-override.xml => seclabel-dynamic-override.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-dynamic-relabel.xml => seclabel-dynamic-relabel.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-none.xml => seclabel-none.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-static-labelskip.xml => seclabel-static-labelskip.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-seclabel-static.xml => seclabel-static.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-dev.xml => serial-dev.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-file.xml => serial-file.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-many.xml => serial-many.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-pty.xml => serial-pty.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-spiceport-nospice.xml => serial-spiceport-nospice.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-spiceport.xml => serial-spiceport.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-target-port-auto.xml => serial-target-port-auto.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-tcp-telnet.xml => serial-tcp-telnet.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-tcp-tlsx509-chardev-notls.xml => serial-tcp-tlsx509-chardev-notls.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml => serial-tcp-tlsx509-chardev.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-tcp.xml => serial-tcp.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-udp.xml => serial-udp.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-unix.xml => serial-unix.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-serial-vc.xml => serial-vc.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-shmem-plain-doorbell.xml => shmem-plain-doorbell.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-shmem.xml => shmem.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-smartcard-controller.xml => smartcard-controller.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-smartcard-host-certificates.xml => smartcard-host-certificates.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-smartcard-host.xml => smartcard-host.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-smartcard-passthrough-spicevmc.xml => smartcard-passthrough-spicevmc.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-smartcard-passthrough-tcp.xml => smartcard-passthrough-tcp.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-smbios-multiple-type2.xml => smbios-multiple-type2.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-smbios.xml => smbios.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-smp.xml => smp.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-sound-device.xml => sound-device.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-sound.xml => sound.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-tap-vhost-incorrect.xml => tap-vhost-incorrect.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-tap-vhost.xml => tap-vhost.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-tpm-passthrough.xml => tpm-passthrough.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-controller-default-q35.xml => usb-controller-default-q35.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-controller-explicit-q35.xml => usb-controller-explicit-q35.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-controller.xml => usb-controller.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-ich9-ehci-addr.xml => usb-ich9-ehci-addr.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-none.xml => usb-none.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-piix3-controller.xml => usb-piix3-controller.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-port-missing.xml => usb-port-missing.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-redir-filter-version.xml => usb-redir-filter-version.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-redir-filter.xml => usb-redir-filter.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-usb-redir.xml => usb-redir.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-user-aliases.xml => user-aliases.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-vcpu-placement-static.xml => vcpu-placement-static.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-vhost_queues.xml => vhost_queues.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-video-device-pciaddr-default.xml => video-device-pciaddr-default.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-video-qxl-heads.xml => video-qxl-heads.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-video-qxl-noheads.xml => video-qxl-noheads.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-video-virtio-gpu-device.xml => video-virtio-gpu-device.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-video-virtio-gpu-secondary.xml => video-virtio-gpu-secondary.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-video-virtio-gpu-spice-gl.xml => video-virtio-gpu-spice-gl.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-video-virtio-gpu-virgl.xml => video-virtio-gpu-virgl.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-virtio-input-passthrough.xml => virtio-input-passthrough.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-virtio-input.xml => virtio-input.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-virtio-lun.xml => virtio-lun.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-virtio-options.xml => virtio-options.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-virtio-rng-egd.xml => virtio-rng-egd.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-virtio-rng-random.xml => virtio-rng-random.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-vmcoreinfo.xml => vmcoreinfo.xml} (100%)
 rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-watchdog.xml => watchdog.xml} (100%)

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index a930adf64..2be8eb2c1 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -312,7 +312,7 @@ testInfoSet(struct testInfo *info,
 
     if (when & WHEN_INACTIVE) {
         if (virAsprintf(&info->outInactiveName,
-                        "%s/qemuxml2xmloutdata/qemuxml2xmlout-%s-inactive.xml",
+                        "%s/qemuxml2xmloutdata/%s-inactive.xml",
                         abs_srcdir, name) < 0)
             goto error;
 
@@ -320,7 +320,7 @@ testInfoSet(struct testInfo *info,
             VIR_FREE(info->outInactiveName);
 
             if (virAsprintf(&info->outInactiveName,
-                            "%s/qemuxml2xmloutdata/qemuxml2xmlout-%s.xml",
+                            "%s/qemuxml2xmloutdata/%s.xml",
                             abs_srcdir, name) < 0)
                 goto error;
         }
@@ -328,7 +328,7 @@ testInfoSet(struct testInfo *info,
 
     if (when & WHEN_ACTIVE) {
         if (virAsprintf(&info->outActiveName,
-                        "%s/qemuxml2xmloutdata/qemuxml2xmlout-%s-active.xml",
+                        "%s/qemuxml2xmloutdata/%s-active.xml",
                         abs_srcdir, name) < 0)
             goto error;
 
@@ -336,7 +336,7 @@ testInfoSet(struct testInfo *info,
             VIR_FREE(info->outActiveName);
 
             if (virAsprintf(&info->outActiveName,
-                            "%s/qemuxml2xmloutdata/qemuxml2xmlout-%s.xml",
+                            "%s/qemuxml2xmloutdata/%s.xml",
                             abs_srcdir, name) < 0)
                 goto error;
         }
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml b/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml
rename to tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml
<snip/>
-- 
2.13.6




More information about the libvir-list mailing list