There's plenty symlinks in qemuxml2argvdata and qemuxml2xmlout directories pointing to other files in the same directory. It makes no sense to check those files twice, thus we can simply skip symlinks. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/virschematest.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/virschematest.c b/tests/virschematest.c index 1d122a9bc9..1e911cd68e 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -118,11 +118,15 @@ testSchemaDir(const char *schema, while ((rc = virDirRead(dir, &ent, dir_path)) > 0) { g_autofree char *xml_path = NULL; bool exception = false; + GStatBuf sb; if (!virStringHasSuffix(ent->d_name, ".xml")) continue; if (ent->d_name[0] == '.') continue; + if (g_lstat(ent->d_name, &sb) >= 0 && + S_ISLNK(sb.st_mode)) + continue; if (filter && !g_regex_match(filter, ent->d_name, 0, NULL)) continue; -- 2.43.0

Include also the output files in the validation of used files. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxmlconftest.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index c3acfb59d5..cb19e7b27d 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -633,6 +633,12 @@ testQemuConfXMLCommon(testQemuInfo *info, /* mark test case as used */ ignore_value(g_hash_table_remove(info->conf->existingTestCases, info->infile)); + if (info->outfile) + ignore_value(g_hash_table_remove(info->conf->existingTestCases, info->outfile)); + if (info->errfile) + ignore_value(g_hash_table_remove(info->conf->existingTestCases, info->errfile)); + if (info->out_xml_inactive) + ignore_value(g_hash_table_remove(info->conf->existingTestCases, info->out_xml_inactive)); if (testQemuInfoInitArgs((testQemuInfo *) info) < 0) goto cleanup; @@ -925,7 +931,7 @@ testConfXMLCheck(GHashTable *existingTestCases) if (ret == 0) fprintf(stderr, "\n"); - fprintf(stderr, "unused input file: %s\n", (const char *) items[i].key); + fprintf(stderr, "unused file: %s\n", (const char *) items[i].key); ret = -1; } @@ -949,7 +955,9 @@ testConfXMLEnumerate(GHashTable *existingTestCases) return -1; while ((rc = virDirRead(dir, &ent, abs_srcdir "/qemuxml2argvdata")) > 0) { - if (virStringHasSuffix(ent->d_name, ".xml")) { + if (virStringHasSuffix(ent->d_name, ".xml") || + virStringHasSuffix(ent->d_name, ".args") || + virStringHasSuffix(ent->d_name, ".err")) { g_hash_table_insert(existingTestCases, g_strdup_printf(abs_srcdir "/qemuxml2argvdata/%s", ent->d_name), NULL); -- 2.43.0

Unify the naming of the data directory with the test name. 'tests/qemuxml2argvdata' is for the time converted to a symlink to 'qemuxmlconfdata', to preserve the symlinks in 'tests/qemuxml2xmloutdata' Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemunbdkittest.c | 2 +- tests/qemusecuritytest.c | 4 ++-- tests/qemuxml2argvdata | 1 + tests/qemuxmlactivetest.c | 2 +- .../440fx-ide-address-conflict.x86_64-latest.err | 0 .../440fx-ide-address-conflict.xml | 0 .../440fx-wrong-root.x86_64-latest.err | 0 .../440fx-wrong-root.xml | 0 .../aarch64-cpu-passthrough.aarch64-latest.args | 0 .../aarch64-cpu-passthrough.xml | 0 ...ch64-default-cpu-kvm-virt-4.2.aarch64-latest.args | 0 .../aarch64-default-cpu-kvm-virt-4.2.xml | 0 ...ch64-default-cpu-tcg-virt-4.2.aarch64-latest.args | 0 .../aarch64-default-cpu-tcg-virt-4.2.xml | 0 .../aarch64-features-sve-disabled.aarch64-latest.err | 0 .../aarch64-features-sve-disabled.xml | 0 .../aarch64-features-sve.aarch64-latest.args | 0 .../aarch64-features-sve.xml | 0 .../aarch64-features-wrong.aarch64-latest.err | 0 .../aarch64-features-wrong.xml | 0 .../aarch64-gic-default-both.aarch64-latest.args | 0 .../aarch64-gic-default-both.xml | 0 .../aarch64-gic-default-v2.aarch64-latest.args | 0 .../aarch64-gic-default-v2.xml | 0 .../aarch64-gic-default-v3.aarch64-latest.args | 0 .../aarch64-gic-default-v3.xml | 0 .../aarch64-gic-default.aarch64-4.2.0.args | 0 .../aarch64-gic-default.aarch64-latest.args | 0 .../aarch64-gic-default.xml | 0 .../aarch64-gic-host.aarch64-latest.args | 0 .../aarch64-gic-host.xml | 0 .../aarch64-gic-invalid.aarch64-latest.err | 0 .../aarch64-gic-invalid.xml | 0 .../aarch64-gic-none-both.aarch64-latest.args | 0 .../aarch64-gic-none-both.xml | 0 .../aarch64-gic-none-tcg.aarch64-latest.args | 0 .../aarch64-gic-none-tcg.xml | 0 .../aarch64-gic-none-v2.aarch64-latest.args | 0 .../aarch64-gic-none-v2.xml | 0 .../aarch64-gic-none-v3.aarch64-latest.args | 0 .../aarch64-gic-none-v3.xml | 0 .../aarch64-gic-none.aarch64-4.2.0.args | 0 .../aarch64-gic-none.aarch64-latest.args | 0 .../aarch64-gic-none.xml | 0 .../aarch64-gic-not-arm.ppc64-latest.err | 0 .../aarch64-gic-not-arm.xml | 0 .../aarch64-gic-not-virt.aarch64-latest.err | 0 .../aarch64-gic-not-virt.xml | 0 .../aarch64-gic-v2.aarch64-latest.args | 0 .../aarch64-gic-v2.xml | 0 .../aarch64-gic-v3.aarch64-latest.args | 0 .../aarch64-gic-v3.xml | 0 .../aarch64-kvm-32-on-64.aarch64-latest.args | 0 .../aarch64-kvm-32-on-64.xml | 0 .../aarch64-pci-serial.aarch64-latest.args | 0 .../aarch64-pci-serial.xml | 0 .../aarch64-tpm-wrong-model.aarch64-latest.err | 0 .../aarch64-tpm-wrong-model.xml | 0 .../aarch64-tpm.aarch64-latest.args | 0 .../aarch64-tpm.xml | 0 .../aarch64-traditional-pci.aarch64-latest.args | 0 .../aarch64-traditional-pci.xml | 0 .../aarch64-usb-controller.aarch64-latest.args | 0 .../aarch64-usb-controller.xml | 0 .../aarch64-video-default.aarch64-latest.args | 0 .../aarch64-video-default.xml | 0 .../aarch64-video-virtio-gpu-pci.aarch64-latest.args | 0 .../aarch64-video-virtio-gpu-pci.xml | 0 .../aarch64-virt-default-nic.aarch64-latest.args | 0 .../aarch64-virt-default-nic.xml | 0 .../aarch64-virt-graphics.aarch64-latest.args | 0 .../aarch64-virt-graphics.xml | 0 .../aarch64-virt-headless-mmio.aarch64-latest.args | 0 .../aarch64-virt-headless-mmio.xml | 0 .../aarch64-virt-headless.aarch64-latest.args | 0 .../aarch64-virt-headless.xml | 0 .../aarch64-virt-virtio.aarch64-4.2.0.args | 0 .../aarch64-virt-virtio.aarch64-latest.args | 0 .../aarch64-virt-virtio.xml | 0 ...4-virtio-pci-manual-addresses.aarch64-latest.args | 0 .../aarch64-virtio-pci-manual-addresses.xml | 0 .../acpi-table.x86_64-latest.args | 0 .../acpi-table.xml | 0 .../arm-vexpressa9-basic.aarch64-latest.args | 0 .../arm-vexpressa9-basic.xml | 0 .../arm-vexpressa9-nodevs.aarch64-latest.args | 0 .../arm-vexpressa9-nodevs.xml | 0 .../arm-vexpressa9-virtio.aarch64-latest.args | 0 .../arm-vexpressa9-virtio.xml | 0 .../async-teardown.x86_64-latest.args | 0 .../async-teardown.xml | 0 .../audio-alsa-best.x86_64-latest.args | 0 .../audio-alsa-best.xml | 0 .../audio-alsa-full.x86_64-latest.args | 0 .../audio-alsa-full.xml | 0 .../audio-alsa-minimal.x86_64-latest.args | 0 .../audio-alsa-minimal.xml | 0 .../audio-coreaudio-best.x86_64-latest.args | 0 .../audio-coreaudio-best.xml | 0 .../audio-coreaudio-full.x86_64-latest.args | 0 .../audio-coreaudio-full.xml | 0 .../audio-coreaudio-minimal.x86_64-latest.args | 0 .../audio-coreaudio-minimal.xml | 0 .../audio-default-nographics.x86_64-latest.args | 0 .../audio-default-nographics.xml | 0 .../audio-default-sdl.x86_64-4.2.0.args | 0 .../audio-default-sdl.x86_64-latest.args | 0 .../audio-default-sdl.xml | 0 .../audio-default-spice.x86_64-4.2.0.args | 0 .../audio-default-spice.x86_64-latest.args | 0 .../audio-default-spice.xml | 0 .../audio-default-vnc.x86_64-4.2.0.args | 0 .../audio-default-vnc.x86_64-latest.args | 0 .../audio-default-vnc.xml | 0 .../audio-file-best.x86_64-latest.args | 0 .../audio-file-best.xml | 0 .../audio-file-full.x86_64-latest.args | 0 .../audio-file-full.xml | 0 .../audio-file-minimal.x86_64-latest.args | 0 .../audio-file-minimal.xml | 0 .../audio-jack-full.x86_64-latest.args | 0 .../audio-jack-full.xml | 0 .../audio-jack-minimal.x86_64-latest.args | 0 .../audio-jack-minimal.xml | 0 .../audio-many-backends.x86_64-latest.args | 0 .../audio-many-backends.xml | 0 .../audio-none-best.x86_64-latest.args | 0 .../audio-none-best.xml | 0 .../audio-none-full.x86_64-latest.args | 0 .../audio-none-full.xml | 0 .../audio-none-minimal.x86_64-latest.args | 0 .../audio-none-minimal.xml | 0 .../audio-oss-best.x86_64-latest.args | 0 .../audio-oss-best.xml | 0 .../audio-oss-full.x86_64-latest.args | 0 .../audio-oss-full.xml | 0 .../audio-oss-minimal.x86_64-latest.args | 0 .../audio-oss-minimal.xml | 0 .../audio-pipewire-best.x86_64-latest.args | 0 .../audio-pipewire-best.xml | 0 .../audio-pipewire-full.x86_64-latest.args | 0 .../audio-pipewire-full.xml | 0 .../audio-pipewire-minimal.x86_64-latest.args | 0 .../audio-pipewire-minimal.xml | 0 .../audio-pulseaudio-best.x86_64-latest.args | 0 .../audio-pulseaudio-best.xml | 0 .../audio-pulseaudio-full.x86_64-latest.args | 0 .../audio-pulseaudio-full.xml | 0 .../audio-pulseaudio-minimal.x86_64-latest.args | 0 .../audio-pulseaudio-minimal.xml | 0 .../audio-sdl-best.x86_64-latest.args | 0 .../audio-sdl-best.xml | 0 .../audio-sdl-full.x86_64-latest.args | 0 .../audio-sdl-full.xml | 0 .../audio-sdl-minimal.x86_64-latest.args | 0 .../audio-sdl-minimal.xml | 0 .../audio-spice-best.x86_64-latest.args | 0 .../audio-spice-best.xml | 0 .../audio-spice-full.x86_64-latest.args | 0 .../audio-spice-full.xml | 0 .../audio-spice-minimal.x86_64-latest.args | 0 .../audio-spice-minimal.xml | 0 .../autoindex.x86_64-latest.args | 0 .../autoindex.xml | 0 .../balloon-ccw-deflate.s390x-latest.args | 0 .../balloon-ccw-deflate.xml | 0 .../balloon-device-auto.x86_64-latest.args | 0 .../balloon-device-auto.xml | 0 .../balloon-device-deflate-off.x86_64-latest.args | 0 .../balloon-device-deflate-off.xml | 0 .../balloon-device-deflate.x86_64-latest.args | 0 .../balloon-device-deflate.xml | 0 .../balloon-device-period.x86_64-latest.args | 0 .../balloon-device-period.xml | 0 .../balloon-device.x86_64-latest.args | 0 .../balloon-device.xml | 0 .../balloon-mmio-deflate.aarch64-latest.args | 0 .../balloon-mmio-deflate.xml | 0 .../blkdeviotune-group-num.x86_64-latest.args | 0 .../blkdeviotune-group-num.xml | 0 .../blkdeviotune-max-length.x86_64-latest.args | 0 .../blkdeviotune-max-length.xml | 0 .../blkdeviotune-max.x86_64-latest.args | 0 .../blkdeviotune-max.xml | 0 .../blkdeviotune.x86_64-latest.args | 0 .../blkdeviotune.xml | 0 .../blkiotune-device.x86_64-latest.args | 0 .../blkiotune-device.xml | 0 .../blkiotune.x86_64-latest.args | 0 .../blkiotune.xml | 0 .../boot-cdrom.x86_64-latest.args | 0 .../boot-cdrom.xml | 0 .../boot-complex.x86_64-latest.args | 0 .../boot-complex.xml | 0 .../boot-dev+order.x86_64-latest.err | 0 .../boot-dev+order.xml | 0 .../boot-floppy-q35.x86_64-latest.args | 0 .../boot-floppy-q35.xml | 0 .../boot-floppy.x86_64-latest.args | 0 .../boot-floppy.xml | 0 .../boot-menu-disable-drive.x86_64-latest.args | 0 .../boot-menu-disable-drive.xml | 0 ...boot-menu-disable-with-timeout.x86_64-latest.args | 0 .../boot-menu-disable-with-timeout.xml | 0 .../boot-menu-disable.x86_64-latest.args | 0 .../boot-menu-disable.xml | 0 ...enu-enable-with-timeout-invalid.x86_64-latest.err | 0 .../boot-menu-enable-with-timeout-invalid.xml | 0 .../boot-menu-enable-with-timeout.x86_64-latest.args | 0 .../boot-menu-enable-with-timeout.xml | 0 .../boot-menu-enable.x86_64-latest.args | 0 .../boot-menu-enable.xml | 0 .../boot-multi.x86_64-latest.args | 0 .../boot-multi.xml | 0 .../boot-network.x86_64-latest.args | 0 .../boot-network.xml | 0 .../boot-order.x86_64-latest.args | 0 .../boot-order.xml | 0 .../channel-guestfwd.x86_64-latest.args | 0 .../channel-guestfwd.xml | 0 .../channel-qemu-vdagent-features.x86_64-latest.args | 0 .../channel-qemu-vdagent-features.xml | 0 .../channel-qemu-vdagent.x86_64-latest.args | 0 .../channel-qemu-vdagent.xml | 0 .../channel-spicevmc.x86_64-latest.args | 0 .../channel-spicevmc.xml | 0 .../channel-unix-guestfwd.x86_64-latest.args | 0 .../channel-unix-guestfwd.xml | 0 .../channel-unix-source-path.x86_64-latest.args | 0 .../channel-unix-source-path.xml | 0 .../channel-virtio-auto.x86_64-latest.args | 0 .../channel-virtio-auto.xml | 0 .../channel-virtio-autoadd.x86_64-latest.args | 0 .../channel-virtio-autoadd.xml | 0 .../channel-virtio-autoassign.x86_64-latest.args | 0 .../channel-virtio-autoassign.xml | 0 .../channel-virtio-default.x86_64-latest.args | 0 .../channel-virtio-default.xml | 0 .../channel-virtio-state.x86_64-latest.args | 0 .../channel-virtio-state.xml | 0 .../channel-virtio-unix.x86_64-latest.args | 0 .../channel-virtio-unix.xml | 0 .../channel-virtio.x86_64-latest.args | 0 .../channel-virtio.xml | 0 .../chardev-label.x86_64-latest.args | 0 .../chardev-label.xml | 0 ...hardev-reconnect-generated-path.x86_64-latest.err | 0 .../chardev-reconnect-generated-path.xml | 0 ...ardev-reconnect-invalid-timeout.x86_64-latest.err | 0 .../chardev-reconnect-invalid-timeout.xml | 0 .../chardev-reconnect.x86_64-latest.args | 0 .../chardev-reconnect.xml | 0 .../clock-absolute.x86_64-latest.args | 0 .../clock-absolute.xml | 0 .../clock-catchup.x86_64-latest.args | 0 .../clock-catchup.xml | 0 .../clock-france.x86_64-latest.args | 0 .../clock-france.xml | 0 .../clock-hpet-off.x86_64-7.2.0.args | 0 .../clock-hpet-off.x86_64-latest.args | 0 .../clock-hpet-off.xml | 0 ...lock-localtime-basis-localtime.x86_64-latest.args | 0 .../clock-localtime-basis-localtime.xml | 0 .../clock-localtime.x86_64-latest.args | 0 .../clock-localtime.xml | 0 .../clock-realtime.x86_64-latest.args | 0 .../clock-realtime.xml | 0 .../clock-timer-armvtimer.aarch64-latest.args | 0 .../clock-timer-armvtimer.xml | 0 .../clock-timer-hyperv-rtc.x86_64-latest.args | 0 .../clock-timer-hyperv-rtc.xml | 0 .../clock-utc.x86_64-latest.args | 0 .../clock-utc.xml | 0 .../clock-variable.x86_64-latest.args | 0 .../clock-variable.xml | 0 .../console-compat-auto.x86_64-latest.args | 0 .../console-compat-auto.xml | 0 .../console-compat-chardev.x86_64-latest.args | 0 .../console-compat-chardev.xml | 0 .../console-compat.x86_64-latest.args | 0 .../console-compat.xml | 0 .../console-compat2.x86_64-latest.args | 0 .../console-compat2.xml | 0 .../console-sclp.s390x-latest.args | 0 .../console-sclp.xml | 0 .../console-virtio-ccw.s390x-latest.args | 0 .../console-virtio-ccw.xml | 0 .../console-virtio-many.x86_64-latest.args | 0 .../console-virtio-many.xml | 0 .../console-virtio-unix.x86_64-latest.args | 0 .../console-virtio-unix.xml | 0 .../console-virtio.x86_64-latest.args | 0 .../console-virtio.xml | 0 .../controller-order.x86_64-latest.args | 0 .../controller-order.xml | 0 .../controller-usb-order.x86_64-latest.args | 0 .../controller-usb-order.xml | 0 .../controller-virtio-scsi.x86_64-latest.args | 0 .../controller-virtio-scsi.xml | 0 .../cpu-Haswell-noTSX.x86_64-latest.args | 0 .../cpu-Haswell-noTSX.xml | 0 .../cpu-Haswell.x86_64-latest.args | 0 .../cpu-Haswell.xml | 0 .../cpu-Haswell2.x86_64-latest.args | 0 .../cpu-Haswell2.xml | 0 .../cpu-Haswell3.x86_64-latest.args | 0 .../cpu-Haswell3.xml | 0 .../cpu-Icelake-Server-pconfig.x86_64-latest.args | 0 .../cpu-Icelake-Server-pconfig.xml | 0 .../cpu-cache-disable.x86_64-latest.args | 0 .../cpu-cache-disable.xml | 0 .../cpu-cache-disable3.x86_64-latest.args | 0 .../cpu-cache-disable3.xml | 0 .../cpu-cache-emulate-l2.x86_64-latest.err | 0 .../cpu-cache-emulate-l2.xml | 0 .../cpu-cache-emulate-l3.x86_64-latest.args | 0 .../cpu-cache-emulate-l3.xml | 0 .../cpu-cache-passthrough-l3.x86_64-latest.err | 0 .../cpu-cache-passthrough-l3.xml | 0 .../cpu-cache-passthrough.x86_64-latest.args | 0 .../cpu-cache-passthrough.xml | 0 .../cpu-cache-passthrough3.x86_64-latest.err | 0 .../cpu-cache-passthrough3.xml | 0 .../cpu-check-default-none.x86_64-latest.args | 0 .../cpu-check-default-none.xml | 0 .../cpu-check-default-none2.x86_64-latest.args | 0 .../cpu-check-default-none2.xml | 0 .../cpu-check-default-partial.x86_64-latest.args | 0 .../cpu-check-default-partial.xml | 0 .../cpu-check-default-partial2.x86_64-latest.args | 0 .../cpu-check-default-partial2.xml | 0 .../cpu-check-full.x86_64-latest.args | 0 .../cpu-check-full.xml | 0 .../cpu-check-none.x86_64-latest.args | 0 .../cpu-check-none.xml | 0 .../cpu-check-partial.x86_64-latest.args | 0 .../cpu-check-partial.xml | 0 .../cpu-empty.x86_64-latest.args | 0 .../cpu-empty.xml | 0 .../cpu-eoi-disabled.x86_64-latest.args | 0 .../cpu-eoi-disabled.xml | 0 .../cpu-eoi-enabled.x86_64-latest.args | 0 .../cpu-eoi-enabled.xml | 0 .../cpu-exact1.x86_64-latest.args | 0 .../cpu-exact1.xml | 0 .../cpu-exact2-nofallback.x86_64-latest.args | 0 .../cpu-exact2-nofallback.xml | 0 .../cpu-exact2.x86_64-latest.args | 0 .../cpu-exact2.xml | 0 .../cpu-fallback.x86_64-5.2.0.args | 0 .../cpu-fallback.x86_64-8.0.0.args | 0 .../cpu-fallback.xml | 0 .../cpu-host-kvmclock.x86_64-latest.args | 0 .../cpu-host-kvmclock.xml | 0 .../cpu-host-model-cmt.x86_64-latest.args | 0 .../cpu-host-model-cmt.xml | 0 .../cpu-host-model-fallback-kvm.x86_64-4.2.0.args | 0 .../cpu-host-model-fallback-kvm.x86_64-5.0.0.args | 0 .../cpu-host-model-fallback-kvm.x86_64-5.1.0.args | 0 .../cpu-host-model-fallback-kvm.x86_64-5.2.0.args | 0 .../cpu-host-model-fallback-kvm.x86_64-6.0.0.args | 0 .../cpu-host-model-fallback-kvm.x86_64-6.1.0.args | 0 .../cpu-host-model-fallback-kvm.x86_64-6.2.0.args | 0 .../cpu-host-model-fallback-kvm.x86_64-7.0.0.args | 0 .../cpu-host-model-fallback-kvm.x86_64-7.1.0.args | 0 .../cpu-host-model-fallback-kvm.x86_64-7.2.0.args | 0 .../cpu-host-model-fallback-kvm.x86_64-8.0.0.args | 0 .../cpu-host-model-fallback-kvm.x86_64-8.1.0.args | 0 .../cpu-host-model-fallback-kvm.x86_64-latest.args | 0 .../cpu-host-model-fallback-kvm.xml | 0 .../cpu-host-model-fallback-tcg.x86_64-4.2.0.args | 0 .../cpu-host-model-fallback-tcg.x86_64-5.0.0.args | 0 .../cpu-host-model-fallback-tcg.x86_64-5.1.0.args | 0 .../cpu-host-model-fallback-tcg.x86_64-5.2.0.args | 0 .../cpu-host-model-fallback-tcg.x86_64-6.0.0.args | 0 .../cpu-host-model-fallback-tcg.x86_64-6.1.0.args | 0 .../cpu-host-model-fallback-tcg.x86_64-6.2.0.args | 0 .../cpu-host-model-fallback-tcg.x86_64-7.0.0.args | 0 .../cpu-host-model-fallback-tcg.x86_64-7.1.0.args | 0 .../cpu-host-model-fallback-tcg.x86_64-7.2.0.args | 0 .../cpu-host-model-fallback-tcg.x86_64-8.0.0.args | 0 .../cpu-host-model-fallback-tcg.x86_64-8.1.0.args | 0 .../cpu-host-model-fallback-tcg.x86_64-latest.args | 0 .../cpu-host-model-fallback-tcg.xml | 0 .../cpu-host-model-features.x86_64-latest.args | 0 .../cpu-host-model-features.xml | 0 .../cpu-host-model-kvm.x86_64-4.2.0.args | 0 .../cpu-host-model-kvm.x86_64-5.0.0.args | 0 .../cpu-host-model-kvm.x86_64-5.1.0.args | 0 .../cpu-host-model-kvm.x86_64-5.2.0.args | 0 .../cpu-host-model-kvm.x86_64-6.0.0.args | 0 .../cpu-host-model-kvm.x86_64-6.1.0.args | 0 .../cpu-host-model-kvm.x86_64-6.2.0.args | 0 .../cpu-host-model-kvm.x86_64-7.0.0.args | 0 .../cpu-host-model-kvm.x86_64-7.1.0.args | 0 .../cpu-host-model-kvm.x86_64-7.2.0.args | 0 .../cpu-host-model-kvm.x86_64-8.0.0.args | 0 .../cpu-host-model-kvm.x86_64-8.1.0.args | 0 .../cpu-host-model-kvm.x86_64-latest.args | 0 .../cpu-host-model-kvm.xml | 0 .../cpu-host-model-nofallback-kvm.x86_64-4.2.0.args | 0 .../cpu-host-model-nofallback-kvm.x86_64-5.0.0.args | 0 .../cpu-host-model-nofallback-kvm.x86_64-5.1.0.args | 0 .../cpu-host-model-nofallback-kvm.x86_64-5.2.0.args | 0 .../cpu-host-model-nofallback-kvm.x86_64-6.0.0.args | 0 .../cpu-host-model-nofallback-kvm.x86_64-6.1.0.args | 0 .../cpu-host-model-nofallback-kvm.x86_64-6.2.0.args | 0 .../cpu-host-model-nofallback-kvm.x86_64-7.0.0.args | 0 .../cpu-host-model-nofallback-kvm.x86_64-7.1.0.args | 0 .../cpu-host-model-nofallback-kvm.x86_64-7.2.0.args | 0 .../cpu-host-model-nofallback-kvm.x86_64-8.0.0.args | 0 .../cpu-host-model-nofallback-kvm.x86_64-8.1.0.args | 0 .../cpu-host-model-nofallback-kvm.x86_64-latest.args | 0 .../cpu-host-model-nofallback-kvm.xml | 0 .../cpu-host-model-nofallback-tcg.x86_64-4.2.0.args | 0 .../cpu-host-model-nofallback-tcg.x86_64-5.0.0.args | 0 .../cpu-host-model-nofallback-tcg.x86_64-5.1.0.args | 0 .../cpu-host-model-nofallback-tcg.x86_64-5.2.0.args | 0 .../cpu-host-model-nofallback-tcg.x86_64-6.0.0.args | 0 .../cpu-host-model-nofallback-tcg.x86_64-6.1.0.args | 0 .../cpu-host-model-nofallback-tcg.x86_64-6.2.0.args | 0 .../cpu-host-model-nofallback-tcg.x86_64-7.0.0.args | 0 .../cpu-host-model-nofallback-tcg.x86_64-7.1.0.args | 0 .../cpu-host-model-nofallback-tcg.x86_64-7.2.0.args | 0 .../cpu-host-model-nofallback-tcg.x86_64-8.0.0.args | 0 .../cpu-host-model-nofallback-tcg.x86_64-8.1.0.args | 0 .../cpu-host-model-nofallback-tcg.x86_64-latest.args | 0 .../cpu-host-model-nofallback-tcg.xml | 0 .../cpu-host-model-tcg.x86_64-4.2.0.args | 0 .../cpu-host-model-tcg.x86_64-5.0.0.args | 0 .../cpu-host-model-tcg.x86_64-5.1.0.args | 0 .../cpu-host-model-tcg.x86_64-5.2.0.args | 0 .../cpu-host-model-tcg.x86_64-6.0.0.args | 0 .../cpu-host-model-tcg.x86_64-6.1.0.args | 0 .../cpu-host-model-tcg.x86_64-6.2.0.args | 0 .../cpu-host-model-tcg.x86_64-7.0.0.args | 0 .../cpu-host-model-tcg.x86_64-7.1.0.args | 0 .../cpu-host-model-tcg.x86_64-7.2.0.args | 0 .../cpu-host-model-tcg.x86_64-8.0.0.args | 0 .../cpu-host-model-tcg.x86_64-8.1.0.args | 0 .../cpu-host-model-tcg.x86_64-latest.args | 0 .../cpu-host-model-tcg.xml | 0 .../cpu-host-model-vendor.x86_64-latest.args | 0 .../cpu-host-model-vendor.xml | 0 .../cpu-host-passthrough-features.x86_64-latest.args | 0 .../cpu-host-passthrough-features.xml | 0 .../cpu-host-passthrough.x86_64-latest.args | 0 .../cpu-host-passthrough.xml | 0 .../cpu-hotplug-granularity.ppc64-latest.err | 0 .../cpu-hotplug-granularity.xml | 0 .../cpu-hotplug-startup.x86_64-latest.args | 0 .../cpu-hotplug-startup.xml | 0 .../cpu-kvmclock.x86_64-latest.args | 0 .../cpu-kvmclock.xml | 0 .../cpu-minimum1.x86_64-latest.args | 0 .../cpu-minimum1.xml | 0 .../cpu-minimum2.x86_64-latest.args | 0 .../cpu-minimum2.xml | 0 .../cpu-no-removed-features.x86_64-latest.args | 0 .../cpu-no-removed-features.xml | 0 .../cpu-nofallback.x86_64-5.2.0.err | 0 .../cpu-nofallback.x86_64-8.0.0.args | 0 .../cpu-nofallback.xml | 0 .../cpu-numa-disjoint.x86_64-latest.args | 0 .../cpu-numa-disjoint.xml | 0 .../cpu-numa-disordered.x86_64-latest.args | 0 .../cpu-numa-disordered.xml | 0 .../cpu-numa-memshared.x86_64-latest.args | 0 .../cpu-numa-memshared.xml | 0 .../cpu-numa-no-memory-element.x86_64-latest.args | 0 .../cpu-numa-no-memory-element.xml | 0 .../cpu-numa1.x86_64-latest.args | 0 .../cpu-numa1.xml | 0 .../cpu-numa2.x86_64-latest.args | 0 .../cpu-numa2.xml | 0 .../cpu-numa3.x86_64-latest.err | 0 .../cpu-numa3.xml | 0 .../cpu-phys-bits-emulate-bare.x86_64-latest.args | 0 .../cpu-phys-bits-emulate-bare.xml | 0 .../cpu-phys-bits-emulate.x86_64-latest.args | 0 .../cpu-phys-bits-emulate.xml | 0 .../cpu-phys-bits-emulate2.x86_64-latest.args | 0 .../cpu-phys-bits-emulate2.xml | 0 .../cpu-phys-bits-limit.x86_64-latest.args | 0 .../cpu-phys-bits-limit.xml | 0 .../cpu-phys-bits-passthrough.x86_64-latest.args | 0 .../cpu-phys-bits-passthrough.xml | 0 .../cpu-phys-bits-passthrough2.x86_64-latest.err | 0 .../cpu-phys-bits-passthrough2.xml | 0 .../cpu-qemu-host-passthrough.x86_64-latest.err | 0 .../cpu-qemu-host-passthrough.xml | 0 .../cpu-s390-features.s390x-latest.args | 0 .../cpu-s390-features.xml | 0 .../cpu-s390-zEC12.s390x-latest.args | 0 .../cpu-s390-zEC12.xml | 0 .../cpu-strict1.x86_64-latest.args | 0 .../cpu-strict1.xml | 0 .../cpu-topology1.x86_64-latest.args | 0 .../cpu-topology1.xml | 0 .../cpu-topology2.x86_64-latest.args | 0 .../cpu-topology2.xml | 0 .../cpu-topology3.x86_64-latest.args | 0 .../cpu-topology3.xml | 0 .../cpu-topology4.x86_64-latest.args | 0 .../cpu-topology4.xml | 0 .../cpu-topology5.aarch64-latest.args | 0 .../cpu-topology5.xml | 0 .../cpu-translation.x86_64-latest.args | 0 .../cpu-translation.xml | 0 .../cpu-tsc-frequency.x86_64-latest.args | 0 .../cpu-tsc-frequency.xml | 0 .../cputune-cpuset-big-id.x86_64-latest.args | 0 .../cputune-cpuset-big-id.xml | 0 .../cputune-iothreadsched-toomuch.x86_64-latest.err | 0 .../cputune-iothreadsched-toomuch.xml | 0 .../cputune-numatune.x86_64-latest.args | 0 .../cputune-numatune.xml | 0 .../cputune-vcpusched-overlap.x86_64-latest.err | 0 .../cputune-vcpusched-overlap.xml | 0 .../cputune-zero-shares.x86_64-latest.args | 0 .../cputune-zero-shares.xml | 0 .../cputune.x86_64-latest.args | 0 .../cputune.xml | 0 .../crypto-builtin.x86_64-latest.args | 0 .../crypto-builtin.xml | 0 .../default-kvm-host-arch.x86_64-latest.args | 0 .../default-kvm-host-arch.xml | 0 .../default-qemu-host-arch.x86_64-latest.args | 0 .../default-qemu-host-arch.xml | 0 .../default-video-type-aarch64.aarch64-latest.args | 0 .../default-video-type-aarch64.xml | 0 .../default-video-type-ppc64.ppc64-latest.args | 0 .../default-video-type-ppc64.xml | 0 .../default-video-type-riscv64.riscv64-latest.args | 0 .../default-video-type-riscv64.xml | 0 .../default-video-type-s390x.s390x-latest.args | 0 .../default-video-type-s390x.xml | 0 .../default-video-type-x86_64.x86_64-latest.args | 0 .../default-video-type-x86_64.xml | 0 .../devices-acpi-index.x86_64-latest.args | 0 .../devices-acpi-index.xml | 0 .../disk-active-commit.x86_64-latest.args | 0 .../disk-active-commit.xml | 0 .../disk-address-conflict.x86_64-latest.err | 0 .../disk-address-conflict.xml | 0 .../disk-aio-io_uring.x86_64-latest.args | 0 .../disk-aio-io_uring.xml | 0 .../disk-aio.x86_64-latest.args | 0 .../disk-aio.xml | 0 .../disk-arm-virtio-sd.aarch64-latest.args | 0 .../disk-arm-virtio-sd.xml | 0 ...k-attaching-partition-nosupport.x86_64-latest.err | 0 .../disk-attaching-partition-nosupport.xml | 0 .../disk-backing-chains-index.x86_64-latest.args | 0 .../disk-backing-chains-index.xml | 0 .../disk-backing-chains-noindex.x86_64-latest.args | 0 .../disk-backing-chains-noindex.xml | 0 .../disk-blockio.x86_64-latest.args | 0 .../disk-blockio.xml | 0 .../disk-boot-cdrom.x86_64-latest.args | 0 .../disk-boot-cdrom.xml | 0 .../disk-boot-disk.x86_64-latest.args | 0 .../disk-boot-disk.xml | 0 .../disk-cache.x86_64-latest.args | 0 .../disk-cache.xml | 0 .../disk-cdrom-bus-other.x86_64-latest.args | 0 .../disk-cdrom-bus-other.xml | 0 ...sk-cdrom-empty-network-invalid.x86_64-latest.args | 0 .../disk-cdrom-empty-network-invalid.xml | 0 .../disk-cdrom-network-nbdkit.x86_64-latest.args | 0 .../disk-cdrom-network-nbdkit.xml | 0 .../disk-cdrom-network.x86_64-latest.args | 0 .../disk-cdrom-network.xml | 0 .../disk-cdrom-tray.x86_64-latest.args | 0 .../disk-cdrom-tray.xml | 0 .../disk-cdrom.x86_64-latest.args | 0 .../disk-cdrom.xml | 0 .../disk-copy_on_read.x86_64-latest.args | 0 .../disk-copy_on_read.xml | 0 .../disk-detect-zeroes.x86_64-latest.args | 0 .../disk-detect-zeroes.xml | 0 .../disk-device-lun-type-invalid.x86_64-latest.err | 0 .../disk-device-lun-type-invalid.xml | 0 .../disk-device-removable.x86_64-latest.args | 0 .../disk-device-removable.xml | 0 .../disk-discard.x86_64-latest.args | 0 .../disk-discard.xml | 0 .../disk-discard_no_unref.x86_64-latest.args | 0 .../disk-discard_no_unref.xml | 0 .../disk-encryption-wrong.x86_64-latest.err | 0 .../disk-encryption-wrong.xml | 0 .../disk-error-policy-s390x.s390x-latest.args | 0 .../disk-error-policy-s390x.xml | 0 .../disk-error-policy.x86_64-latest.args | 0 .../disk-error-policy.xml | 0 .../disk-fdc-incompatible-address.x86_64-latest.err | 0 .../disk-fdc-incompatible-address.xml | 0 .../disk-floppy-pseries.ppc64-latest.err | 0 .../disk-floppy-pseries.xml | 0 .../disk-floppy-q35.x86_64-latest.args | 0 .../disk-floppy-q35.xml | 0 .../disk-floppy-tray.x86_64-latest.args | 0 .../disk-floppy-tray.xml | 0 .../disk-floppy.x86_64-latest.args | 0 .../disk-floppy.xml | 0 .../disk-fmt-cow.x86_64-latest.err | 0 .../disk-fmt-cow.xml | 0 .../disk-fmt-dir.x86_64-latest.err | 0 .../disk-fmt-dir.xml | 0 .../disk-fmt-iso.x86_64-latest.err | 0 .../disk-fmt-iso.xml | 0 .../disk-fmt-qcow.x86_64-latest.args | 0 .../disk-fmt-qcow.xml | 0 .../disk-geometry.x86_64-latest.args | 0 .../disk-geometry.xml | 0 ...k-hostdev-scsi-address-conflict.x86_64-latest.err | 0 .../disk-hostdev-scsi-address-conflict.xml | 0 .../disk-ide-incompatible-address.x86_64-latest.err | 0 .../disk-ide-incompatible-address.xml | 0 .../disk-ide-split.x86_64-latest.args | 0 .../disk-ide-split.xml | 0 .../disk-ide-wwn.x86_64-latest.args | 0 .../disk-ide-wwn.xml | 0 .../disk-ioeventfd.x86_64-latest.args | 0 .../disk-ioeventfd.xml | 0 .../disk-metadata-cache.x86_64-latest.args | 0 .../disk-metadata-cache.xml | 0 .../disk-mirror-old.x86_64-latest.args | 0 .../disk-mirror-old.xml | 0 .../disk-mirror.x86_64-latest.args | 0 .../disk-mirror.xml | 0 .../disk-missing-target-invalid.x86_64-latest.err | 0 .../disk-missing-target-invalid.xml | 0 .../disk-network-gluster.x86_64-latest.args | 0 .../disk-network-gluster.xml | 0 .../disk-network-http-nbdkit.x86_64-latest.args | 0 .../disk-network-http-nbdkit.xml | 0 .../disk-network-http.x86_64-latest.args | 0 .../disk-network-http.xml | 0 ...k-iscsi-auth-secrettype-invalid.x86_64-latest.err | 0 .../disk-network-iscsi-auth-secrettype-invalid.xml | 0 ...ork-iscsi-auth-wrong-secrettype.x86_64-latest.err | 0 .../disk-network-iscsi-auth-wrong-secrettype.xml | 0 .../disk-network-iscsi.x86_64-latest.args | 0 .../disk-network-iscsi.xml | 0 .../disk-network-nbd.x86_64-latest.args | 0 .../disk-network-nbd.xml | 0 .../disk-network-nfs.x86_64-latest.args | 0 .../disk-network-nfs.xml | 0 ...-network-rbd-encryption-layering.x86_64-7.2.0.err | 0 ...etwork-rbd-encryption-layering.x86_64-latest.args | 0 .../disk-network-rbd-encryption-layering.xml | 0 ...-network-rbd-encryption-luks-any.x86_64-7.2.0.err | 0 ...etwork-rbd-encryption-luks-any.x86_64-latest.args | 0 .../disk-network-rbd-encryption-luks-any.xml | 0 .../disk-network-rbd-encryption.x86_64-6.0.0.err | 0 .../disk-network-rbd-encryption.x86_64-latest.args | 0 .../disk-network-rbd-encryption.xml | 0 .../disk-network-rbd-no-colon.x86_64-latest.args | 0 .../disk-network-rbd-no-colon.xml | 0 .../disk-network-rbd.x86_64-latest.args | 0 .../disk-network-rbd.xml | 0 .../disk-network-sheepdog.x86_64-6.0.0.args | 0 .../disk-network-sheepdog.xml | 0 .../disk-network-source-auth-both.x86_64-latest.err | 0 .../disk-network-source-auth-both.xml | 0 .../disk-network-source-auth.x86_64-latest.args | 0 .../disk-network-source-auth.xml | 0 ...ork-source-curl-nbdkit-backing.x86_64-latest.args | 0 .../disk-network-source-curl-nbdkit-backing.xml | 0 ...isk-network-source-curl-nbdkit.x86_64-latest.args | 0 .../disk-network-source-curl-nbdkit.xml | 0 .../disk-network-source-curl.x86_64-latest.args | 0 .../disk-network-source-curl.xml | 0 .../disk-network-ssh-key.x86_64-latest.args | 0 .../disk-network-ssh-key.xml | 0 .../disk-network-ssh-nbdkit.x86_64-latest.args | 0 .../disk-network-ssh-nbdkit.xml | 0 .../disk-network-ssh-password.x86_64-latest.args | 0 .../disk-network-ssh-password.xml | 0 .../disk-network-ssh.x86_64-latest.args | 0 .../disk-network-ssh.xml | 0 ...isk-network-tlsx509-nbd-hostname.x86_64-6.2.0.err | 0 ...k-network-tlsx509-nbd-hostname.x86_64-latest.args | 0 .../disk-network-tlsx509-nbd-hostname.xml | 0 .../disk-network-tlsx509-nbd.x86_64-5.2.0.args | 0 .../disk-network-tlsx509-nbd.x86_64-latest.args | 0 .../disk-network-tlsx509-nbd.xml | 0 .../disk-network-tlsx509-vxhs.x86_64-5.0.0.args | 0 .../disk-network-tlsx509-vxhs.xml | 0 .../disk-network-vxhs.x86_64-5.0.0.args | 0 .../disk-network-vxhs.xml | 0 .../disk-no-boot.x86_64-latest.args | 0 .../disk-no-boot.xml | 0 .../disk-nvme.x86_64-latest.args | 0 .../disk-nvme.xml | 0 .../disk-order.x86_64-latest.args | 0 .../disk-order.xml | 0 .../disk-readonly-disk.x86_64-latest.args | 0 .../disk-readonly-disk.xml | 0 .../disk-rotation.x86_64-latest.args | 0 .../disk-rotation.xml | 0 .../disk-same-targets.x86_64-latest.err | 0 .../disk-same-targets.xml | 0 .../disk-sata-device.x86_64-latest.args | 0 .../disk-sata-device.xml | 0 .../disk-sata-incompatible-address.x86_64-latest.err | 0 .../disk-sata-incompatible-address.xml | 0 .../disk-scsi-device-auto.x86_64-latest.args | 0 .../disk-scsi-device-auto.xml | 0 .../disk-scsi-disk-split.x86_64-latest.args | 0 .../disk-scsi-disk-split.xml | 0 .../disk-scsi-disk-vpd-build-error.x86_64-latest.err | 0 .../disk-scsi-disk-vpd-build-error.xml | 0 .../disk-scsi-disk-vpd.x86_64-latest.args | 0 .../disk-scsi-disk-vpd.xml | 0 .../disk-scsi-disk-wwn.x86_64-latest.args | 0 .../disk-scsi-disk-wwn.xml | 0 .../disk-scsi-incompatible-address.x86_64-latest.err | 0 .../disk-scsi-incompatible-address.xml | 0 .../disk-scsi-lun-passthrough.x86_64-latest.args | 0 .../disk-scsi-lun-passthrough.xml | 0 .../disk-scsi.x86_64-latest.args | 0 .../disk-scsi.xml | 0 .../disk-serial.x86_64-latest.args | 0 .../disk-serial.xml | 0 .../disk-shared-qcow.x86_64-latest.err | 0 .../disk-shared-qcow.xml | 0 .../disk-shared.x86_64-latest.args | 0 .../disk-shared.xml | 0 .../disk-slices.x86_64-latest.args | 0 .../disk-slices.xml | 0 .../disk-snapshot.x86_64-latest.args | 0 .../disk-snapshot.xml | 0 .../disk-source-fd.x86_64-latest.args | 0 .../disk-source-fd.xml | 0 .../disk-source-pool-mode.x86_64-latest.args | 0 .../disk-source-pool-mode.xml | 0 .../disk-source-pool.x86_64-latest.args | 0 .../disk-source-pool.xml | 0 .../disk-transient.x86_64-latest.args | 0 .../disk-transient.xml | 0 .../disk-usb-device.x86_64-latest.args | 0 .../disk-usb-device.xml | 0 .../disk-usb-pci.x86_64-latest.err | 0 .../disk-usb-pci.xml | 0 .../disk-vhostuser-numa.x86_64-4.2.0.args | 0 .../disk-vhostuser-numa.x86_64-latest.args | 0 .../disk-vhostuser-numa.xml | 0 .../disk-vhostuser.x86_64-latest.args | 0 .../disk-vhostuser.xml | 0 .../disk-vhostvdpa.x86_64-latest.args | 0 .../disk-vhostvdpa.xml | 0 .../disk-virtio-ccw-many.s390x-latest.args | 0 .../disk-virtio-ccw-many.xml | 0 .../disk-virtio-ccw.s390x-latest.args | 0 .../disk-virtio-ccw.xml | 0 .../disk-virtio-queues.x86_64-latest.args | 0 .../disk-virtio-queues.xml | 0 .../disk-virtio-s390-zpci.s390x-latest.args | 0 .../disk-virtio-s390-zpci.xml | 0 .../disk-virtio-scsi-reservations.x86_64-5.2.0.args | 0 .../disk-virtio-scsi-reservations.x86_64-latest.args | 0 .../disk-virtio-scsi-reservations.xml | 0 .../disk-virtio.x86_64-latest.args | 0 .../disk-virtio.xml | 0 .../downscript.x86_64-latest.args | 0 .../downscript.xml | 0 .../encrypted-disk-usage.x86_64-latest.args | 0 .../encrypted-disk-usage.xml | 0 .../encrypted-disk.x86_64-latest.args | 0 .../encrypted-disk.xml | 0 .../eoi-disabled.x86_64-latest.args | 0 .../eoi-disabled.xml | 0 .../eoi-enabled.x86_64-latest.args | 0 .../eoi-enabled.xml | 0 .../event_idx.x86_64-latest.args | 0 .../event_idx.xml | 0 .../fd-memory-no-numa-topology.x86_64-latest.args | 0 .../fd-memory-no-numa-topology.xml | 0 .../fd-memory-numa-topology.x86_64-latest.args | 0 .../fd-memory-numa-topology.xml | 0 .../fd-memory-numa-topology2.x86_64-latest.args | 0 .../fd-memory-numa-topology2.xml | 0 .../fd-memory-numa-topology3.x86_64-latest.args | 0 .../fd-memory-numa-topology3.xml | 0 .../fd-memory-numa-topology4.x86_64-latest.args | 0 .../fd-memory-numa-topology4.xml | 0 .../fips-enabled.x86_64-5.1.0.args | 0 .../fips-enabled.x86_64-latest.args | 0 .../fips-enabled.xml | 0 ...irmware-auto-bios-not-stateless.x86_64-latest.err | 0 .../firmware-auto-bios-not-stateless.xml | 0 .../firmware-auto-bios-nvram.x86_64-latest.err | 0 .../firmware-auto-bios-nvram.xml | 0 .../firmware-auto-bios-stateless.x86_64-latest.args | 0 .../firmware-auto-bios-stateless.xml | 0 .../firmware-auto-bios.x86_64-latest.args | 0 .../firmware-auto-bios.xml | 0 .../firmware-auto-efi-aarch64.aarch64-latest.args | 0 .../firmware-auto-efi-aarch64.xml | 0 ...e-auto-efi-abi-update-aarch64.aarch64-latest.args | 0 .../firmware-auto-efi-abi-update-aarch64.xml | 0 .../firmware-auto-efi-abi-update.x86_64-latest.args | 0 .../firmware-auto-efi-abi-update.xml | 0 ...to-efi-enrolled-keys-no-secboot.x86_64-latest.err | 0 .../firmware-auto-efi-enrolled-keys-no-secboot.xml | 0 ...irmware-auto-efi-enrolled-keys.x86_64-latest.args | 0 .../firmware-auto-efi-enrolled-keys.xml | 0 ...format-loader-qcow2-nvram-path.x86_64-latest.args | 0 ...mware-auto-efi-format-loader-qcow2-nvram-path.xml | 0 ...e-auto-efi-format-loader-qcow2.x86_64-latest.args | 0 .../firmware-auto-efi-format-loader-qcow2.xml | 0 ...-format-loader-raw-abi-update.aarch64-latest.args | 0 ...irmware-auto-efi-format-loader-raw-abi-update.xml | 0 ...re-auto-efi-format-loader-raw.aarch64-latest.args | 0 .../firmware-auto-efi-format-loader-raw.xml | 0 ...rmware-auto-efi-format-mismatch.x86_64-latest.err | 0 .../firmware-auto-efi-format-mismatch.xml | 0 ...format-nvram-qcow2-network-nbd.x86_64-latest.args | 0 ...mware-auto-efi-format-nvram-qcow2-network-nbd.xml | 0 ...to-efi-format-nvram-qcow2-path.x86_64-latest.args | 0 .../firmware-auto-efi-format-nvram-qcow2-path.xml | 0 ...re-auto-efi-format-nvram-qcow2.x86_64-latest.args | 0 .../firmware-auto-efi-format-nvram-qcow2.xml | 0 ...mware-auto-efi-loader-insecure.x86_64-latest.args | 0 .../firmware-auto-efi-loader-insecure.xml | 0 ...uto-efi-loader-path-nonstandard.x86_64-latest.err | 0 .../firmware-auto-efi-loader-path-nonstandard.xml | 0 .../firmware-auto-efi-loader-path.x86_64-latest.args | 0 .../firmware-auto-efi-loader-path.xml | 0 ...o-efi-loader-secure-abi-update.x86_64-latest.args | 0 .../firmware-auto-efi-loader-secure-abi-update.xml | 0 ...irmware-auto-efi-loader-secure.x86_64-latest.args | 0 .../firmware-auto-efi-loader-secure.xml | 0 ...ware-auto-efi-no-enrolled-keys.x86_64-latest.args | 0 .../firmware-auto-efi-no-enrolled-keys.xml | 0 .../firmware-auto-efi-no-secboot.x86_64-latest.args | 0 .../firmware-auto-efi-no-secboot.xml | 0 .../firmware-auto-efi-nvram-file.x86_64-latest.args | 0 .../firmware-auto-efi-nvram-file.xml | 0 ...e-auto-efi-nvram-network-iscsi.x86_64-latest.args | 0 .../firmware-auto-efi-nvram-network-iscsi.xml | 0 ...are-auto-efi-nvram-network-nbd.x86_64-latest.args | 0 .../firmware-auto-efi-nvram-network-nbd.xml | 0 .../firmware-auto-efi-nvram-path.x86_64-latest.args | 0 .../firmware-auto-efi-nvram-path.xml | 0 ...-efi-nvram-template-nonstandard.x86_64-latest.err | 0 .../firmware-auto-efi-nvram-template-nonstandard.xml | 0 ...rmware-auto-efi-nvram-template.x86_64-latest.args | 0 .../firmware-auto-efi-nvram-template.xml | 0 ...firmware-auto-efi-rw-abi-update.x86_64-latest.err | 0 .../firmware-auto-efi-rw-abi-update.xml | 0 .../firmware-auto-efi-rw.x86_64-latest.err | 0 .../firmware-auto-efi-rw.xml | 0 .../firmware-auto-efi-secboot.x86_64-latest.args | 0 .../firmware-auto-efi-secboot.xml | 0 .../firmware-auto-efi-smm-off.x86_64-latest.args | 0 .../firmware-auto-efi-smm-off.xml | 0 .../firmware-auto-efi-stateless.x86_64-latest.args | 0 .../firmware-auto-efi-stateless.xml | 0 .../firmware-auto-efi.x86_64-latest.args | 0 .../firmware-auto-efi.xml | 0 ...mware-manual-bios-not-stateless.x86_64-latest.err | 0 .../firmware-manual-bios-not-stateless.xml | 0 ...firmware-manual-bios-stateless.x86_64-latest.args | 0 .../firmware-manual-bios-stateless.xml | 0 .../firmware-manual-bios.x86_64-latest.args | 0 .../firmware-manual-bios.xml | 0 ...nual-efi-aarch64-legacy-paths.aarch64-latest.args | 0 .../firmware-manual-efi-aarch64-legacy-paths.xml | 0 ...mware-manual-efi-acpi-aarch64.aarch64-latest.args | 0 .../firmware-manual-efi-acpi-aarch64.xml | 0 .../firmware-manual-efi-acpi-q35.x86_64-latest.args | 0 .../firmware-manual-efi-acpi-q35.xml | 0 .../firmware-manual-efi-features.x86_64-latest.args | 0 .../firmware-manual-efi-features.x86_64-latest.err | 0 .../firmware-manual-efi-features.xml | 0 ...mware-manual-efi-loader-no-path.x86_64-latest.err | 0 .../firmware-manual-efi-loader-no-path.xml | 0 ...al-efi-loader-path-nonstandard.x86_64-latest.args | 0 .../firmware-manual-efi-loader-path-nonstandard.xml | 0 ...mware-manual-efi-loader-secure.x86_64-latest.args | 0 .../firmware-manual-efi-loader-secure.xml | 0 ...-no-enrolled-keys-legacy-paths.x86_64-latest.args | 0 ...ware-manual-efi-no-enrolled-keys-legacy-paths.xml | 0 ...re-manual-efi-no-enrolled-keys.x86_64-latest.args | 0 .../firmware-manual-efi-no-enrolled-keys.xml | 0 ...al-efi-no-secboot-legacy-paths.x86_64-latest.args | 0 .../firmware-manual-efi-no-secboot-legacy-paths.xml | 0 ...firmware-manual-efi-no-secboot.x86_64-latest.args | 0 .../firmware-manual-efi-no-secboot.xml | 0 ...are-manual-efi-noacpi-aarch64.aarch64-latest.args | 0 .../firmware-manual-efi-noacpi-aarch64.xml | 0 .../firmware-manual-efi-noacpi-q35.x86_64-latest.err | 0 .../firmware-manual-efi-noacpi-q35.xml | 0 ...firmware-manual-efi-nvram-file.x86_64-latest.args | 0 .../firmware-manual-efi-nvram-file.xml | 0 ...manual-efi-nvram-network-iscsi.x86_64-latest.args | 0 .../firmware-manual-efi-nvram-network-iscsi.xml | 0 ...e-manual-efi-nvram-network-nbd.x86_64-latest.args | 0 .../firmware-manual-efi-nvram-network-nbd.xml | 0 ...ware-manual-efi-nvram-stateless.x86_64-latest.err | 0 .../firmware-manual-efi-nvram-stateless.xml | 0 ...efi-nvram-template-nonstandard.x86_64-latest.args | 0 ...irmware-manual-efi-nvram-template-nonstandard.xml | 0 ...al-efi-nvram-template-stateless.x86_64-latest.err | 0 .../firmware-manual-efi-nvram-template-stateless.xml | 0 ...ware-manual-efi-nvram-template.x86_64-latest.args | 0 .../firmware-manual-efi-nvram-template.xml | 0 ...irmware-manual-efi-rw-implicit.x86_64-latest.args | 0 .../firmware-manual-efi-rw-implicit.xml | 0 ...are-manual-efi-rw-legacy-paths.x86_64-latest.args | 0 .../firmware-manual-efi-rw-legacy-paths.xml | 0 ...are-manual-efi-rw-modern-paths.x86_64-latest.args | 0 .../firmware-manual-efi-rw-modern-paths.xml | 0 .../firmware-manual-efi-rw.x86_64-latest.args | 0 .../firmware-manual-efi-rw.xml | 0 ...anual-efi-secboot-legacy-paths.x86_64-latest.args | 0 .../firmware-manual-efi-secboot-legacy-paths.xml | 0 .../firmware-manual-efi-secboot.x86_64-latest.args | 0 .../firmware-manual-efi-secboot.xml | 0 .../firmware-manual-efi-stateless.x86_64-latest.args | 0 .../firmware-manual-efi-stateless.xml | 0 .../firmware-manual-efi.x86_64-latest.args | 0 .../firmware-manual-efi.xml | 0 ...ware-manual-noefi-acpi-aarch64.aarch64-latest.err | 0 .../firmware-manual-noefi-acpi-aarch64.xml | 0 ...firmware-manual-noefi-acpi-q35.x86_64-latest.args | 0 .../firmware-manual-noefi-acpi-q35.xml | 0 ...e-manual-noefi-noacpi-aarch64.aarch64-latest.args | 0 .../firmware-manual-noefi-noacpi-aarch64.xml | 0 ...rmware-manual-noefi-noacpi-q35.x86_64-latest.args | 0 .../firmware-manual-noefi-noacpi-q35.xml | 0 .../floppy-drive-fat.x86_64-latest.args | 0 .../floppy-drive-fat.xml | 0 .../fs9p-ccw.s390x-latest.args | 0 .../fs9p-ccw.xml | 0 .../fs9p.x86_64-latest.args | 0 tests/{qemuxml2argvdata => qemuxmlconfdata}/fs9p.xml | 0 .../genid-auto.x86_64-latest.args | 0 .../genid-auto.xml | 0 .../genid.x86_64-latest.args | 0 .../{qemuxml2argvdata => qemuxmlconfdata}/genid.xml | 0 .../graphics-dbus-address.x86_64-latest.args | 0 .../graphics-dbus-address.xml | 0 .../graphics-dbus-audio.x86_64-latest.args | 0 .../graphics-dbus-audio.xml | 0 .../graphics-dbus-chardev.x86_64-latest.args | 0 .../graphics-dbus-chardev.xml | 0 .../graphics-dbus-p2p.x86_64-latest.args | 0 .../graphics-dbus-p2p.xml | 0 .../graphics-dbus-usbredir.x86_64-latest.args | 0 .../graphics-dbus-usbredir.xml | 0 .../graphics-dbus.x86_64-latest.args | 0 .../graphics-dbus.xml | 0 ...aphics-egl-headless-rendernode.x86_64-latest.args | 0 .../graphics-egl-headless-rendernode.xml | 0 .../graphics-egl-headless.x86_64-latest.args | 0 .../graphics-egl-headless.xml | 0 .../graphics-listen-network.x86_64-latest.args | 0 .../graphics-listen-network.xml | 0 .../graphics-sdl-egl-headless.x86_64-latest.err | 0 .../graphics-sdl-egl-headless.xml | 0 .../graphics-sdl-fullscreen.x86_64-latest.args | 0 .../graphics-sdl-fullscreen.xml | 0 .../graphics-sdl.x86_64-latest.args | 0 .../graphics-sdl.xml | 0 ...graphics-spice-agent-file-xfer.x86_64-latest.args | 0 .../graphics-spice-agent-file-xfer.xml | 0 .../graphics-spice-agentmouse.x86_64-latest.args | 0 .../graphics-spice-agentmouse.xml | 0 ...graphics-spice-auto-socket-cfg.x86_64-latest.args | 0 .../graphics-spice-auto-socket-cfg.xml | 0 .../graphics-spice-auto-socket.x86_64-latest.args | 0 .../graphics-spice-auto-socket.xml | 0 .../graphics-spice-compression.x86_64-latest.args | 0 .../graphics-spice-compression.xml | 0 .../graphics-spice-egl-headless.x86_64-latest.args | 0 .../graphics-spice-egl-headless.xml | 0 ...phics-spice-gl-auto-rendernode.x86_64-latest.args | 0 .../graphics-spice-gl-auto-rendernode.xml | 0 ...hics-spice-invalid-egl-headless.x86_64-latest.err | 0 .../graphics-spice-invalid-egl-headless.xml | 0 .../graphics-spice-no-args.x86_64-latest.args | 0 .../graphics-spice-no-args.xml | 0 .../graphics-spice-qxl-vga.x86_64-latest.args | 0 .../graphics-spice-qxl-vga.xml | 0 .../graphics-spice-sasl.x86_64-latest.args | 0 .../graphics-spice-sasl.xml | 0 .../graphics-spice-socket.x86_64-latest.args | 0 .../graphics-spice-socket.xml | 0 .../graphics-spice-timeout.x86_64-latest.args | 0 .../graphics-spice-timeout.xml | 0 .../graphics-spice-usb-redir.x86_64-latest.args | 0 .../graphics-spice-usb-redir.xml | 0 .../graphics-spice.x86_64-latest.args | 0 .../graphics-spice.xml | 0 .../graphics-vnc-auto-socket-cfg.x86_64-latest.args | 0 .../graphics-vnc-auto-socket-cfg.xml | 0 .../graphics-vnc-auto-socket.x86_64-latest.args | 0 .../graphics-vnc-auto-socket.xml | 0 .../graphics-vnc-egl-headless.x86_64-latest.args | 0 .../graphics-vnc-egl-headless.xml | 0 .../graphics-vnc-no-listen-attr.x86_64-latest.args | 0 .../graphics-vnc-no-listen-attr.xml | 0 .../graphics-vnc-none.x86_64-latest.args | 0 .../graphics-vnc-none.xml | 0 .../graphics-vnc-policy.x86_64-latest.args | 0 .../graphics-vnc-policy.xml | 0 .../graphics-vnc-power.x86_64-latest.args | 0 .../graphics-vnc-power.xml | 0 ...cs-vnc-remove-generated-socket.x86_64-latest.args | 0 .../graphics-vnc-remove-generated-socket.xml | 0 .../graphics-vnc-sasl.x86_64-latest.args | 0 .../graphics-vnc-sasl.xml | 0 ...raphics-vnc-socket-new-cmdline.x86_64-latest.args | 0 .../graphics-vnc-socket-new-cmdline.xml | 0 .../graphics-vnc-socket.x86_64-latest.args | 0 .../graphics-vnc-socket.xml | 0 .../graphics-vnc-tls-secret.x86_64-5.2.0.args | 0 .../graphics-vnc-tls-secret.x86_64-latest.args | 0 .../graphics-vnc-tls-secret.xml | 0 .../graphics-vnc-tls.x86_64-latest.args | 0 .../graphics-vnc-tls.xml | 0 .../graphics-vnc-websocket.x86_64-latest.args | 0 .../graphics-vnc-websocket.xml | 0 .../graphics-vnc.x86_64-latest.args | 0 .../graphics-vnc.xml | 0 ...v-mdev-display-missing-graphics.x86_64-latest.err | 0 .../hostdev-mdev-display-missing-graphics.xml | 0 ...dev-mdev-display-ramfb-multiple.x86_64-latest.err | 0 .../hostdev-mdev-display-ramfb-multiple.xml | 0 .../hostdev-mdev-display-ramfb.x86_64-latest.args | 0 .../hostdev-mdev-display-ramfb.xml | 0 ...dev-display-spice-egl-headless.x86_64-latest.args | 0 .../hostdev-mdev-display-spice-egl-headless.xml | 0 ...tdev-mdev-display-spice-opengl.x86_64-latest.args | 0 .../hostdev-mdev-display-spice-opengl.xml | 0 ...-mdev-display-vnc-egl-headless.x86_64-latest.args | 0 .../hostdev-mdev-display-vnc-egl-headless.xml | 0 .../hostdev-mdev-display-vnc.x86_64-latest.args | 0 .../hostdev-mdev-display-vnc.xml | 0 .../hostdev-mdev-display.x86_64-latest.args | 0 .../hostdev-mdev-display.xml | 0 .../hostdev-mdev-duplicate.x86_64-latest.err | 0 .../hostdev-mdev-duplicate.xml | 0 ...dev-mdev-invalid-target-address.x86_64-latest.err | 0 .../hostdev-mdev-invalid-target-address.xml | 0 .../hostdev-mdev-precreated.x86_64-latest.args | 0 .../hostdev-mdev-precreated.xml | 0 ...ostdev-mdev-src-address-invalid.x86_64-latest.err | 0 .../hostdev-mdev-src-address-invalid.xml | 0 .../hostdev-pci-address-device.x86_64-latest.args | 0 .../hostdev-pci-address-device.xml | 0 ...hostdev-pci-address-unassigned.x86_64-latest.args | 0 .../hostdev-pci-address-unassigned.xml | 0 .../hostdev-pci-address.x86_64-latest.args | 0 .../hostdev-pci-address.xml | 0 .../hostdev-pci-duplicate.x86_64-latest.err | 0 .../hostdev-pci-duplicate.xml | 0 .../hostdev-pci-multifunction.x86_64-latest.args | 0 .../hostdev-pci-multifunction.xml | 0 .../hostdev-scsi-autogen-address.x86_64-latest.args | 0 .../hostdev-scsi-autogen-address.xml | 0 .../hostdev-scsi-duplicate.x86_64-latest.err | 0 .../hostdev-scsi-duplicate.xml | 0 .../hostdev-scsi-large-unit.x86_64-latest.args | 0 .../hostdev-scsi-large-unit.xml | 0 .../hostdev-scsi-lsi.x86_64-latest.args | 0 .../hostdev-scsi-lsi.xml | 0 .../hostdev-scsi-shareable.x86_64-latest.args | 0 .../hostdev-scsi-shareable.xml | 0 .../hostdev-scsi-vhost-scsi-ccw.s390x-latest.args | 0 .../hostdev-scsi-vhost-scsi-ccw.xml | 0 ...v-scsi-vhost-scsi-pci-boot-fail.x86_64-latest.err | 0 .../hostdev-scsi-vhost-scsi-pci-boot-fail.xml | 0 .../hostdev-scsi-vhost-scsi-pci.x86_64-latest.args | 0 .../hostdev-scsi-vhost-scsi-pci.xml | 0 .../hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args | 0 .../hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args | 0 .../hostdev-scsi-vhost-scsi-pcie.xml | 0 .../hostdev-scsi-virtio-scsi.x86_64-latest.args | 0 .../hostdev-scsi-virtio-scsi.xml | 0 ...ev-subsys-mdev-vfio-ap-boot-fail.s390x-latest.err | 0 .../hostdev-subsys-mdev-vfio-ap-boot-fail.xml | 0 .../hostdev-subsys-mdev-vfio-ap.s390x-latest.args | 0 .../hostdev-subsys-mdev-vfio-ap.xml | 0 ...stdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args | 0 .../hostdev-subsys-mdev-vfio-ccw-boot.xml | 0 ...-mdev-vfio-ccw-duplicate-address.s390x-latest.err | 0 ...ostdev-subsys-mdev-vfio-ccw-duplicate-address.xml | 0 ...ys-mdev-vfio-ccw-invalid-address.s390x-latest.err | 0 .../hostdev-subsys-mdev-vfio-ccw-invalid-address.xml | 0 .../hostdev-subsys-mdev-vfio-ccw.s390x-latest.args | 0 .../hostdev-subsys-mdev-vfio-ccw.xml | 0 ...ostdev-usb-address-device-boot.x86_64-latest.args | 0 .../hostdev-usb-address-device-boot.xml | 0 .../hostdev-usb-address-device.x86_64-latest.args | 0 .../hostdev-usb-address-device.xml | 0 .../hostdev-usb-address.x86_64-latest.args | 0 .../hostdev-usb-address.xml | 0 .../hostdev-usb-duplicate.x86_64-latest.err | 0 .../hostdev-usb-duplicate.xml | 0 .../hostdev-vfio-multidomain.x86_64-latest.args | 0 .../hostdev-vfio-multidomain.xml | 0 ...dev-vfio-zpci-autogenerate-fids.s390x-latest.args | 0 .../hostdev-vfio-zpci-autogenerate-fids.xml | 0 ...dev-vfio-zpci-autogenerate-uids.s390x-latest.args | 0 .../hostdev-vfio-zpci-autogenerate-uids.xml | 0 .../hostdev-vfio-zpci-autogenerate.s390x-latest.args | 0 .../hostdev-vfio-zpci-autogenerate.xml | 0 .../hostdev-vfio-zpci-boundaries.s390x-latest.args | 0 .../hostdev-vfio-zpci-boundaries.xml | 0 ...ostdev-vfio-zpci-ccw-memballoon.s390x-latest.args | 0 .../hostdev-vfio-zpci-ccw-memballoon.xml | 0 .../hostdev-vfio-zpci-duplicate.s390x-latest.err | 0 .../hostdev-vfio-zpci-duplicate.xml | 0 ...-vfio-zpci-invalid-uid-valid-fid.s390x-latest.err | 0 .../hostdev-vfio-zpci-invalid-uid-valid-fid.xml | 0 ...tdev-vfio-zpci-multidomain-many.s390x-latest.args | 0 .../hostdev-vfio-zpci-multidomain-many.xml | 0 .../hostdev-vfio-zpci-set-zero.s390x-latest.err | 0 .../hostdev-vfio-zpci-set-zero.xml | 0 .../hostdev-vfio-zpci-uid-set-zero.s390x-latest.err | 0 .../hostdev-vfio-zpci-uid-set-zero.xml | 0 .../hostdev-vfio-zpci-wrong-arch.x86_64-latest.err | 0 .../hostdev-vfio-zpci-wrong-arch.xml | 0 .../hostdev-vfio-zpci.s390x-latest.args | 0 .../hostdev-vfio-zpci.xml | 0 .../hostdev-vfio.x86_64-latest.args | 0 .../hostdev-vfio.xml | 0 ...hostdevs-drive-address-conflict.x86_64-latest.err | 0 .../hostdevs-drive-address-conflict.xml | 0 .../hotplug-base.x86_64-latest.args | 0 .../hotplug-base.xml | 0 ...hugepages-default-1G-nodeset-2M.x86_64-latest.err | 0 .../hugepages-default-1G-nodeset-2M.xml | 0 .../hugepages-default-2M.x86_64-latest.args | 0 .../hugepages-default-2M.xml | 0 .../hugepages-default-5M.x86_64-latest.err | 0 .../hugepages-default-5M.xml | 0 .../hugepages-default-system-size.x86_64-latest.args | 0 .../hugepages-default-system-size.xml | 0 .../hugepages-default.x86_64-latest.args | 0 .../hugepages-default.xml | 0 .../hugepages-memaccess-invalid.x86_64-latest.err | 0 .../hugepages-memaccess-invalid.xml | 0 .../hugepages-memaccess.x86_64-latest.args | 0 .../hugepages-memaccess.xml | 0 .../hugepages-memaccess2.x86_64-latest.args | 0 .../hugepages-memaccess2.xml | 0 .../hugepages-memaccess3.x86_64-5.1.0.err | 0 .../hugepages-memaccess3.x86_64-latest.args | 0 .../hugepages-memaccess3.xml | 0 .../hugepages-nodeset-nonexist.x86_64-latest.err | 0 .../hugepages-nodeset-nonexist.xml | 0 .../hugepages-nodeset.x86_64-latest.args | 0 .../hugepages-nodeset.xml | 0 .../hugepages-numa-default-2M.x86_64-latest.args | 0 .../hugepages-numa-default-2M.xml | 0 .../hugepages-numa-default-dimm.x86_64-latest.args | 0 .../hugepages-numa-default-dimm.xml | 0 .../hugepages-numa-default.x86_64-latest.args | 0 .../hugepages-numa-default.xml | 0 ...hugepages-numa-nodeset-nonexist.x86_64-latest.err | 0 .../hugepages-numa-nodeset-nonexist.xml | 0 .../hugepages-numa-nodeset-part.x86_64-latest.args | 0 .../hugepages-numa-nodeset-part.xml | 0 .../hugepages-numa-nodeset.x86_64-latest.args | 0 .../hugepages-numa-nodeset.xml | 0 .../hugepages-nvdimm.x86_64-latest.args | 0 .../hugepages-nvdimm.xml | 0 .../hugepages-shared.x86_64-latest.args | 0 .../hugepages-shared.xml | 0 .../hvf-aarch64-virt-headless.aarch64-latest.args | 0 .../hvf-aarch64-virt-headless.xml | 0 .../hvf-x86_64-q35-headless.x86_64-latest.args | 0 .../hvf-x86_64-q35-headless.x86_64-latest.err | 0 .../hvf-x86_64-q35-headless.xml | 0 .../hyperv-off.x86_64-latest.args | 0 .../hyperv-off.xml | 0 .../hyperv-panic.x86_64-latest.args | 0 .../hyperv-panic.xml | 0 .../hyperv-passthrough.x86_64-6.1.0.args | 0 .../hyperv-passthrough.x86_64-latest.args | 0 .../hyperv-passthrough.xml | 0 .../hyperv-stimer-direct.x86_64-latest.args | 0 .../hyperv-stimer-direct.xml | 0 .../hyperv.x86_64-latest.args | 0 .../{qemuxml2argvdata => qemuxmlconfdata}/hyperv.xml | 0 .../input-linux.x86_64-latest.args | 0 .../input-linux.xml | 0 .../input-usbmouse-addr.x86_64-latest.args | 0 .../input-usbmouse-addr.xml | 0 .../input-usbmouse.x86_64-latest.args | 0 .../input-usbmouse.xml | 0 .../input-usbtablet.x86_64-latest.args | 0 .../input-usbtablet.xml | 0 .../input-virtio-ccw.s390x-latest.args | 0 .../input-virtio-ccw.xml | 0 .../intel-iommu-aw-bits.x86_64-latest.args | 0 .../intel-iommu-aw-bits.xml | 0 .../intel-iommu-caching-mode.x86_64-latest.args | 0 .../intel-iommu-caching-mode.xml | 0 .../intel-iommu-device-iotlb.x86_64-latest.args | 0 .../intel-iommu-device-iotlb.xml | 0 .../intel-iommu-eim.x86_64-latest.args | 0 .../intel-iommu-eim.xml | 0 .../intel-iommu-wrong-machine.x86_64-latest.err | 0 .../intel-iommu-wrong-machine.xml | 0 .../intel-iommu.x86_64-latest.args | 0 .../intel-iommu.xml | 0 .../iommu-smmuv3.aarch64-latest.args | 0 .../iommu-smmuv3.xml | 0 .../iothreads-disk-virtio-ccw.s390x-4.2.0.args | 0 .../iothreads-disk-virtio-ccw.xml | 0 .../iothreads-disk.x86_64-latest.args | 0 .../iothreads-disk.xml | 0 .../iothreads-ids-partial.x86_64-latest.args | 0 .../iothreads-ids-partial.xml | 0 .../iothreads-ids-pool-sizes.x86_64-latest.args | 0 .../iothreads-ids-pool-sizes.xml | 0 .../iothreads-ids.x86_64-latest.args | 0 .../iothreads-ids.xml | 0 .../iothreads-virtio-scsi-ccw.s390x-latest.args | 0 .../iothreads-virtio-scsi-ccw.xml | 0 .../iothreads-virtio-scsi-pci.x86_64-5.2.0.args | 0 .../iothreads-virtio-scsi-pci.x86_64-latest.args | 0 .../iothreads-virtio-scsi-pci.xml | 0 .../kvm-features-off.x86_64-latest.args | 0 .../kvm-features-off.xml | 0 .../kvm-features.x86_64-latest.args | 0 .../kvm-features.xml | 0 .../kvm-pit-delay.x86_64-latest.args | 0 .../kvm-pit-delay.xml | 0 .../kvm-pit-discard.x86_64-latest.args | 0 .../kvm-pit-discard.xml | 0 .../kvmclock+eoi-disabled.x86_64-latest.args | 0 .../kvmclock+eoi-disabled.xml | 0 .../kvmclock.x86_64-latest.args | 0 .../kvmclock.xml | 0 .../launch-security-s390-pv.s390x-latest.args | 0 .../launch-security-s390-pv.xml | 0 .../launch-security-sev-direct.x86_64-latest.args | 0 .../launch-security-sev-direct.xml | 0 ...urity-sev-missing-platform-info.x86_64-6.0.0.args | 0 .../launch-security-sev-missing-platform-info.xml | 0 .../launch-security-sev.x86_64-6.0.0.args | 0 .../launch-security-sev.xml | 0 .../lease.x86_64-latest.args | 0 .../{qemuxml2argvdata => qemuxmlconfdata}/lease.xml | 0 .../luks-disk-invalid.x86_64-latest.err | 0 .../luks-disk-invalid.xml | 0 .../luks-disks-source-both.x86_64-latest.err | 0 .../luks-disks-source-both.xml | 0 .../luks-disks-source-qcow2.x86_64-5.2.0.args | 0 .../luks-disks-source-qcow2.x86_64-latest.args | 0 .../luks-disks-source-qcow2.xml | 0 .../luks-disks-source.x86_64-latest.args | 0 .../luks-disks-source.xml | 0 .../luks-disks.x86_64-latest.args | 0 .../luks-disks.xml | 0 .../mach-virt-console-native.aarch64-latest.args | 0 .../mach-virt-console-native.xml | 0 .../mach-virt-console-virtio.aarch64-latest.args | 0 .../mach-virt-console-virtio.xml | 0 ...ch-virt-serial+console-native.aarch64-latest.args | 0 .../mach-virt-serial+console-native.xml | 0 .../mach-virt-serial-compat.aarch64-latest.args | 0 .../mach-virt-serial-compat.xml | 0 ...ach-virt-serial-invalid-machine.x86_64-latest.err | 0 .../mach-virt-serial-invalid-machine.xml | 0 .../mach-virt-serial-native.aarch64-latest.args | 0 .../mach-virt-serial-native.xml | 0 .../mach-virt-serial-pci.aarch64-latest.args | 0 .../mach-virt-serial-pci.xml | 0 .../mach-virt-serial-usb.aarch64-latest.args | 0 .../mach-virt-serial-usb.xml | 0 .../machine-aeskeywrap-off-cap.s390x-latest.args | 0 .../machine-aeskeywrap-off-cap.xml | 0 .../machine-aeskeywrap-off-caps.s390x-latest.args | 0 .../machine-aeskeywrap-off-caps.xml | 0 .../machine-aeskeywrap-on-cap.s390x-latest.args | 0 .../machine-aeskeywrap-on-cap.xml | 0 .../machine-aeskeywrap-on-caps.s390x-latest.args | 0 .../machine-aeskeywrap-on-caps.xml | 0 .../machine-aliases1.x86_64-latest.args | 0 .../machine-aliases1.xml | 0 .../machine-aliases2.x86_64-latest.args | 0 .../machine-aliases2.xml | 0 .../machine-core-off.x86_64-latest.args | 0 .../machine-core-off.xml | 0 .../machine-core-on.x86_64-latest.args | 0 .../machine-core-on.xml | 0 .../machine-deakeywrap-off-cap.s390x-latest.args | 0 .../machine-deakeywrap-off-cap.xml | 0 .../machine-deakeywrap-off-caps.s390x-latest.args | 0 .../machine-deakeywrap-off-caps.xml | 0 .../machine-deakeywrap-on-cap.s390x-latest.args | 0 .../machine-deakeywrap-on-cap.xml | 0 .../machine-deakeywrap-on-caps.s390x-latest.args | 0 .../machine-deakeywrap-on-caps.xml | 0 .../machine-keywrap-none-caps.s390x-latest.args | 0 .../machine-keywrap-none-caps.xml | 0 .../machine-keywrap-none.s390x-latest.args | 0 .../machine-keywrap-none.xml | 0 .../machine-loadparm-hostdev.s390x-latest.args | 0 .../machine-loadparm-hostdev.xml | 0 ...adparm-multiple-disks-nets-s390.s390x-latest.args | 0 .../machine-loadparm-multiple-disks-nets-s390.xml | 0 .../machine-loadparm-net-s390.s390x-latest.args | 0 .../machine-loadparm-net-s390.xml | 0 ...hine-loadparm-s390-char-invalid.x86_64-latest.err | 0 .../machine-loadparm-s390-char-invalid.xml | 0 ...chine-loadparm-s390-len-invalid.x86_64-latest.err | 0 .../machine-loadparm-s390-len-invalid.xml | 0 .../machine-loadparm-s390.s390x-latest.args | 0 .../machine-loadparm-s390.xml | 0 .../machine-smm-off.x86_64-latest.args | 0 .../machine-smm-off.xml | 0 .../machine-smm-on.x86_64-latest.args | 0 .../machine-smm-on.xml | 0 .../machine-vmport-opt.x86_64-latest.args | 0 .../machine-vmport-opt.xml | 0 .../memfd-memory-default-hugepage.x86_64-latest.args | 0 .../memfd-memory-default-hugepage.xml | 0 .../memfd-memory-numa.x86_64-latest.args | 0 .../memfd-memory-numa.xml | 0 .../memory-align-fail.x86_64-latest.err | 0 .../memory-align-fail.xml | 0 .../memory-hotplug-dimm-addr.x86_64-latest.args | 0 .../memory-hotplug-dimm-addr.xml | 0 .../memory-hotplug-dimm.x86_64-latest.args | 0 .../memory-hotplug-dimm.xml | 0 ...mory-hotplug-invalid-targetnode.x86_64-latest.err | 0 .../memory-hotplug-invalid-targetnode.xml | 0 .../memory-hotplug-multiple.x86_64-latest.args | 0 .../memory-hotplug-multiple.xml | 0 .../memory-hotplug-nonuma.x86_64-latest.err | 0 .../memory-hotplug-nonuma.xml | 0 .../memory-hotplug-nvdimm-access.x86_64-latest.args | 0 .../memory-hotplug-nvdimm-access.xml | 0 .../memory-hotplug-nvdimm-align.x86_64-5.2.0.args | 0 .../memory-hotplug-nvdimm-align.x86_64-latest.args | 0 .../memory-hotplug-nvdimm-align.xml | 0 .../memory-hotplug-nvdimm-label.x86_64-5.2.0.args | 0 .../memory-hotplug-nvdimm-label.x86_64-latest.args | 0 .../memory-hotplug-nvdimm-label.xml | 0 .../memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args | 0 .../memory-hotplug-nvdimm-pmem.x86_64-latest.args | 0 .../memory-hotplug-nvdimm-pmem.xml | 0 ...hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args | 0 .../memory-hotplug-nvdimm-ppc64-abi-update.xml | 0 .../memory-hotplug-nvdimm-ppc64.ppc64-latest.args | 0 .../memory-hotplug-nvdimm-ppc64.xml | 0 .../memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args | 0 ...memory-hotplug-nvdimm-readonly.x86_64-latest.args | 0 .../memory-hotplug-nvdimm-readonly.xml | 0 .../memory-hotplug-nvdimm.x86_64-latest.args | 0 .../memory-hotplug-nvdimm.xml | 0 ...hotplug-ppc64-nonuma-abi-update.ppc64-latest.args | 0 .../memory-hotplug-ppc64-nonuma-abi-update.xml | 0 .../memory-hotplug-ppc64-nonuma.ppc64-latest.args | 0 .../memory-hotplug-ppc64-nonuma.xml | 0 ...plug-virtio-mem-overlap-address.x86_64-latest.err | 0 .../memory-hotplug-virtio-mem-overlap-address.xml | 0 .../memory-hotplug-virtio-mem.x86_64-latest.args | 0 .../memory-hotplug-virtio-mem.xml | 0 .../memory-hotplug-virtio-pmem.x86_64-5.2.0.args | 0 .../memory-hotplug-virtio-pmem.x86_64-latest.args | 0 .../memory-hotplug-virtio-pmem.xml | 0 .../memory-hotplug.x86_64-latest.args | 0 .../memory-hotplug.xml | 0 .../memorybacking-set.x86_64-latest.args | 0 .../memorybacking-set.xml | 0 .../memorybacking-unset.x86_64-latest.args | 0 .../memorybacking-unset.xml | 0 .../memtune-unlimited.x86_64-latest.args | 0 .../memtune-unlimited.xml | 0 .../memtune.x86_64-latest.args | 0 .../memtune.xml | 0 .../metadata-duplicate.x86_64-latest.args | 0 .../metadata-duplicate.xml | 0 .../metadata.x86_64-latest.args | 0 .../metadata.xml | 0 .../migrate-numa-unaligned.x86_64-latest.args | 0 .../migrate-numa-unaligned.xml | 0 .../migrate.x86_64-latest.args | 0 .../migrate.xml | 0 .../minimal-no-memory.x86_64-latest.err | 0 .../minimal-no-memory.xml | 0 .../minimal.x86_64-latest.args | 0 .../minimal.xml | 0 .../misc-acpi.x86_64-latest.args | 0 .../misc-acpi.xml | 0 .../misc-disable-s3.x86_64-latest.args | 0 .../misc-disable-s3.xml | 0 .../misc-disable-suspends.x86_64-latest.args | 0 .../misc-disable-suspends.xml | 0 .../misc-enable-s4.x86_64-latest.args | 0 .../misc-enable-s4.xml | 0 .../misc-no-reboot.x86_64-5.2.0.args | 0 .../misc-no-reboot.x86_64-latest.args | 0 .../misc-no-reboot.xml | 0 .../misc-uuid.x86_64-latest.args | 0 .../misc-uuid.xml | 0 .../missing-machine.x86_64-latest.err | 0 .../missing-machine.xml | 0 .../mlock-off.x86_64-latest.args | 0 .../mlock-off.xml | 0 .../mlock-on.x86_64-latest.args | 0 .../mlock-on.xml | 0 .../multifunction-pci-device.x86_64-latest.args | 0 .../multifunction-pci-device.xml | 0 .../name-escape.x86_64-latest.args | 0 .../name-escape.xml | 0 .../net-bandwidth.x86_64-latest.args | 0 .../net-bandwidth.xml | 0 .../net-bandwidth2.x86_64-latest.args | 0 .../net-bandwidth2.xml | 0 .../net-client.x86_64-latest.args | 0 .../net-client.xml | 0 .../net-coalesce.x86_64-latest.args | 0 .../net-coalesce.xml | 0 .../net-eth-hostip.x86_64-latest.args | 0 .../net-eth-hostip.xml | 0 .../net-eth-ifname.x86_64-latest.args | 0 .../net-eth-ifname.xml | 0 .../net-eth-names.x86_64-latest.args | 0 .../net-eth-names.xml | 0 .../net-eth-unmanaged-tap.x86_64-latest.args | 0 .../net-eth-unmanaged-tap.xml | 0 .../net-eth.x86_64-latest.args | 0 .../net-eth.xml | 0 .../net-hostdev-bootorder.x86_64-latest.args | 0 .../net-hostdev-bootorder.xml | 0 .../net-hostdev-fail.x86_64-latest.err | 0 .../net-hostdev-fail.xml | 0 .../net-hostdev-multidomain.x86_64-latest.args | 0 .../net-hostdev-multidomain.xml | 0 .../net-hostdev-vfio-multidomain.x86_64-latest.args | 0 .../net-hostdev-vfio-multidomain.xml | 0 .../net-hostdev-vfio.x86_64-latest.args | 0 .../net-hostdev-vfio.xml | 0 .../net-hostdev.x86_64-latest.args | 0 .../net-hostdev.xml | 0 .../net-isolated-port.x86_64-latest.args | 0 .../net-isolated-port.xml | 0 .../net-linkstate.x86_64-latest.args | 0 .../net-linkstate.xml | 0 .../net-many-models.x86_64-latest.args | 0 .../net-many-models.xml | 0 .../net-mcast.x86_64-latest.args | 0 .../net-mcast.xml | 0 .../net-midonet.x86_64-latest.args | 0 .../net-midonet.xml | 0 .../net-mtu.x86_64-latest.args | 0 .../net-mtu.xml | 0 .../net-openvswitch.x86_64-latest.args | 0 .../net-openvswitch.xml | 0 .../net-server.x86_64-latest.args | 0 .../net-server.xml | 0 .../net-udp.x86_64-latest.args | 0 .../net-udp.xml | 0 .../net-user-addr.x86_64-latest.args | 0 .../net-user-addr.xml | 0 .../net-user-passt.x86_64-7.2.0.args | 0 .../net-user-passt.x86_64-latest.args | 0 .../net-user-passt.xml | 0 .../net-user-slirp-portforward.x86_64-latest.err | 0 .../net-user-slirp-portforward.xml | 0 .../net-user.x86_64-latest.args | 0 .../net-user.xml | 0 .../net-vdpa-multiqueue.x86_64-latest.args | 0 .../net-vdpa-multiqueue.xml | 0 .../net-vdpa.x86_64-latest.args | 0 .../net-vdpa.xml | 0 .../net-vhostuser-fail.x86_64-latest.err | 0 .../net-vhostuser-fail.xml | 0 .../net-vhostuser-multiq.x86_64-latest.args | 0 .../net-vhostuser-multiq.xml | 0 .../net-vhostuser.x86_64-latest.args | 0 .../net-vhostuser.xml | 0 .../net-virtio-ccw.s390x-latest.args | 0 .../net-virtio-ccw.xml | 0 .../net-virtio-device.x86_64-latest.args | 0 .../net-virtio-device.xml | 0 .../net-virtio-disable-offloads.x86_64-latest.args | 0 .../net-virtio-disable-offloads.xml | 0 .../net-virtio-netdev.x86_64-latest.args | 0 .../net-virtio-netdev.xml | 0 .../net-virtio-network-portgroup.x86_64-latest.args | 0 .../net-virtio-network-portgroup.xml | 0 .../net-virtio-rss.x86_64-latest.args | 0 .../net-virtio-rss.xml | 0 ...virtio-rxqueuesize-invalid-size.x86_64-latest.err | 0 .../net-virtio-rxqueuesize-invalid-size.xml | 0 .../net-virtio-rxtxqueuesize.x86_64-latest.args | 0 .../net-virtio-rxtxqueuesize.xml | 0 .../net-virtio-teaming-hostdev.x86_64-latest.args | 0 .../net-virtio-teaming-hostdev.xml | 0 .../net-virtio-teaming-network.x86_64-latest.args | 0 .../net-virtio-teaming-network.xml | 0 .../net-virtio-teaming.x86_64-latest.args | 0 .../net-virtio-teaming.xml | 0 .../net-virtio-vhost.x86_64-latest.args | 0 .../net-virtio-vhost.xml | 0 .../net-virtio.x86_64-latest.args | 0 .../net-virtio.xml | 0 .../non-x86_64-timer-error.s390x-latest.err | 0 .../non-x86_64-timer-error.xml | 0 .../nosharepages.x86_64-latest.args | 0 .../nosharepages.xml | 0 .../numad-auto-memory-vcpu-cpuset.x86_64-latest.args | 0 .../numad-auto-memory-vcpu-cpuset.xml | 0 ...y-vcpu-no-cpuset-and-placement.x86_64-latest.args | 0 ...umad-auto-memory-vcpu-no-cpuset-and-placement.xml | 0 .../numad-auto-vcpu-no-numatune.x86_64-latest.args | 0 .../numad-auto-vcpu-no-numatune.xml | 0 ...vcpu-static-numatune-no-nodeset.x86_64-latest.err | 0 .../numad-auto-vcpu-static-numatune-no-nodeset.xml | 0 ...umad-auto-vcpu-static-numatune.x86_64-latest.args | 0 .../numad-auto-vcpu-static-numatune.xml | 0 .../numad-static-memory-auto-vcpu.x86_64-latest.args | 0 .../numad-static-memory-auto-vcpu.xml | 0 .../numad-static-vcpu-no-numatune.x86_64-latest.args | 0 .../numad-static-vcpu-no-numatune.xml | 0 .../numad.x86_64-latest.args | 0 .../{qemuxml2argvdata => qemuxmlconfdata}/numad.xml | 0 .../numatune-auto-nodeset-invalid.x86_64-latest.args | 0 .../numatune-auto-nodeset-invalid.xml | 0 .../numatune-auto-prefer.x86_64-latest.args | 0 .../numatune-auto-prefer.xml | 0 .../numatune-distances.x86_64-latest.args | 0 .../numatune-distances.xml | 0 .../numatune-hmat-none.x86_64-latest.args | 0 .../numatune-hmat-none.xml | 0 .../numatune-hmat.x86_64-latest.args | 0 .../numatune-hmat.xml | 0 .../numatune-memnode-invalid-mode.x86_64-latest.err | 0 .../numatune-memnode-invalid-mode.xml | 0 .../numatune-memnode-no-memory.x86_64-latest.args | 0 .../numatune-memnode-no-memory.xml | 0 .../numatune-memnode-nocpu.x86_64-latest.err | 0 .../numatune-memnode-nocpu.xml | 0 ...node-restrictive-mode-err-mixed.x86_64-latest.err | 0 .../numatune-memnode-restrictive-mode-err-mixed.xml | 0 ...atune-memnode-restrictive-mode.x86_64-latest.args | 0 .../numatune-memnode-restrictive-mode.xml | 0 ...memnode-unavailable-restrictive.x86_64-latest.err | 0 .../numatune-memnode-unavailable-restrictive.xml | 0 ...tune-memnode-unavailable-strict.x86_64-latest.err | 0 .../numatune-memnode-unavailable-strict.xml | 0 .../numatune-memnode.x86_64-5.2.0.args | 0 .../numatune-memnode.x86_64-latest.args | 0 .../numatune-memnode.xml | 0 .../numatune-memnodes-problematic.x86_64-latest.err | 0 .../numatune-memnodes-problematic.xml | 0 ...numatune-memory-invalid-nodeset.x86_64-latest.err | 0 .../numatune-memory-invalid-nodeset.xml | 0 .../numatune-no-vcpu.x86_64-latest.args | 0 .../numatune-no-vcpu.xml | 0 ...-static-nodeset-exceed-hostnode.x86_64-latest.err | 0 .../numatune-static-nodeset-exceed-hostnode.xml | 0 .../numatune-system-memory.x86_64-latest.args | 0 .../numatune-system-memory.xml | 0 .../numavcpus-topology-mismatch.x86_64-latest.args | 0 .../numavcpus-topology-mismatch.xml | 0 .../pages-dimm-discard.x86_64-latest.args | 0 .../pages-dimm-discard.xml | 0 .../pages-discard-hugepages.x86_64-latest.args | 0 .../pages-discard-hugepages.xml | 0 .../pages-discard.x86_64-latest.args | 0 .../pages-discard.xml | 0 .../panic-double.x86_64-latest.args | 0 .../panic-double.xml | 0 .../panic-no-address.x86_64-latest.args | 0 .../panic-no-address.xml | 0 .../panic-pseries.ppc64-latest.args | 0 .../panic-pseries.xml | 0 .../panic.x86_64-latest.args | 0 .../{qemuxml2argvdata => qemuxmlconfdata}/panic.xml | 0 .../parallel-parport-chardev.x86_64-latest.args | 0 .../parallel-parport-chardev.xml | 0 .../parallel-tcp-chardev.x86_64-latest.args | 0 .../parallel-tcp-chardev.xml | 0 .../parallel-unix-chardev.x86_64-latest.args | 0 .../parallel-unix-chardev.xml | 0 ...i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err | 0 ...40fx-acpi-root-hotplug-disable.x86_64-latest.args | 0 .../pc-i440fx-acpi-root-hotplug-disable.xml | 0 ...-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err | 0 ...440fx-acpi-root-hotplug-enable.x86_64-latest.args | 0 .../pc-i440fx-acpi-root-hotplug-enable.xml | 0 .../pci-autoadd-addr.x86_64-latest.args | 0 .../pci-autoadd-addr.xml | 0 .../pci-autoadd-idx.x86_64-latest.args | 0 .../pci-autoadd-idx.xml | 0 .../pci-autofill-addr.x86_64-latest.args | 0 .../pci-autofill-addr.xml | 0 .../pci-bridge-duplicate-index.x86_64-latest.err | 0 .../pci-bridge-duplicate-index.xml | 0 .../pci-bridge-many-disks.x86_64-latest.args | 0 .../pci-bridge-many-disks.xml | 0 ...i-bridge-negative-index-invalid.x86_64-latest.err | 0 .../pci-bridge-negative-index-invalid.xml | 0 .../pci-bridge.x86_64-latest.args | 0 .../pci-bridge.xml | 0 .../pci-bus-invalid.x86_64-latest.err | 0 .../pci-bus-invalid.xml | 0 .../pci-domain-invalid.x86_64-latest.err | 0 .../pci-domain-invalid.xml | 0 .../pci-expander-bus-bad-bus.x86_64-latest.err | 0 .../pci-expander-bus-bad-bus.xml | 0 .../pci-expander-bus-bad-machine.x86_64-latest.err | 0 .../pci-expander-bus-bad-machine.xml | 0 .../pci-expander-bus-bad-node.x86_64-latest.err | 0 .../pci-expander-bus-bad-node.xml | 0 .../pci-expander-bus.x86_64-latest.args | 0 .../pci-expander-bus.xml | 0 .../pci-function-invalid.x86_64-latest.err | 0 .../pci-function-invalid.xml | 0 .../pci-many.x86_64-latest.args | 0 .../pci-many.xml | 0 .../pci-rom-disabled-invalid.x86_64-latest.args | 0 .../pci-rom-disabled-invalid.xml | 0 .../pci-rom-disabled.x86_64-latest.args | 0 .../pci-rom-disabled.xml | 0 .../pci-rom.x86_64-latest.args | 0 .../pci-rom.xml | 0 .../pci-root-address.x86_64-latest.err | 0 .../pci-root-address.xml | 0 .../pci-root-nonzero-index.x86_64-latest.err | 0 .../pci-root-nonzero-index.xml | 0 .../pci-serial-dev-chardev.x86_64-latest.args | 0 .../pci-serial-dev-chardev.xml | 0 .../pci-slot-invalid.x86_64-latest.err | 0 .../pci-slot-invalid.xml | 0 .../pcie-expander-bus-aarch64.aarch64-latest.args | 0 .../pcie-expander-bus-aarch64.xml | 0 .../pcie-expander-bus-bad-bus.x86_64-latest.err | 0 .../pcie-expander-bus-bad-bus.xml | 0 .../pcie-expander-bus-bad-machine.x86_64-latest.err | 0 .../pcie-expander-bus-bad-machine.xml | 0 .../pcie-expander-bus.x86_64-latest.args | 0 .../pcie-expander-bus.xml | 0 .../pcie-root-port-model-generic.x86_64-latest.args | 0 .../pcie-root-port-model-generic.xml | 0 .../pcie-root-port-model-ioh3420.x86_64-latest.args | 0 .../pcie-root-port-model-ioh3420.xml | 0 .../pcie-root-port-nohotplug.x86_64-latest.args | 0 .../pcie-root-port-nohotplug.xml | 0 .../pcie-root-port-too-many.x86_64-latest.err | 0 .../pcie-root-port-too-many.xml | 0 .../pcie-root-port.x86_64-latest.args | 0 .../pcie-root-port.xml | 0 .../pcie-root.x86_64-latest.args | 0 .../pcie-root.xml | 0 .../pcie-switch-downstream-port.x86_64-latest.args | 0 .../pcie-switch-downstream-port.xml | 0 .../pcie-switch-upstream-port.x86_64-latest.args | 0 .../pcie-switch-upstream-port.xml | 0 .../pcihole64-gib.x86_64-latest.args | 0 .../pcihole64-gib.xml | 0 .../pcihole64-q35.x86_64-latest.args | 0 .../pcihole64-q35.xml | 0 .../pcihole64.x86_64-latest.args | 0 .../pcihole64.xml | 0 .../pmu-feature-off.x86_64-latest.args | 0 .../pmu-feature-off.xml | 0 .../pmu-feature.x86_64-latest.args | 0 .../pmu-feature.xml | 0 .../ppc-dtb.ppc-latest.args | 0 .../ppc-dtb.xml | 0 ...c64-default-cpu-kvm-pseries-2.7.ppc64-latest.args | 0 .../ppc64-default-cpu-kvm-pseries-2.7.xml | 0 ...c64-default-cpu-kvm-pseries-3.1.ppc64-latest.args | 0 .../ppc64-default-cpu-kvm-pseries-3.1.xml | 0 ...c64-default-cpu-kvm-pseries-4.2.ppc64-latest.args | 0 .../ppc64-default-cpu-kvm-pseries-4.2.xml | 0 ...c64-default-cpu-tcg-pseries-2.7.ppc64-latest.args | 0 .../ppc64-default-cpu-tcg-pseries-2.7.xml | 0 ...c64-default-cpu-tcg-pseries-3.1.ppc64-latest.args | 0 .../ppc64-default-cpu-tcg-pseries-3.1.xml | 0 ...c64-default-cpu-tcg-pseries-4.2.ppc64-latest.args | 0 .../ppc64-default-cpu-tcg-pseries-4.2.xml | 0 .../ppc64-pseries-graphics.ppc64-latest.args | 0 .../ppc64-pseries-graphics.xml | 0 .../ppc64-pseries-headless.ppc64-latest.args | 0 .../ppc64-pseries-headless.xml | 0 .../ppc64-tpm-double.ppc64-latest.err | 0 .../ppc64-tpm-double.xml | 0 .../ppc64-tpmproxy-double.ppc64-latest.err | 0 .../ppc64-tpmproxy-double.xml | 0 .../ppc64-tpmproxy-single.ppc64-latest.args | 0 .../ppc64-tpmproxy-single.xml | 0 .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 0 .../ppc64-tpmproxy-with-tpm.xml | 0 .../ppc64-usb-controller-legacy.ppc64-latest.args | 0 .../ppc64-usb-controller-legacy.xml | 0 .../ppc64-usb-controller-qemu-xhci.ppc64-latest.args | 0 .../ppc64-usb-controller-qemu-xhci.xml | 0 .../ppc64-usb-controller.ppc64-latest.args | 0 .../ppc64-usb-controller.xml | 0 .../ppce500-serial.ppc-latest.args | 0 .../ppce500-serial.xml | 0 .../pseries-basic.ppc64-latest.args | 0 .../pseries-basic.xml | 0 .../pseries-console-native.ppc64-latest.args | 0 .../pseries-console-native.xml | 0 .../pseries-console-virtio.ppc64-latest.args | 0 .../pseries-console-virtio.xml | 0 .../pseries-cpu-compat-power10.ppc64-latest.args | 0 .../pseries-cpu-compat-power10.ppc64-latest.err | 0 .../pseries-cpu-compat-power10.xml | 0 .../pseries-cpu-compat-power9.ppc64-latest.args | 0 .../pseries-cpu-compat-power9.ppc64-latest.err | 0 .../pseries-cpu-compat-power9.xml | 0 .../pseries-cpu-compat.ppc64-latest.args | 0 .../pseries-cpu-compat.xml | 0 .../pseries-cpu-exact.ppc64-latest.args | 0 .../pseries-cpu-exact.xml | 0 .../pseries-cpu-le.ppc64-latest.args | 0 .../pseries-cpu-le.xml | 0 .../pseries-default-phb-numa-node.ppc64-latest.err | 0 .../pseries-default-phb-numa-node.xml | 0 ...series-features-invalid-machine.x86_64-latest.err | 0 .../pseries-features-invalid-machine.xml | 0 .../pseries-features.ppc64-4.2.0.args | 0 .../pseries-features.ppc64-latest.args | 0 .../pseries-features.xml | 0 .../pseries-hostdevs-1.ppc64-latest.args | 0 .../pseries-hostdevs-1.xml | 0 .../pseries-hostdevs-2.ppc64-latest.args | 0 .../pseries-hostdevs-2.xml | 0 .../pseries-hostdevs-3.ppc64-latest.args | 0 .../pseries-hostdevs-3.xml | 0 .../pseries-many-buses-1.ppc64-latest.args | 0 .../pseries-many-buses-1.xml | 0 .../pseries-many-buses-2.ppc64-latest.args | 0 .../pseries-many-buses-2.xml | 0 .../pseries-many-devices.ppc64-latest.args | 0 .../pseries-many-devices.xml | 0 .../pseries-no-parallel.ppc64-latest.err | 0 .../pseries-no-parallel.xml | 0 .../pseries-nvram.ppc64-latest.args | 0 .../pseries-nvram.xml | 0 .../pseries-panic-address.ppc64-latest.err | 0 .../pseries-panic-address.xml | 0 .../pseries-panic-missing.ppc64-latest.args | 0 .../pseries-panic-missing.xml | 0 .../pseries-panic-no-address.ppc64-latest.args | 0 .../pseries-panic-no-address.xml | 0 .../pseries-phb-default-missing.ppc64-latest.args | 0 .../pseries-phb-default-missing.xml | 0 ...eries-phb-invalid-target-index-1.ppc64-latest.err | 0 .../pseries-phb-invalid-target-index-1.xml | 0 ...eries-phb-invalid-target-index-2.ppc64-latest.err | 0 .../pseries-phb-invalid-target-index-2.xml | 0 ...eries-phb-invalid-target-index-3.ppc64-latest.err | 0 .../pseries-phb-invalid-target-index-3.xml | 0 .../pseries-phb-numa-node.ppc64-latest.args | 0 .../pseries-phb-numa-node.xml | 0 .../pseries-phb-simple.ppc64-latest.args | 0 .../pseries-phb-simple.xml | 0 .../pseries-phb-user-alias.ppc64-latest.args | 0 .../pseries-phb-user-alias.xml | 0 .../pseries-serial+console-native.ppc64-latest.args | 0 .../pseries-serial+console-native.xml | 0 .../pseries-serial-compat.ppc64-latest.args | 0 .../pseries-serial-compat.xml | 0 .../pseries-serial-invalid-machine.x86_64-latest.err | 0 .../pseries-serial-invalid-machine.xml | 0 .../pseries-serial-native.ppc64-latest.args | 0 .../pseries-serial-native.xml | 0 .../pseries-serial-pci.ppc64-latest.args | 0 .../pseries-serial-pci.xml | 0 .../pseries-serial-usb.ppc64-latest.args | 0 .../pseries-serial-usb.xml | 0 .../pseries-spaprvio-invalid.ppc64-latest.err | 0 .../pseries-spaprvio-invalid.xml | 0 .../pseries-usb-default.ppc64-latest.args | 0 .../pseries-usb-default.xml | 0 .../pseries-usb-kbd.ppc64-latest.args | 0 .../pseries-usb-kbd.xml | 0 .../pseries-usb-multi.ppc64-latest.args | 0 .../pseries-usb-multi.xml | 0 .../pseries-vio-address-clash.ppc64-latest.err | 0 .../pseries-vio-address-clash.xml | 0 .../pseries-vio-user-assigned.ppc64-latest.args | 0 .../pseries-vio-user-assigned.xml | 0 .../pseries-vio.ppc64-latest.args | 0 .../pseries-vio.xml | 0 .../pv-spinlock-disabled.x86_64-latest.args | 0 .../pv-spinlock-disabled.xml | 0 .../pv-spinlock-enabled.x86_64-latest.args | 0 .../pv-spinlock-enabled.xml | 0 .../pvpanic-pci-aarch64.aarch64-latest.args | 0 .../pvpanic-pci-aarch64.xml | 0 ...ic-pci-invalid-address-aarch64.aarch64-latest.err | 0 .../pvpanic-pci-invalid-address-aarch64.xml | 0 ...vpanic-pci-no-address-aarch64.aarch64-latest.args | 0 .../pvpanic-pci-no-address-aarch64.xml | 0 .../pvpanic-pci-x86_64.x86_64-latest.args | 0 .../pvpanic-pci-x86_64.xml | 0 .../q35-default-devices-only.x86_64-4.2.0.args | 0 .../q35-default-devices-only.x86_64-latest.args | 0 .../q35-default-devices-only.xml | 0 .../q35-dmi-bad-address1.x86_64-latest.err | 0 .../q35-dmi-bad-address1.xml | 0 .../q35-dmi-bad-address2.x86_64-latest.err | 0 .../q35-dmi-bad-address2.xml | 0 .../q35-multifunction.x86_64-4.2.0.args | 0 .../q35-multifunction.x86_64-latest.args | 0 .../q35-multifunction.xml | 0 .../q35-pci-force-address.x86_64-latest.args | 0 .../q35-pci-force-address.xml | 0 .../q35-pcie-autoadd.x86_64-4.2.0.args | 0 .../q35-pcie-autoadd.x86_64-latest.args | 0 .../q35-pcie-autoadd.xml | 0 .../q35-pcie.x86_64-4.2.0.args | 0 .../q35-pcie.x86_64-latest.args | 0 .../q35-pcie.xml | 0 .../q35-usb2-multi.x86_64-latest.args | 0 .../q35-usb2-multi.xml | 0 .../q35-usb2-reorder.x86_64-latest.args | 0 .../q35-usb2-reorder.xml | 0 .../q35-usb2.x86_64-latest.args | 0 .../q35-usb2.xml | 0 .../q35-virt-manager-basic.x86_64-4.2.0.args | 0 .../q35-virt-manager-basic.x86_64-latest.args | 0 .../q35-virt-manager-basic.xml | 0 .../q35-wrong-root.x86_64-latest.err | 0 .../q35-wrong-root.xml | 0 .../q35.x86_64-latest.args | 0 tests/{qemuxml2argvdata => qemuxmlconfdata}/q35.xml | 0 .../qemu-ns-alt.x86_64-latest.args | 0 .../qemu-ns-alt.xml | 0 .../qemu-ns-commandline-ns0.x86_64-latest.args | 0 .../qemu-ns-commandline-ns0.xml | 0 .../qemu-ns-commandline-ns1.x86_64-latest.args | 0 .../qemu-ns-commandline-ns1.xml | 0 .../qemu-ns-commandline.x86_64-latest.args | 0 .../qemu-ns-commandline.xml | 0 ...qemu-ns-domain-commandline-ns0.x86_64-latest.args | 0 .../qemu-ns-domain-commandline-ns0.xml | 0 .../qemu-ns-domain-commandline.x86_64-latest.args | 0 .../qemu-ns-domain-commandline.xml | 0 .../qemu-ns-domain-ns0.x86_64-latest.args | 0 .../qemu-ns-domain-ns0.xml | 0 .../qemu-ns-no-env.x86_64-latest.args | 0 .../qemu-ns-no-env.xml | 0 .../qemu-ns.x86_64-latest.args | 0 .../qemu-ns.xml | 0 .../reboot-timeout-disabled.x86_64-latest.args | 0 .../reboot-timeout-disabled.xml | 0 .../reboot-timeout-enabled.x86_64-latest.args | 0 .../reboot-timeout-enabled.xml | 0 .../restore-v2-fd.x86_64-latest.args | 0 .../restore-v2-fd.xml | 0 .../restore-v2.x86_64-latest.args | 0 .../restore-v2.xml | 0 .../riscv64-virt-graphics.riscv64-latest.args | 0 .../riscv64-virt-graphics.xml | 0 .../riscv64-virt-headless-mmio.riscv64-latest.args | 0 .../riscv64-virt-headless-mmio.xml | 0 .../riscv64-virt-headless.riscv64-latest.args | 0 .../riscv64-virt-headless.xml | 0 ...s390-allow-bogus-usb-controller.s390x-latest.args | 0 .../s390-allow-bogus-usb-controller.xml | 0 .../s390-allow-bogus-usb-none.s390x-latest.args | 0 .../s390-allow-bogus-usb-none.xml | 0 .../s390-async-teardown-disabled.s390x-6.0.0.args | 0 .../s390-async-teardown-disabled.s390x-latest.args | 0 .../s390-async-teardown-disabled.xml | 0 .../s390-async-teardown-no-attrib.s390x-latest.args | 0 .../s390-async-teardown-no-attrib.xml | 0 .../s390-async-teardown.s390x-6.0.0.err | 0 .../s390-async-teardown.s390x-latest.args | 0 .../s390-async-teardown.xml | 0 ...-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 0 .../s390-default-cpu-kvm-ccw-virtio-2.7.xml | 0 ...-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 0 .../s390-default-cpu-kvm-ccw-virtio-4.2.xml | 0 ...-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args | 0 .../s390-default-cpu-tcg-ccw-virtio-2.7.xml | 0 ...-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args | 0 .../s390-default-cpu-tcg-ccw-virtio-4.2.xml | 0 .../s390-defaultconsole.s390x-latest.args | 0 .../s390-defaultconsole.xml | 0 .../s390-no-parallel.s390x-latest.err | 0 .../s390-no-parallel.xml | 0 .../s390-panic-address.s390x-latest.err | 0 .../s390-panic-address.xml | 0 .../s390-panic-missing.s390x-latest.args | 0 .../s390-panic-missing.xml | 0 .../s390-panic-no-address.s390x-latest.args | 0 .../s390-panic-no-address.xml | 0 .../s390-panic.s390x-latest.args | 0 .../s390-panic.xml | 0 .../s390-serial-2.s390x-latest.args | 0 .../s390-serial-2.xml | 0 .../s390-serial-console.s390x-latest.args | 0 .../s390-serial-console.xml | 0 .../s390-serial.s390x-latest.args | 0 .../s390-serial.xml | 0 .../s390x-ccw-graphics.s390x-latest.args | 0 .../s390x-ccw-graphics.xml | 0 .../s390x-ccw-headless.s390x-latest.args | 0 .../s390x-ccw-headless.xml | 0 .../seclabel-dac-none.x86_64-latest.args | 0 .../seclabel-dac-none.xml | 0 .../seclabel-device-duplicates.x86_64-latest.err | 0 .../seclabel-device-duplicates.xml | 0 .../seclabel-device-multiple.x86_64-latest.args | 0 .../seclabel-device-multiple.xml | 0 ...seclabel-device-relabel-invalid.x86_64-latest.err | 0 .../seclabel-device-relabel-invalid.xml | 0 .../seclabel-dynamic-baselabel.x86_64-latest.args | 0 .../seclabel-dynamic-baselabel.xml | 0 .../seclabel-dynamic-labelskip.x86_64-latest.args | 0 .../seclabel-dynamic-labelskip.xml | 0 .../seclabel-dynamic-none-relabel.x86_64-latest.args | 0 .../seclabel-dynamic-none-relabel.xml | 0 .../seclabel-dynamic-none.x86_64-latest.args | 0 .../seclabel-dynamic-none.xml | 0 .../seclabel-dynamic-override.x86_64-latest.args | 0 .../seclabel-dynamic-override.xml | 0 .../seclabel-dynamic-relabel.x86_64-latest.args | 0 .../seclabel-dynamic-relabel.xml | 0 .../seclabel-dynamic.x86_64-latest.args | 0 .../seclabel-dynamic.xml | 0 .../seclabel-multiple.x86_64-latest.err | 0 .../seclabel-multiple.xml | 0 .../seclabel-none.x86_64-latest.args | 0 .../seclabel-none.xml | 0 .../seclabel-static-labelskip.x86_64-latest.args | 0 .../seclabel-static-labelskip.xml | 0 .../seclabel-static-relabel.x86_64-latest.args | 0 .../seclabel-static-relabel.xml | 0 .../seclabel-static.x86_64-latest.args | 0 .../seclabel-static.xml | 0 .../serial-debugcon.x86_64-latest.args | 0 .../serial-debugcon.xml | 0 .../serial-dev-chardev-iobase.x86_64-latest.args | 0 .../serial-dev-chardev-iobase.xml | 0 .../serial-dev-chardev.x86_64-latest.args | 0 .../serial-dev-chardev.xml | 0 .../serial-file-chardev.x86_64-latest.args | 0 .../serial-file-chardev.xml | 0 .../serial-file-log.x86_64-latest.args | 0 .../serial-file-log.xml | 0 .../serial-many-chardev.x86_64-latest.args | 0 .../serial-many-chardev.xml | 0 .../serial-pty-chardev.x86_64-latest.args | 0 .../serial-pty-chardev.xml | 0 .../serial-spiceport.x86_64-latest.args | 0 .../serial-spiceport.xml | 0 .../serial-target-port-auto.x86_64-latest.args | 0 .../serial-target-port-auto.xml | 0 .../serial-tcp-chardev.x86_64-latest.args | 0 .../serial-tcp-chardev.xml | 0 .../serial-tcp-telnet-chardev.x86_64-latest.args | 0 .../serial-tcp-telnet-chardev.xml | 0 ...rial-tcp-tlsx509-chardev-notls.x86_64-latest.args | 0 .../serial-tcp-tlsx509-chardev-notls.xml | 0 ...ial-tcp-tlsx509-chardev-verify.x86_64-latest.args | 0 .../serial-tcp-tlsx509-chardev-verify.xml | 0 .../serial-tcp-tlsx509-chardev.x86_64-latest.args | 0 .../serial-tcp-tlsx509-chardev.xml | 0 ...ial-tcp-tlsx509-secret-chardev.x86_64-latest.args | 0 .../serial-tcp-tlsx509-secret-chardev.xml | 0 .../serial-udp-chardev.x86_64-latest.args | 0 .../serial-udp-chardev.xml | 0 .../serial-unix-chardev.x86_64-latest.args | 0 .../serial-unix-chardev.xml | 0 .../serial-unix-missing-source.x86_64-latest.err | 0 .../serial-unix-missing-source.xml | 0 .../serial-vc-chardev.x86_64-latest.args | 0 .../serial-vc-chardev.xml | 0 .../sgx-epc.x86_64-7.0.0.args | 0 .../sgx-epc.xml | 0 .../shmem-invalid-address.x86_64-latest.err | 0 .../shmem-invalid-address.xml | 0 .../shmem-invalid-size.x86_64-latest.err | 0 .../shmem-invalid-size.xml | 0 .../shmem-msi-only.x86_64-latest.err | 0 .../shmem-msi-only.xml | 0 .../shmem-plain-doorbell.x86_64-latest.args | 0 .../shmem-plain-doorbell.xml | 0 .../shmem-small-size.x86_64-latest.err | 0 .../shmem-small-size.xml | 0 .../smartcard-controller.x86_64-latest.args | 0 .../smartcard-controller.xml | 0 ...ard-host-certificates-database.x86_64-latest.args | 0 .../smartcard-host-certificates-database.xml | 0 .../smartcard-host-certificates.x86_64-latest.args | 0 .../smartcard-host-certificates.xml | 0 .../smartcard-host.x86_64-latest.args | 0 .../smartcard-host.xml | 0 ...smartcard-passthrough-spicevmc.x86_64-latest.args | 0 .../smartcard-passthrough-spicevmc.xml | 0 .../smartcard-passthrough-tcp.x86_64-latest.args | 0 .../smartcard-passthrough-tcp.xml | 0 .../smartcard-passthrough-unix.x86_64-latest.args | 0 .../smartcard-passthrough-unix.xml | 0 .../smbios-date.x86_64-latest.err | 0 .../smbios-date.xml | 0 .../smbios-type-fwcfg.x86_64-latest.args | 0 .../smbios-type-fwcfg.xml | 0 .../smbios-uuid-match.x86_64-latest.err | 0 .../smbios-uuid-match.xml | 0 .../smbios.x86_64-latest.args | 0 .../{qemuxml2argvdata => qemuxmlconfdata}/smbios.xml | 0 .../sound-device.x86_64-4.2.0.args | 0 .../sound-device.x86_64-latest.args | 0 .../sound-device.xml | 0 .../sparc-minimal.sparc-latest.args | 0 .../sparc-minimal.xml | 0 .../tap-vhost-incorrect.x86_64-latest.args | 0 .../tap-vhost-incorrect.xml | 0 .../tap-vhost.x86_64-latest.args | 0 .../tap-vhost.xml | 0 .../tpm-emulator-spapr.ppc64-latest.args | 0 .../tpm-emulator-spapr.xml | 0 .../tpm-emulator-tpm2-enc.x86_64-latest.args | 0 .../tpm-emulator-tpm2-enc.xml | 0 .../tpm-emulator-tpm2-pstate.x86_64-latest.args | 0 .../tpm-emulator-tpm2-pstate.xml | 0 .../tpm-emulator-tpm2.x86_64-latest.args | 0 .../tpm-emulator-tpm2.x86_64-latest.err | 0 .../tpm-emulator-tpm2.xml | 0 .../tpm-emulator.x86_64-latest.args | 0 .../tpm-emulator.x86_64-latest.err | 0 .../tpm-emulator.xml | 0 .../tpm-external.x86_64-latest.args | 0 .../tpm-external.xml | 0 .../tpm-no-backend-invalid.x86_64-latest.err | 0 .../tpm-no-backend-invalid.xml | 0 .../tpm-passthrough-crb.x86_64-latest.args | 0 .../tpm-passthrough-crb.xml | 0 .../tpm-passthrough.x86_64-latest.args | 0 .../tpm-passthrough.xml | 0 .../tseg-explicit-size.x86_64-latest.args | 0 .../tseg-explicit-size.xml | 0 .../tseg-i440fx.x86_64-latest.err | 0 .../tseg-i440fx.xml | 0 .../tseg-invalid-size.x86_64-latest.err | 0 .../tseg-invalid-size.xml | 0 .../usb-bus-missing.x86_64-latest.err | 0 .../usb-bus-missing.xml | 0 .../usb-controller-default-i440fx.x86_64-latest.args | 0 .../usb-controller-default-i440fx.xml | 0 .../usb-controller-default-isapc.x86_64-latest.err | 0 .../usb-controller-default-isapc.xml | 0 .../usb-controller-default-q35.x86_64-latest.args | 0 .../usb-controller-default-q35.xml | 0 ...ler-default-unavailable-i440fx.x86_64-latest.args | 0 .../usb-controller-default-unavailable-i440fx.xml | 0 ...troller-default-unavailable-q35.x86_64-latest.err | 0 .../usb-controller-default-unavailable-q35.xml | 0 ...usb-controller-ich9-autoassign.x86_64-latest.args | 0 .../usb-controller-ich9-autoassign.xml | 0 .../usb-controller-ich9-companion.x86_64-latest.args | 0 .../usb-controller-ich9-companion.xml | 0 .../usb-controller-ich9-ehci-addr.x86_64-latest.args | 0 .../usb-controller-ich9-ehci-addr.xml | 0 ...sb-controller-ich9-no-companion.x86_64-latest.err | 0 .../usb-controller-ich9-no-companion.xml | 0 ...usb-controller-implicit-i440fx.x86_64-latest.args | 0 .../usb-controller-implicit-i440fx.xml | 0 .../usb-controller-implicit-isapc.x86_64-latest.args | 0 .../usb-controller-implicit-isapc.xml | 0 .../usb-controller-implicit-q35.x86_64-latest.args | 0 .../usb-controller-implicit-q35.xml | 0 .../usb-controller-nec-xhci-limit.x86_64-latest.err | 0 .../usb-controller-nec-xhci-limit.xml | 0 ...controller-nec-xhci-unavailable.x86_64-latest.err | 0 .../usb-controller-nec-xhci-unavailable.xml | 0 .../usb-controller-nec-xhci.x86_64-latest.args | 0 .../usb-controller-nec-xhci.xml | 0 ...controller-nex-xhci-autoassign.x86_64-latest.args | 0 .../usb-controller-nex-xhci-autoassign.xml | 0 .../usb-controller-piix3.x86_64-latest.args | 0 .../usb-controller-piix3.xml | 0 .../usb-controller-qemu-xhci-limit.x86_64-latest.err | 0 .../usb-controller-qemu-xhci-limit.xml | 0 .../usb-controller-qemu-xhci.x86_64-latest.args | 0 .../usb-controller-qemu-xhci.xml | 0 .../usb-hub-autoadd-deluxe.x86_64-latest.args | 0 .../usb-hub-autoadd-deluxe.xml | 0 .../usb-hub-autoadd.x86_64-latest.args | 0 .../usb-hub-autoadd.xml | 0 .../usb-hub-conflict.x86_64-latest.err | 0 .../usb-hub-conflict.xml | 0 .../usb-hub-nonexistent.x86_64-latest.err | 0 .../usb-hub-nonexistent.xml | 0 .../usb-hub.x86_64-latest.args | 0 .../usb-hub.xml | 0 .../usb-long-port-path.x86_64-latest.args | 0 .../usb-long-port-path.xml | 0 .../usb-none-hub.x86_64-latest.err | 0 .../usb-none-hub.xml | 0 .../usb-none-other.x86_64-latest.err | 0 .../usb-none-other.xml | 0 .../usb-none-usbtablet.x86_64-latest.err | 0 .../usb-none-usbtablet.xml | 0 .../usb-none.x86_64-latest.args | 0 .../usb-none.xml | 0 .../usb-port-autoassign.x86_64-latest.args | 0 .../usb-port-autoassign.xml | 0 .../usb-port-missing.x86_64-latest.args | 0 .../usb-port-missing.xml | 0 .../usb-ports-out-of-range.x86_64-latest.err | 0 .../usb-ports-out-of-range.xml | 0 .../usb-ports.x86_64-latest.args | 0 .../usb-ports.xml | 0 .../usb-redir-boot.x86_64-latest.args | 0 .../usb-redir-boot.xml | 0 .../usb-redir-filter-version.x86_64-latest.args | 0 .../usb-redir-filter-version.xml | 0 .../usb-redir-filter.x86_64-latest.args | 0 .../usb-redir-filter.xml | 0 .../usb-redir-unix.x86_64-latest.args | 0 .../usb-redir-unix.xml | 0 .../usb-redir.x86_64-latest.args | 0 .../usb-redir.xml | 0 .../usb-too-long-port-path-invalid.x86_64-latest.err | 0 .../usb-too-long-port-path-invalid.xml | 0 .../usb1-usb2.x86_64-latest.args | 0 .../usb1-usb2.xml | 0 .../user-aliases-usb.x86_64-latest.args | 0 .../user-aliases-usb.xml | 0 .../user-aliases.x86_64-latest.args | 0 .../user-aliases.xml | 0 .../user-aliases2.x86_64-latest.args | 0 .../user-aliases2.xml | 0 .../vcpu-placement-static.x86_64-latest.args | 0 .../vcpu-placement-static.xml | 0 .../vhost-user-fs-fd-memory.x86_64-latest.args | 0 .../vhost-user-fs-fd-memory.xml | 0 .../vhost-user-fs-hugepages.x86_64-latest.args | 0 .../vhost-user-fs-hugepages.xml | 0 .../vhost-user-fs-readonly.x86_64-latest.err | 0 .../vhost-user-fs-readonly.xml | 0 .../vhost-user-fs-sock.x86_64-latest.args | 0 .../vhost-user-fs-sock.xml | 0 .../vhost-user-gpu-secondary.x86_64-latest.args | 0 .../vhost-user-gpu-secondary.xml | 0 .../vhost-user-vga.x86_64-latest.args | 0 .../vhost-user-vga.xml | 0 .../vhost-vsock-auto.x86_64-latest.args | 0 .../vhost-vsock-auto.xml | 0 .../vhost-vsock-ccw-auto.s390x-latest.args | 0 .../vhost-vsock-ccw-auto.xml | 0 .../vhost-vsock-ccw-iommu.s390x-latest.args | 0 .../vhost-vsock-ccw-iommu.xml | 0 .../vhost-vsock-ccw.s390x-latest.args | 0 .../vhost-vsock-ccw.xml | 0 .../vhost-vsock.x86_64-latest.args | 0 .../vhost-vsock.xml | 0 .../vhost_queues-invalid.x86_64-latest.err | 0 .../vhost_queues-invalid.xml | 0 .../video-bochs-display-device.x86_64-latest.args | 0 .../video-bochs-display-device.xml | 0 .../video-device-pciaddr-default.x86_64-latest.args | 0 .../video-device-pciaddr-default.xml | 0 .../video-invalid-multiple-devices.x86_64-latest.err | 0 .../video-invalid-multiple-devices.xml | 0 .../video-multiple-primaries.x86_64-latest.err | 0 .../video-multiple-primaries.xml | 0 .../video-none-device.x86_64-latest.args | 0 .../video-none-device.xml | 0 .../video-qxl-device-vgamem.x86_64-latest.args | 0 .../video-qxl-device-vgamem.xml | 0 .../video-qxl-device-vram64.x86_64-latest.args | 0 .../video-qxl-device-vram64.xml | 0 .../video-qxl-device.x86_64-latest.args | 0 .../video-qxl-device.xml | 0 .../video-qxl-heads.x86_64-latest.args | 0 .../video-qxl-heads.xml | 0 .../video-qxl-noheads.x86_64-latest.args | 0 .../video-qxl-noheads.xml | 0 .../video-qxl-resolution.x86_64-latest.args | 0 .../video-qxl-resolution.xml | 0 .../video-qxl-sec-device-vgamem.x86_64-latest.args | 0 .../video-qxl-sec-device-vgamem.xml | 0 .../video-qxl-sec-device-vram64.x86_64-latest.args | 0 .../video-qxl-sec-device-vram64.xml | 0 .../video-qxl-sec-device.x86_64-latest.args | 0 .../video-qxl-sec-device.xml | 0 ...amfb-display-device-pci-address.x86_64-latest.err | 0 .../video-ramfb-display-device-pci-address.xml | 0 .../video-ramfb-display-device.x86_64-latest.args | 0 .../video-ramfb-display-device.xml | 0 .../video-vga-device-vgamem.x86_64-latest.args | 0 .../video-vga-device-vgamem.xml | 0 .../video-vga-device.x86_64-latest.args | 0 .../video-vga-device.xml | 0 .../video-vga-qxl-heads.x86_64-latest.args | 0 .../video-vga-qxl-heads.xml | 0 .../video-virtio-blob-off.x86_64-latest.args | 0 .../video-virtio-blob-off.xml | 0 .../video-virtio-blob-on.x86_64-latest.args | 0 .../video-virtio-blob-on.xml | 0 .../video-virtio-gpu-ccw-auto.s390x-latest.args | 0 .../video-virtio-gpu-ccw-auto.xml | 0 .../video-virtio-gpu-ccw.s390x-latest.args | 0 .../video-virtio-gpu-ccw.xml | 0 .../video-virtio-gpu-device.x86_64-latest.args | 0 .../video-virtio-gpu-device.xml | 0 .../video-virtio-gpu-sdl-gl.x86_64-latest.args | 0 .../video-virtio-gpu-sdl-gl.xml | 0 .../video-virtio-gpu-secondary.x86_64-latest.args | 0 .../video-virtio-gpu-secondary.xml | 0 .../video-virtio-gpu-spice-gl.x86_64-latest.args | 0 .../video-virtio-gpu-spice-gl.xml | 0 .../video-virtio-gpu-virgl.x86_64-latest.args | 0 .../video-virtio-gpu-virgl.xml | 0 .../video-virtio-vga-gpu-gl.x86_64-latest.args | 0 .../video-virtio-vga-gpu-gl.xml | 0 .../video-virtio-vga.x86_64-latest.args | 0 .../video-virtio-vga.xml | 0 .../virtio-9p-createmode.x86_64-latest.args | 0 .../virtio-9p-createmode.xml | 0 .../virtio-9p-multidevs.x86_64-latest.args | 0 .../virtio-9p-multidevs.xml | 0 .../virtio-input-passthrough.x86_64-latest.args | 0 .../virtio-input-passthrough.xml | 0 .../virtio-input.x86_64-latest.args | 0 .../virtio-input.xml | 0 .../virtio-iommu-aarch64.aarch64-latest.args | 0 .../virtio-iommu-aarch64.xml | 0 ...rtio-iommu-invalid-address-type.x86_64-latest.err | 0 .../virtio-iommu-invalid-address-type.xml | 0 .../virtio-iommu-invalid-address.x86_64-latest.err | 0 .../virtio-iommu-invalid-address.xml | 0 .../virtio-iommu-no-acpi.x86_64-latest.err | 0 .../virtio-iommu-no-acpi.xml | 0 .../virtio-iommu-wrong-machine.x86_64-latest.err | 0 .../virtio-iommu-wrong-machine.xml | 0 .../virtio-iommu-x86_64.x86_64-6.1.0.err | 0 .../virtio-iommu-x86_64.x86_64-latest.args | 0 .../virtio-iommu-x86_64.xml | 0 .../virtio-lun.x86_64-latest.args | 0 .../virtio-lun.xml | 0 .../virtio-non-transitional.x86_64-latest.args | 0 .../virtio-non-transitional.xml | 0 .../virtio-options-controller-ats.x86_64-latest.args | 0 .../virtio-options-controller-ats.xml | 0 ...irtio-options-controller-iommu.x86_64-latest.args | 0 .../virtio-options-controller-iommu.xml | 0 ...rtio-options-controller-packed.x86_64-latest.args | 0 .../virtio-options-controller-packed.xml | 0 .../virtio-options-disk-ats.x86_64-latest.args | 0 .../virtio-options-disk-ats.xml | 0 .../virtio-options-disk-iommu.x86_64-latest.args | 0 .../virtio-options-disk-iommu.xml | 0 .../virtio-options-disk-packed.x86_64-latest.args | 0 .../virtio-options-disk-packed.xml | 0 .../virtio-options-fs-ats.x86_64-latest.args | 0 .../virtio-options-fs-ats.xml | 0 .../virtio-options-fs-iommu.x86_64-latest.args | 0 .../virtio-options-fs-iommu.xml | 0 .../virtio-options-fs-packed.x86_64-latest.args | 0 .../virtio-options-fs-packed.xml | 0 .../virtio-options-input-ats.x86_64-latest.args | 0 .../virtio-options-input-ats.xml | 0 .../virtio-options-input-iommu.x86_64-latest.args | 0 .../virtio-options-input-iommu.xml | 0 .../virtio-options-input-packed.x86_64-latest.args | 0 .../virtio-options-input-packed.xml | 0 .../virtio-options-memballoon-ats.x86_64-latest.args | 0 .../virtio-options-memballoon-ats.xml | 0 ...ns-memballoon-freepage-reporting.x86_64-5.0.0.err | 0 ...-memballoon-freepage-reporting.x86_64-latest.args | 0 .../virtio-options-memballoon-freepage-reporting.xml | 0 ...irtio-options-memballoon-iommu.x86_64-latest.args | 0 .../virtio-options-memballoon-iommu.xml | 0 ...rtio-options-memballoon-packed.x86_64-latest.args | 0 .../virtio-options-memballoon-packed.xml | 0 .../virtio-options-net-ats.x86_64-latest.args | 0 .../virtio-options-net-ats.xml | 0 .../virtio-options-net-iommu.x86_64-latest.args | 0 .../virtio-options-net-iommu.xml | 0 .../virtio-options-net-packed.x86_64-latest.args | 0 .../virtio-options-net-packed.xml | 0 .../virtio-options-rng-ats.x86_64-latest.args | 0 .../virtio-options-rng-ats.xml | 0 .../virtio-options-rng-iommu.x86_64-latest.args | 0 .../virtio-options-rng-iommu.xml | 0 .../virtio-options-rng-packed.x86_64-latest.args | 0 .../virtio-options-rng-packed.xml | 0 .../virtio-options-video-ats.x86_64-latest.args | 0 .../virtio-options-video-ats.xml | 0 .../virtio-options-video-iommu.x86_64-latest.args | 0 .../virtio-options-video-iommu.xml | 0 .../virtio-options-video-packed.x86_64-latest.args | 0 .../virtio-options-video-packed.xml | 0 .../virtio-options.x86_64-latest.args | 0 .../virtio-options.xml | 0 .../virtio-rng-builtin.x86_64-5.2.0.args | 0 .../virtio-rng-builtin.x86_64-latest.args | 0 .../virtio-rng-builtin.xml | 0 .../virtio-rng-ccw.s390x-latest.args | 0 .../virtio-rng-ccw.xml | 0 .../virtio-rng-default.x86_64-latest.args | 0 .../virtio-rng-default.xml | 0 .../virtio-rng-egd-crash.x86_64-latest.err | 0 .../virtio-rng-egd-crash.xml | 0 .../virtio-rng-egd-unix.x86_64-5.2.0.args | 0 .../virtio-rng-egd-unix.x86_64-latest.args | 0 .../virtio-rng-egd-unix.xml | 0 .../virtio-rng-egd.x86_64-latest.args | 0 .../virtio-rng-egd.xml | 0 .../virtio-rng-multiple.x86_64-latest.args | 0 .../virtio-rng-multiple.xml | 0 .../virtio-rng-random.x86_64-latest.args | 0 .../virtio-rng-random.xml | 0 ...rtio-transitional-not-supported.x86_64-latest.err | 0 .../virtio-transitional-not-supported.xml | 0 .../virtio-transitional.x86_64-latest.args | 0 .../virtio-transitional.xml | 0 .../vmcoreinfo.x86_64-latest.args | 0 .../vmcoreinfo.xml | 0 .../watchdog-device.x86_64-latest.args | 0 .../watchdog-device.xml | 0 .../watchdog-diag288.s390x-latest.args | 0 .../watchdog-diag288.xml | 0 .../watchdog-dump.x86_64-latest.args | 0 .../watchdog-dump.xml | 0 .../watchdog-injectnmi.x86_64-latest.args | 0 .../watchdog-injectnmi.xml | 0 .../watchdog-q35-multiple.x86_64-latest.args | 0 .../watchdog-q35-multiple.xml | 0 .../watchdog.x86_64-latest.args | 0 .../watchdog.xml | 0 .../x86-kvm-32-on-64.x86_64-latest.args | 0 .../x86-kvm-32-on-64.xml | 0 .../x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args | 0 .../x86_64-default-cpu-kvm-pc-4.2.xml | 0 ...x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args | 0 .../x86_64-default-cpu-kvm-q35-4.2.xml | 0 ...86_64-default-cpu-tcg-features.x86_64-latest.args | 0 .../x86_64-default-cpu-tcg-features.xml | 0 .../x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args | 0 .../x86_64-default-cpu-tcg-pc-4.2.xml | 0 ...x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args | 0 .../x86_64-default-cpu-tcg-q35-4.2.xml | 0 .../x86_64-pc-graphics.x86_64-latest.args | 0 .../x86_64-pc-graphics.xml | 0 .../x86_64-pc-headless.x86_64-latest.args | 0 .../x86_64-pc-headless.xml | 0 .../x86_64-q35-graphics.x86_64-latest.args | 0 .../x86_64-q35-graphics.xml | 0 .../x86_64-q35-headless.x86_64-latest.args | 0 .../x86_64-q35-headless.xml | 0 tests/qemuxmlconftest.c | 12 ++++++------ tests/virschematest.c | 2 +- 2360 files changed, 12 insertions(+), 11 deletions(-) create mode 120000 tests/qemuxml2argvdata rename tests/{qemuxml2argvdata => qemuxmlconfdata}/440fx-ide-address-conflict.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/440fx-ide-address-conflict.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/440fx-wrong-root.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/440fx-wrong-root.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-cpu-passthrough.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-cpu-passthrough.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-default-cpu-kvm-virt-4.2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-default-cpu-tcg-virt-4.2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-features-sve-disabled.aarch64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-features-sve-disabled.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-features-sve.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-features-sve.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-features-wrong.aarch64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-features-wrong.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-default-both.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-default-both.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-default-v2.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-default-v2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-default-v3.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-default-v3.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-default.aarch64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-default.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-default.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-host.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-host.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-invalid.aarch64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-none-both.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-none-both.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-none-tcg.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-none-tcg.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-none-v2.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-none-v2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-none-v3.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-none-v3.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-none.aarch64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-none.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-none.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-not-arm.ppc64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-not-arm.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-not-virt.aarch64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-not-virt.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-v2.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-v2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-v3.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-gic-v3.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-kvm-32-on-64.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-kvm-32-on-64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-pci-serial.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-pci-serial.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-tpm-wrong-model.aarch64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-tpm-wrong-model.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-tpm.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-tpm.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-traditional-pci.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-traditional-pci.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-usb-controller.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-usb-controller.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-video-default.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-video-default.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-video-virtio-gpu-pci.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-video-virtio-gpu-pci.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-virt-default-nic.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-virt-default-nic.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-virt-graphics.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-virt-graphics.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-virt-headless-mmio.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-virt-headless-mmio.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-virt-headless.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-virt-headless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-virt-virtio.aarch64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-virt-virtio.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-virt-virtio.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-virtio-pci-manual-addresses.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/aarch64-virtio-pci-manual-addresses.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/acpi-table.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/acpi-table.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/arm-vexpressa9-basic.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/arm-vexpressa9-basic.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/arm-vexpressa9-nodevs.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/arm-vexpressa9-nodevs.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/arm-vexpressa9-virtio.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/arm-vexpressa9-virtio.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/async-teardown.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/async-teardown.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-alsa-best.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-alsa-best.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-alsa-full.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-alsa-full.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-alsa-minimal.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-alsa-minimal.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-coreaudio-best.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-coreaudio-best.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-coreaudio-full.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-coreaudio-full.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-coreaudio-minimal.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-coreaudio-minimal.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-default-nographics.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-default-nographics.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-default-sdl.x86_64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-default-sdl.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-default-sdl.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-default-spice.x86_64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-default-spice.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-default-spice.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-default-vnc.x86_64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-default-vnc.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-default-vnc.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-file-best.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-file-best.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-file-full.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-file-full.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-file-minimal.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-file-minimal.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-jack-full.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-jack-full.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-jack-minimal.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-jack-minimal.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-many-backends.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-many-backends.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-none-best.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-none-best.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-none-full.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-none-full.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-none-minimal.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-none-minimal.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-oss-best.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-oss-best.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-oss-full.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-oss-full.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-oss-minimal.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-oss-minimal.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-pipewire-best.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-pipewire-best.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-pipewire-full.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-pipewire-full.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-pipewire-minimal.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-pipewire-minimal.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-pulseaudio-best.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-pulseaudio-best.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-pulseaudio-full.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-pulseaudio-full.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-pulseaudio-minimal.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-pulseaudio-minimal.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-sdl-best.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-sdl-best.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-sdl-full.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-sdl-full.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-sdl-minimal.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-sdl-minimal.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-spice-best.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-spice-best.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-spice-full.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-spice-full.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-spice-minimal.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/audio-spice-minimal.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/autoindex.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/autoindex.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/balloon-ccw-deflate.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/balloon-ccw-deflate.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/balloon-device-auto.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/balloon-device-auto.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/balloon-device-deflate-off.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/balloon-device-deflate-off.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/balloon-device-deflate.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/balloon-device-deflate.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/balloon-device-period.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/balloon-device-period.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/balloon-device.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/balloon-device.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/balloon-mmio-deflate.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/balloon-mmio-deflate.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/blkdeviotune-group-num.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/blkdeviotune-group-num.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/blkdeviotune-max-length.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/blkdeviotune-max-length.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/blkdeviotune-max.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/blkdeviotune-max.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/blkdeviotune.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/blkdeviotune.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/blkiotune-device.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/blkiotune-device.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/blkiotune.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/blkiotune.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-cdrom.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-cdrom.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-complex.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-complex.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-dev+order.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-dev+order.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-floppy-q35.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-floppy-q35.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-floppy.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-floppy.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-menu-disable-drive.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-menu-disable-drive.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-menu-disable-with-timeout.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-menu-disable-with-timeout.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-menu-disable.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-menu-disable.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-menu-enable-with-timeout-invalid.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-menu-enable-with-timeout-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-menu-enable-with-timeout.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-menu-enable-with-timeout.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-menu-enable.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-menu-enable.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-multi.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-multi.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-network.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-network.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-order.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/boot-order.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-guestfwd.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-guestfwd.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-qemu-vdagent-features.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-qemu-vdagent-features.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-qemu-vdagent.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-qemu-vdagent.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-spicevmc.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-spicevmc.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-unix-guestfwd.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-unix-guestfwd.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-unix-source-path.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-unix-source-path.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-virtio-auto.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-virtio-auto.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-virtio-autoadd.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-virtio-autoadd.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-virtio-autoassign.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-virtio-autoassign.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-virtio-default.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-virtio-default.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-virtio-state.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-virtio-state.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-virtio-unix.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-virtio-unix.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-virtio.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/channel-virtio.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/chardev-label.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/chardev-label.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/chardev-reconnect-generated-path.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/chardev-reconnect-generated-path.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/chardev-reconnect-invalid-timeout.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/chardev-reconnect-invalid-timeout.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/chardev-reconnect.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/chardev-reconnect.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-absolute.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-absolute.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-catchup.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-catchup.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-france.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-france.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-hpet-off.x86_64-7.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-hpet-off.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-hpet-off.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-localtime-basis-localtime.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-localtime-basis-localtime.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-localtime.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-localtime.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-realtime.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-realtime.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-timer-armvtimer.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-timer-armvtimer.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-timer-hyperv-rtc.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-timer-hyperv-rtc.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-utc.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-utc.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-variable.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/clock-variable.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/console-compat-auto.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/console-compat-auto.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/console-compat-chardev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/console-compat-chardev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/console-compat.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/console-compat.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/console-compat2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/console-compat2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/console-sclp.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/console-sclp.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/console-virtio-ccw.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/console-virtio-ccw.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/console-virtio-many.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/console-virtio-many.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/console-virtio-unix.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/console-virtio-unix.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/console-virtio.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/console-virtio.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/controller-order.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/controller-order.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/controller-usb-order.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/controller-usb-order.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/controller-virtio-scsi.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/controller-virtio-scsi.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-Haswell-noTSX.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-Haswell-noTSX.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-Haswell.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-Haswell.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-Haswell2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-Haswell2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-Haswell3.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-Haswell3.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-Icelake-Server-pconfig.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-Icelake-Server-pconfig.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-cache-disable.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-cache-disable.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-cache-disable3.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-cache-disable3.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-cache-emulate-l2.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-cache-emulate-l2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-cache-emulate-l3.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-cache-emulate-l3.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-cache-passthrough-l3.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-cache-passthrough-l3.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-cache-passthrough.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-cache-passthrough.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-cache-passthrough3.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-cache-passthrough3.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-check-default-none.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-check-default-none.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-check-default-none2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-check-default-none2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-check-default-partial.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-check-default-partial.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-check-default-partial2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-check-default-partial2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-check-full.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-check-full.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-check-none.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-check-none.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-check-partial.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-check-partial.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-empty.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-empty.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-eoi-disabled.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-eoi-disabled.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-eoi-enabled.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-eoi-enabled.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-exact1.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-exact1.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-exact2-nofallback.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-exact2-nofallback.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-exact2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-exact2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-fallback.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-fallback.x86_64-8.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-fallback.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-kvmclock.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-kvmclock.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-cmt.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-cmt.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-kvm.x86_64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-kvm.x86_64-5.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-kvm.x86_64-5.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-kvm.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-kvm.x86_64-6.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-kvm.x86_64-6.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-kvm.x86_64-6.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-kvm.x86_64-7.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-kvm.x86_64-7.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-kvm.x86_64-7.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-kvm.x86_64-8.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-kvm.x86_64-8.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-kvm.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-kvm.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-tcg.x86_64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-tcg.x86_64-5.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-tcg.x86_64-5.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-tcg.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-tcg.x86_64-6.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-tcg.x86_64-6.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-tcg.x86_64-6.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-tcg.x86_64-7.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-tcg.x86_64-7.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-tcg.x86_64-7.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-tcg.x86_64-8.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-tcg.x86_64-8.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-tcg.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-fallback-tcg.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-features.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-features.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-kvm.x86_64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-kvm.x86_64-5.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-kvm.x86_64-5.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-kvm.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-kvm.x86_64-6.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-kvm.x86_64-6.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-kvm.x86_64-6.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-kvm.x86_64-7.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-kvm.x86_64-7.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-kvm.x86_64-7.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-kvm.x86_64-8.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-kvm.x86_64-8.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-kvm.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-kvm.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-kvm.x86_64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-kvm.x86_64-5.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-kvm.x86_64-5.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-kvm.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-kvm.x86_64-6.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-kvm.x86_64-6.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-kvm.x86_64-6.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-kvm.x86_64-7.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-kvm.x86_64-7.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-kvm.x86_64-7.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-kvm.x86_64-8.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-kvm.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-kvm.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-tcg.x86_64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-tcg.x86_64-5.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-tcg.x86_64-5.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-tcg.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-tcg.x86_64-6.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-tcg.x86_64-6.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-tcg.x86_64-6.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-tcg.x86_64-7.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-tcg.x86_64-7.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-tcg.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-nofallback-tcg.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-tcg.x86_64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-tcg.x86_64-5.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-tcg.x86_64-5.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-tcg.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-tcg.x86_64-6.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-tcg.x86_64-6.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-tcg.x86_64-6.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-tcg.x86_64-7.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-tcg.x86_64-7.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-tcg.x86_64-7.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-tcg.x86_64-8.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-tcg.x86_64-8.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-tcg.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-tcg.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-vendor.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-model-vendor.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-passthrough-features.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-passthrough-features.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-passthrough.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-host-passthrough.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-hotplug-granularity.ppc64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-hotplug-granularity.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-hotplug-startup.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-hotplug-startup.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-kvmclock.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-kvmclock.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-minimum1.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-minimum1.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-minimum2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-minimum2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-no-removed-features.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-no-removed-features.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-nofallback.x86_64-5.2.0.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-nofallback.x86_64-8.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-nofallback.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-numa-disjoint.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-numa-disjoint.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-numa-disordered.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-numa-disordered.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-numa-memshared.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-numa-memshared.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-numa-no-memory-element.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-numa-no-memory-element.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-numa1.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-numa1.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-numa2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-numa2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-numa3.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-numa3.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-phys-bits-emulate-bare.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-phys-bits-emulate-bare.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-phys-bits-emulate.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-phys-bits-emulate.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-phys-bits-emulate2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-phys-bits-emulate2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-phys-bits-limit.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-phys-bits-limit.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-phys-bits-passthrough.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-phys-bits-passthrough.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-phys-bits-passthrough2.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-phys-bits-passthrough2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-qemu-host-passthrough.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-qemu-host-passthrough.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-s390-features.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-s390-features.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-s390-zEC12.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-s390-zEC12.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-strict1.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-strict1.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-topology1.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-topology1.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-topology2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-topology2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-topology3.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-topology3.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-topology4.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-topology4.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-topology5.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-topology5.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-translation.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-translation.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-tsc-frequency.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cpu-tsc-frequency.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cputune-cpuset-big-id.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cputune-cpuset-big-id.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cputune-iothreadsched-toomuch.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cputune-iothreadsched-toomuch.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cputune-numatune.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cputune-numatune.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cputune-vcpusched-overlap.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cputune-vcpusched-overlap.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cputune-zero-shares.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cputune-zero-shares.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cputune.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/cputune.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/crypto-builtin.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/crypto-builtin.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/default-kvm-host-arch.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/default-kvm-host-arch.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/default-qemu-host-arch.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/default-qemu-host-arch.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/default-video-type-aarch64.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/default-video-type-aarch64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/default-video-type-ppc64.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/default-video-type-ppc64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/default-video-type-riscv64.riscv64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/default-video-type-riscv64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/default-video-type-s390x.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/default-video-type-s390x.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/default-video-type-x86_64.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/default-video-type-x86_64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/devices-acpi-index.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/devices-acpi-index.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-active-commit.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-active-commit.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-address-conflict.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-address-conflict.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-aio-io_uring.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-aio-io_uring.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-aio.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-aio.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-arm-virtio-sd.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-arm-virtio-sd.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-attaching-partition-nosupport.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-attaching-partition-nosupport.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-backing-chains-index.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-backing-chains-index.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-backing-chains-noindex.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-backing-chains-noindex.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-blockio.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-blockio.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-boot-cdrom.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-boot-cdrom.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-boot-disk.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-boot-disk.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-cache.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-cache.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-cdrom-bus-other.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-cdrom-bus-other.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-cdrom-empty-network-invalid.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-cdrom-empty-network-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-cdrom-network-nbdkit.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-cdrom-network-nbdkit.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-cdrom-network.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-cdrom-network.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-cdrom-tray.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-cdrom-tray.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-cdrom.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-cdrom.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-copy_on_read.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-copy_on_read.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-detect-zeroes.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-detect-zeroes.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-device-lun-type-invalid.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-device-lun-type-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-device-removable.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-device-removable.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-discard.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-discard.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-discard_no_unref.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-discard_no_unref.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-encryption-wrong.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-encryption-wrong.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-error-policy-s390x.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-error-policy-s390x.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-error-policy.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-error-policy.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-fdc-incompatible-address.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-fdc-incompatible-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-floppy-pseries.ppc64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-floppy-pseries.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-floppy-q35.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-floppy-q35.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-floppy-tray.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-floppy-tray.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-floppy.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-floppy.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-fmt-cow.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-fmt-cow.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-fmt-dir.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-fmt-dir.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-fmt-iso.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-fmt-iso.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-fmt-qcow.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-fmt-qcow.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-geometry.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-geometry.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-hostdev-scsi-address-conflict.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-hostdev-scsi-address-conflict.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-ide-incompatible-address.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-ide-incompatible-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-ide-split.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-ide-split.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-ide-wwn.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-ide-wwn.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-ioeventfd.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-ioeventfd.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-metadata-cache.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-metadata-cache.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-mirror-old.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-mirror-old.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-mirror.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-mirror.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-missing-target-invalid.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-missing-target-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-gluster.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-gluster.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-http-nbdkit.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-http-nbdkit.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-http.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-http.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-iscsi-auth-secrettype-invalid.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-iscsi-auth-secrettype-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-iscsi-auth-wrong-secrettype.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-iscsi-auth-wrong-secrettype.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-iscsi.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-iscsi.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-nbd.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-nbd.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-nfs.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-nfs.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-rbd-encryption-layering.x86_64-7.2.0.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-rbd-encryption-layering.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-rbd-encryption-layering.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-rbd-encryption-luks-any.x86_64-7.2.0.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-rbd-encryption-luks-any.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-rbd-encryption-luks-any.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-rbd-encryption.x86_64-6.0.0.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-rbd-encryption.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-rbd-encryption.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-rbd-no-colon.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-rbd-no-colon.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-rbd.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-rbd.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-sheepdog.x86_64-6.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-sheepdog.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-source-auth-both.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-source-auth-both.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-source-auth.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-source-auth.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-source-curl-nbdkit-backing.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-source-curl-nbdkit-backing.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-source-curl-nbdkit.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-source-curl-nbdkit.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-source-curl.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-source-curl.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-ssh-key.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-ssh-key.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-ssh-nbdkit.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-ssh-nbdkit.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-ssh-password.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-ssh-password.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-ssh.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-ssh.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-tlsx509-nbd-hostname.x86_64-6.2.0.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-tlsx509-nbd-hostname.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-tlsx509-nbd-hostname.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-tlsx509-nbd.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-tlsx509-nbd.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-tlsx509-nbd.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-tlsx509-vxhs.x86_64-5.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-tlsx509-vxhs.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-vxhs.x86_64-5.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-network-vxhs.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-no-boot.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-no-boot.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-nvme.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-nvme.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-order.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-order.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-readonly-disk.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-readonly-disk.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-rotation.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-rotation.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-same-targets.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-same-targets.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-sata-device.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-sata-device.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-sata-incompatible-address.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-sata-incompatible-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-scsi-device-auto.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-scsi-device-auto.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-scsi-disk-split.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-scsi-disk-split.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-scsi-disk-vpd-build-error.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-scsi-disk-vpd-build-error.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-scsi-disk-vpd.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-scsi-disk-vpd.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-scsi-disk-wwn.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-scsi-disk-wwn.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-scsi-incompatible-address.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-scsi-incompatible-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-scsi-lun-passthrough.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-scsi-lun-passthrough.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-scsi.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-scsi.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-serial.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-serial.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-shared-qcow.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-shared-qcow.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-shared.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-shared.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-slices.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-slices.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-snapshot.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-snapshot.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-source-fd.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-source-fd.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-source-pool-mode.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-source-pool-mode.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-source-pool.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-source-pool.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-transient.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-transient.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-usb-device.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-usb-device.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-usb-pci.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-usb-pci.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-vhostuser-numa.x86_64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-vhostuser-numa.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-vhostuser-numa.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-vhostuser.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-vhostuser.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-vhostvdpa.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-vhostvdpa.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-virtio-ccw-many.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-virtio-ccw-many.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-virtio-ccw.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-virtio-ccw.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-virtio-queues.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-virtio-queues.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-virtio-s390-zpci.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-virtio-s390-zpci.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-virtio-scsi-reservations.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-virtio-scsi-reservations.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-virtio-scsi-reservations.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-virtio.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/disk-virtio.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/downscript.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/downscript.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/encrypted-disk-usage.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/encrypted-disk-usage.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/encrypted-disk.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/encrypted-disk.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/eoi-disabled.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/eoi-disabled.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/eoi-enabled.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/eoi-enabled.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/event_idx.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/event_idx.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/fd-memory-no-numa-topology.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/fd-memory-no-numa-topology.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/fd-memory-numa-topology.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/fd-memory-numa-topology.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/fd-memory-numa-topology2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/fd-memory-numa-topology2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/fd-memory-numa-topology3.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/fd-memory-numa-topology3.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/fd-memory-numa-topology4.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/fd-memory-numa-topology4.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/fips-enabled.x86_64-5.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/fips-enabled.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/fips-enabled.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-bios-not-stateless.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-bios-not-stateless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-bios-nvram.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-bios-nvram.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-bios-stateless.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-bios-stateless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-bios.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-bios.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-aarch64.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-aarch64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-abi-update-aarch64.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-abi-update-aarch64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-abi-update.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-abi-update.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-enrolled-keys-no-secboot.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-enrolled-keys-no-secboot.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-enrolled-keys.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-enrolled-keys.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-format-loader-qcow2-nvram-path.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-format-loader-qcow2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-format-loader-qcow2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-format-loader-raw-abi-update.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-format-loader-raw.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-format-loader-raw.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-format-mismatch.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-format-mismatch.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-format-nvram-qcow2-network-nbd.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-format-nvram-qcow2-path.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-format-nvram-qcow2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-loader-insecure.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-loader-insecure.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-loader-path-nonstandard.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-loader-path-nonstandard.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-loader-path.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-loader-path.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-loader-secure-abi-update.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-loader-secure-abi-update.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-loader-secure.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-loader-secure.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-no-enrolled-keys.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-no-secboot.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-no-secboot.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-nvram-file.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-nvram-file.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-nvram-network-iscsi.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-nvram-network-iscsi.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-nvram-network-nbd.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-nvram-network-nbd.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-nvram-path.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-nvram-path.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-nvram-template-nonstandard.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-nvram-template-nonstandard.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-nvram-template.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-nvram-template.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-rw-abi-update.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-rw-abi-update.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-rw.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-rw.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-secboot.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-secboot.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-smm-off.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-smm-off.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-stateless.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi-stateless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-auto-efi.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-bios-not-stateless.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-bios-not-stateless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-bios-stateless.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-bios-stateless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-bios.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-bios.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-aarch64-legacy-paths.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-acpi-aarch64.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-acpi-aarch64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-acpi-q35.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-acpi-q35.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-features.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-features.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-features.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-loader-no-path.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-loader-no-path.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-loader-path-nonstandard.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-loader-secure.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-loader-secure.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-no-enrolled-keys-legacy-paths.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-no-enrolled-keys.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-no-enrolled-keys.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-no-secboot-legacy-paths.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-no-secboot.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-no-secboot.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-noacpi-aarch64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-noacpi-q35.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-noacpi-q35.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-nvram-file.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-nvram-file.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-nvram-network-iscsi.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-nvram-network-nbd.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-nvram-stateless.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-nvram-stateless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-nvram-template-nonstandard.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-nvram-template-stateless.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-nvram-template-stateless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-nvram-template.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-nvram-template.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-rw-implicit.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-rw-implicit.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-rw-legacy-paths.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-rw-legacy-paths.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-rw-modern-paths.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-rw-modern-paths.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-rw.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-rw.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-secboot-legacy-paths.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-secboot.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-secboot.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-stateless.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi-stateless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-efi.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-noefi-acpi-aarch64.aarch64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-noefi-acpi-aarch64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-noefi-acpi-q35.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-noefi-acpi-q35.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-noefi-noacpi-aarch64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-noefi-noacpi-q35.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/firmware-manual-noefi-noacpi-q35.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/floppy-drive-fat.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/floppy-drive-fat.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/fs9p-ccw.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/fs9p-ccw.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/fs9p.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/fs9p.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/genid-auto.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/genid-auto.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/genid.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/genid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-dbus-address.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-dbus-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-dbus-audio.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-dbus-audio.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-dbus-chardev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-dbus-chardev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-dbus-p2p.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-dbus-p2p.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-dbus-usbredir.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-dbus-usbredir.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-dbus.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-dbus.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-egl-headless-rendernode.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-egl-headless-rendernode.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-egl-headless.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-egl-headless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-listen-network.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-listen-network.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-sdl-egl-headless.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-sdl-egl-headless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-sdl-fullscreen.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-sdl-fullscreen.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-sdl.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-sdl.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-agent-file-xfer.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-agent-file-xfer.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-agentmouse.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-agentmouse.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-auto-socket-cfg.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-auto-socket-cfg.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-auto-socket.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-auto-socket.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-compression.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-compression.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-egl-headless.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-egl-headless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-gl-auto-rendernode.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-gl-auto-rendernode.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-invalid-egl-headless.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-invalid-egl-headless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-no-args.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-no-args.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-qxl-vga.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-qxl-vga.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-sasl.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-sasl.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-socket.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-socket.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-timeout.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-timeout.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-usb-redir.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice-usb-redir.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-spice.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-auto-socket-cfg.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-auto-socket-cfg.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-auto-socket.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-auto-socket.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-egl-headless.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-egl-headless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-no-listen-attr.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-no-listen-attr.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-none.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-none.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-policy.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-policy.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-power.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-power.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-remove-generated-socket.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-remove-generated-socket.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-sasl.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-sasl.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-socket-new-cmdline.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-socket-new-cmdline.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-socket.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-socket.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-tls-secret.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-tls-secret.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-tls-secret.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-tls.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-tls.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-websocket.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc-websocket.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/graphics-vnc.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-display-missing-graphics.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-display-missing-graphics.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-display-ramfb-multiple.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-display-ramfb-multiple.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-display-ramfb.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-display-ramfb.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-display-spice-egl-headless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-display-spice-opengl.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-display-spice-opengl.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-display-vnc-egl-headless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-display-vnc.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-display-vnc.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-display.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-display.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-duplicate.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-duplicate.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-invalid-target-address.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-invalid-target-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-precreated.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-precreated.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-src-address-invalid.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-mdev-src-address-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-pci-address-device.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-pci-address-device.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-pci-address-unassigned.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-pci-address-unassigned.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-pci-address.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-pci-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-pci-duplicate.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-pci-duplicate.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-pci-multifunction.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-pci-multifunction.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-autogen-address.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-autogen-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-duplicate.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-duplicate.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-large-unit.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-large-unit.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-lsi.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-lsi.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-shareable.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-shareable.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-vhost-scsi-ccw.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-vhost-scsi-pci-boot-fail.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-vhost-scsi-pci-boot-fail.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-vhost-scsi-pci.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-vhost-scsi-pci.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-vhost-scsi-pcie.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-virtio-scsi.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-scsi-virtio-scsi.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-subsys-mdev-vfio-ap-boot-fail.s390x-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-subsys-mdev-vfio-ap-boot-fail.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-subsys-mdev-vfio-ap.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-subsys-mdev-vfio-ap.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-subsys-mdev-vfio-ccw-boot.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-subsys-mdev-vfio-ccw-duplicate-address.s390x-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-subsys-mdev-vfio-ccw-duplicate-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-subsys-mdev-vfio-ccw-invalid-address.s390x-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-subsys-mdev-vfio-ccw-invalid-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-subsys-mdev-vfio-ccw.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-usb-address-device-boot.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-usb-address-device-boot.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-usb-address-device.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-usb-address-device.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-usb-address.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-usb-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-usb-duplicate.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-usb-duplicate.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-multidomain.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-multidomain.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-autogenerate-fids.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-autogenerate-uids.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-autogenerate.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-autogenerate.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-boundaries.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-boundaries.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-ccw-memballoon.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-duplicate.s390x-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-duplicate.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-invalid-uid-valid-fid.s390x-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-invalid-uid-valid-fid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-multidomain-many.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-multidomain-many.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-set-zero.s390x-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-set-zero.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-uid-set-zero.s390x-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-uid-set-zero.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-wrong-arch.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci-wrong-arch.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio-zpci.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdev-vfio.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdevs-drive-address-conflict.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hostdevs-drive-address-conflict.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hotplug-base.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hotplug-base.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-default-1G-nodeset-2M.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-default-1G-nodeset-2M.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-default-2M.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-default-2M.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-default-5M.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-default-5M.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-default-system-size.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-default-system-size.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-default.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-default.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-memaccess-invalid.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-memaccess-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-memaccess.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-memaccess.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-memaccess2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-memaccess2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-memaccess3.x86_64-5.1.0.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-memaccess3.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-memaccess3.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-nodeset-nonexist.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-nodeset-nonexist.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-nodeset.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-nodeset.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-numa-default-2M.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-numa-default-2M.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-numa-default-dimm.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-numa-default-dimm.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-numa-default.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-numa-default.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-numa-nodeset-nonexist.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-numa-nodeset-nonexist.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-numa-nodeset-part.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-numa-nodeset-part.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-numa-nodeset.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-numa-nodeset.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-nvdimm.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-nvdimm.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-shared.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hugepages-shared.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hvf-aarch64-virt-headless.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hvf-aarch64-virt-headless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hvf-x86_64-q35-headless.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hvf-x86_64-q35-headless.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hvf-x86_64-q35-headless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hyperv-off.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hyperv-off.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hyperv-panic.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hyperv-panic.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hyperv-passthrough.x86_64-6.1.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hyperv-passthrough.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hyperv-passthrough.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hyperv-stimer-direct.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hyperv-stimer-direct.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hyperv.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/hyperv.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/input-linux.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/input-linux.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/input-usbmouse-addr.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/input-usbmouse-addr.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/input-usbmouse.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/input-usbmouse.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/input-usbtablet.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/input-usbtablet.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/input-virtio-ccw.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/input-virtio-ccw.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/intel-iommu-aw-bits.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/intel-iommu-aw-bits.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/intel-iommu-caching-mode.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/intel-iommu-caching-mode.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/intel-iommu-device-iotlb.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/intel-iommu-device-iotlb.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/intel-iommu-eim.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/intel-iommu-eim.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/intel-iommu-wrong-machine.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/intel-iommu-wrong-machine.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/intel-iommu.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/intel-iommu.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/iommu-smmuv3.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/iommu-smmuv3.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/iothreads-disk-virtio-ccw.s390x-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/iothreads-disk-virtio-ccw.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/iothreads-disk.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/iothreads-disk.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/iothreads-ids-partial.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/iothreads-ids-partial.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/iothreads-ids-pool-sizes.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/iothreads-ids-pool-sizes.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/iothreads-ids.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/iothreads-ids.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/iothreads-virtio-scsi-ccw.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/iothreads-virtio-scsi-ccw.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/iothreads-virtio-scsi-pci.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/iothreads-virtio-scsi-pci.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/iothreads-virtio-scsi-pci.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/kvm-features-off.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/kvm-features-off.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/kvm-features.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/kvm-features.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/kvm-pit-delay.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/kvm-pit-delay.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/kvm-pit-discard.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/kvm-pit-discard.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/kvmclock+eoi-disabled.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/kvmclock+eoi-disabled.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/kvmclock.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/kvmclock.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/launch-security-s390-pv.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/launch-security-s390-pv.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/launch-security-sev-direct.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/launch-security-sev-direct.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/launch-security-sev-missing-platform-info.x86_64-6.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/launch-security-sev-missing-platform-info.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/launch-security-sev.x86_64-6.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/launch-security-sev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/lease.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/lease.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/luks-disk-invalid.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/luks-disk-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/luks-disks-source-both.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/luks-disks-source-both.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/luks-disks-source-qcow2.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/luks-disks-source-qcow2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/luks-disks-source-qcow2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/luks-disks-source.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/luks-disks-source.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/luks-disks.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/luks-disks.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mach-virt-console-native.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mach-virt-console-native.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mach-virt-console-virtio.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mach-virt-console-virtio.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mach-virt-serial+console-native.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mach-virt-serial+console-native.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mach-virt-serial-compat.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mach-virt-serial-compat.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mach-virt-serial-invalid-machine.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mach-virt-serial-invalid-machine.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mach-virt-serial-native.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mach-virt-serial-native.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mach-virt-serial-pci.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mach-virt-serial-pci.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mach-virt-serial-usb.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mach-virt-serial-usb.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-aeskeywrap-off-cap.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-aeskeywrap-off-cap.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-aeskeywrap-off-caps.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-aeskeywrap-off-caps.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-aeskeywrap-on-cap.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-aeskeywrap-on-cap.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-aeskeywrap-on-caps.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-aeskeywrap-on-caps.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-aliases1.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-aliases1.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-aliases2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-aliases2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-core-off.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-core-off.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-core-on.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-core-on.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-deakeywrap-off-cap.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-deakeywrap-off-cap.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-deakeywrap-off-caps.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-deakeywrap-off-caps.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-deakeywrap-on-cap.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-deakeywrap-on-cap.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-deakeywrap-on-caps.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-deakeywrap-on-caps.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-keywrap-none-caps.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-keywrap-none-caps.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-keywrap-none.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-keywrap-none.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-loadparm-hostdev.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-loadparm-hostdev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-loadparm-multiple-disks-nets-s390.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-loadparm-multiple-disks-nets-s390.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-loadparm-net-s390.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-loadparm-net-s390.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-loadparm-s390-char-invalid.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-loadparm-s390-char-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-loadparm-s390-len-invalid.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-loadparm-s390-len-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-loadparm-s390.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-loadparm-s390.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-smm-off.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-smm-off.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-smm-on.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-smm-on.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-vmport-opt.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/machine-vmport-opt.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memfd-memory-default-hugepage.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memfd-memory-default-hugepage.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memfd-memory-numa.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memfd-memory-numa.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-align-fail.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-align-fail.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-dimm-addr.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-dimm-addr.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-dimm.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-dimm.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-invalid-targetnode.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-invalid-targetnode.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-multiple.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-multiple.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nonuma.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nonuma.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm-access.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm-access.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm-align.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm-align.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm-align.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm-label.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm-label.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm-label.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm-pmem.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm-pmem.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm-ppc64-abi-update.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm-ppc64.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm-ppc64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm-readonly.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm-readonly.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-nvdimm.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-ppc64-nonuma-abi-update.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-ppc64-nonuma.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-ppc64-nonuma.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-virtio-mem-overlap-address.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-virtio-mem-overlap-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-virtio-mem.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-virtio-mem.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-virtio-pmem.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-virtio-pmem.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug-virtio-pmem.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memory-hotplug.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memorybacking-set.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memorybacking-set.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memorybacking-unset.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memorybacking-unset.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memtune-unlimited.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memtune-unlimited.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memtune.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/memtune.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/metadata-duplicate.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/metadata-duplicate.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/metadata.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/metadata.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/migrate-numa-unaligned.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/migrate-numa-unaligned.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/migrate.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/migrate.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/minimal-no-memory.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/minimal-no-memory.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/minimal.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/minimal.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/misc-acpi.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/misc-acpi.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/misc-disable-s3.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/misc-disable-s3.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/misc-disable-suspends.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/misc-disable-suspends.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/misc-enable-s4.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/misc-enable-s4.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/misc-no-reboot.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/misc-no-reboot.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/misc-no-reboot.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/misc-uuid.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/misc-uuid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/missing-machine.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/missing-machine.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mlock-off.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mlock-off.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mlock-on.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/mlock-on.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/multifunction-pci-device.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/multifunction-pci-device.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/name-escape.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/name-escape.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-bandwidth.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-bandwidth.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-bandwidth2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-bandwidth2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-client.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-client.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-coalesce.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-coalesce.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-eth-hostip.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-eth-hostip.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-eth-ifname.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-eth-ifname.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-eth-names.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-eth-names.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-eth-unmanaged-tap.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-eth-unmanaged-tap.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-eth.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-eth.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-hostdev-bootorder.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-hostdev-bootorder.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-hostdev-fail.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-hostdev-fail.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-hostdev-multidomain.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-hostdev-multidomain.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-hostdev-vfio-multidomain.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-hostdev-vfio-multidomain.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-hostdev-vfio.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-hostdev-vfio.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-hostdev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-hostdev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-isolated-port.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-isolated-port.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-linkstate.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-linkstate.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-many-models.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-many-models.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-mcast.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-mcast.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-midonet.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-midonet.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-mtu.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-mtu.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-openvswitch.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-openvswitch.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-server.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-server.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-udp.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-udp.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-user-addr.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-user-addr.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-user-passt.x86_64-7.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-user-passt.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-user-passt.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-user-slirp-portforward.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-user-slirp-portforward.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-user.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-user.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-vdpa-multiqueue.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-vdpa-multiqueue.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-vdpa.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-vdpa.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-vhostuser-fail.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-vhostuser-fail.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-vhostuser-multiq.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-vhostuser-multiq.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-vhostuser.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-vhostuser.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-ccw.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-ccw.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-device.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-device.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-disable-offloads.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-disable-offloads.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-netdev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-netdev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-network-portgroup.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-network-portgroup.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-rss.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-rss.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-rxqueuesize-invalid-size.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-rxqueuesize-invalid-size.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-rxtxqueuesize.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-rxtxqueuesize.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-teaming-hostdev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-teaming-hostdev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-teaming-network.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-teaming-network.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-teaming.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-teaming.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-vhost.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio-vhost.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/net-virtio.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/non-x86_64-timer-error.s390x-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/non-x86_64-timer-error.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/nosharepages.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/nosharepages.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numad-auto-memory-vcpu-cpuset.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numad-auto-memory-vcpu-cpuset.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numad-auto-memory-vcpu-no-cpuset-and-placement.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numad-auto-vcpu-no-numatune.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numad-auto-vcpu-no-numatune.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numad-auto-vcpu-static-numatune-no-nodeset.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numad-auto-vcpu-static-numatune-no-nodeset.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numad-auto-vcpu-static-numatune.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numad-auto-vcpu-static-numatune.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numad-static-memory-auto-vcpu.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numad-static-memory-auto-vcpu.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numad-static-vcpu-no-numatune.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numad-static-vcpu-no-numatune.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numad.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numad.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-auto-nodeset-invalid.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-auto-nodeset-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-auto-prefer.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-auto-prefer.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-distances.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-distances.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-hmat-none.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-hmat-none.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-hmat.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-hmat.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnode-invalid-mode.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnode-invalid-mode.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnode-no-memory.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnode-no-memory.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnode-nocpu.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnode-nocpu.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnode-restrictive-mode-err-mixed.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnode-restrictive-mode-err-mixed.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnode-restrictive-mode.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnode-restrictive-mode.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnode-unavailable-restrictive.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnode-unavailable-restrictive.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnode-unavailable-strict.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnode-unavailable-strict.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnode.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnode.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnode.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnodes-problematic.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memnodes-problematic.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memory-invalid-nodeset.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-memory-invalid-nodeset.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-no-vcpu.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-no-vcpu.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-static-nodeset-exceed-hostnode.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-static-nodeset-exceed-hostnode.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-system-memory.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numatune-system-memory.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numavcpus-topology-mismatch.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/numavcpus-topology-mismatch.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pages-dimm-discard.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pages-dimm-discard.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pages-discard-hugepages.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pages-discard-hugepages.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pages-discard.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pages-discard.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/panic-double.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/panic-double.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/panic-no-address.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/panic-no-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/panic-pseries.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/panic-pseries.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/panic.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/panic.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/parallel-parport-chardev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/parallel-parport-chardev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/parallel-tcp-chardev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/parallel-tcp-chardev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/parallel-unix-chardev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/parallel-unix-chardev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pc-i440fx-acpi-root-hotplug-disable.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pc-i440fx-acpi-root-hotplug-enable.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-autoadd-addr.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-autoadd-addr.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-autoadd-idx.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-autoadd-idx.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-autofill-addr.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-autofill-addr.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-bridge-duplicate-index.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-bridge-duplicate-index.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-bridge-many-disks.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-bridge-many-disks.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-bridge-negative-index-invalid.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-bridge-negative-index-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-bridge.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-bridge.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-bus-invalid.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-bus-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-domain-invalid.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-domain-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-expander-bus-bad-bus.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-expander-bus-bad-bus.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-expander-bus-bad-machine.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-expander-bus-bad-machine.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-expander-bus-bad-node.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-expander-bus-bad-node.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-expander-bus.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-expander-bus.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-function-invalid.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-function-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-many.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-many.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-rom-disabled-invalid.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-rom-disabled-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-rom-disabled.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-rom-disabled.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-rom.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-rom.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-root-address.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-root-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-root-nonzero-index.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-root-nonzero-index.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-serial-dev-chardev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-serial-dev-chardev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-slot-invalid.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pci-slot-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-expander-bus-aarch64.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-expander-bus-aarch64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-expander-bus-bad-bus.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-expander-bus-bad-bus.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-expander-bus-bad-machine.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-expander-bus-bad-machine.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-expander-bus.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-expander-bus.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-root-port-model-generic.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-root-port-model-generic.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-root-port-model-ioh3420.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-root-port-model-ioh3420.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-root-port-nohotplug.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-root-port-nohotplug.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-root-port-too-many.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-root-port-too-many.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-root-port.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-root-port.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-root.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-root.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-switch-downstream-port.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-switch-downstream-port.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-switch-upstream-port.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcie-switch-upstream-port.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcihole64-gib.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcihole64-gib.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcihole64-q35.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcihole64-q35.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcihole64.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pcihole64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pmu-feature-off.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pmu-feature-off.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pmu-feature.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pmu-feature.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc-dtb.ppc-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc-dtb.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-default-cpu-kvm-pseries-2.7.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-default-cpu-kvm-pseries-3.1.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-default-cpu-kvm-pseries-4.2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-default-cpu-tcg-pseries-2.7.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-default-cpu-tcg-pseries-3.1.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-default-cpu-tcg-pseries-4.2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-pseries-graphics.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-pseries-graphics.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-pseries-headless.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-pseries-headless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-tpm-double.ppc64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-tpm-double.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-tpmproxy-double.ppc64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-tpmproxy-double.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-tpmproxy-single.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-tpmproxy-single.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-tpmproxy-with-tpm.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-tpmproxy-with-tpm.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-usb-controller-legacy.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-usb-controller-legacy.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-usb-controller-qemu-xhci.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-usb-controller-qemu-xhci.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-usb-controller.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppc64-usb-controller.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppce500-serial.ppc-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/ppce500-serial.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-basic.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-basic.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-console-native.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-console-native.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-console-virtio.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-console-virtio.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-cpu-compat-power10.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-cpu-compat-power10.ppc64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-cpu-compat-power10.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-cpu-compat-power9.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-cpu-compat-power9.ppc64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-cpu-compat-power9.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-cpu-compat.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-cpu-compat.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-cpu-exact.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-cpu-exact.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-cpu-le.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-cpu-le.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-default-phb-numa-node.ppc64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-default-phb-numa-node.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-features-invalid-machine.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-features-invalid-machine.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-features.ppc64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-features.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-features.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-hostdevs-1.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-hostdevs-1.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-hostdevs-2.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-hostdevs-2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-hostdevs-3.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-hostdevs-3.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-many-buses-1.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-many-buses-1.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-many-buses-2.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-many-buses-2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-many-devices.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-many-devices.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-no-parallel.ppc64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-no-parallel.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-nvram.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-nvram.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-panic-address.ppc64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-panic-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-panic-missing.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-panic-missing.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-panic-no-address.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-panic-no-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-phb-default-missing.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-phb-default-missing.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-phb-invalid-target-index-1.ppc64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-phb-invalid-target-index-1.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-phb-invalid-target-index-2.ppc64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-phb-invalid-target-index-2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-phb-invalid-target-index-3.ppc64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-phb-invalid-target-index-3.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-phb-numa-node.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-phb-numa-node.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-phb-simple.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-phb-simple.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-phb-user-alias.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-phb-user-alias.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-serial+console-native.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-serial+console-native.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-serial-compat.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-serial-compat.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-serial-invalid-machine.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-serial-invalid-machine.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-serial-native.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-serial-native.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-serial-pci.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-serial-pci.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-serial-usb.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-serial-usb.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-spaprvio-invalid.ppc64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-spaprvio-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-usb-default.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-usb-default.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-usb-kbd.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-usb-kbd.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-usb-multi.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-usb-multi.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-vio-address-clash.ppc64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-vio-address-clash.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-vio-user-assigned.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-vio-user-assigned.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-vio.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pseries-vio.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pv-spinlock-disabled.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pv-spinlock-disabled.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pv-spinlock-enabled.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pv-spinlock-enabled.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pvpanic-pci-aarch64.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pvpanic-pci-aarch64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pvpanic-pci-invalid-address-aarch64.aarch64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pvpanic-pci-invalid-address-aarch64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pvpanic-pci-no-address-aarch64.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pvpanic-pci-no-address-aarch64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pvpanic-pci-x86_64.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/pvpanic-pci-x86_64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-default-devices-only.x86_64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-default-devices-only.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-default-devices-only.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-dmi-bad-address1.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-dmi-bad-address1.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-dmi-bad-address2.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-dmi-bad-address2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-multifunction.x86_64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-multifunction.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-multifunction.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-pci-force-address.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-pci-force-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-pcie-autoadd.x86_64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-pcie-autoadd.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-pcie-autoadd.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-pcie.x86_64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-pcie.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-pcie.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-usb2-multi.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-usb2-multi.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-usb2-reorder.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-usb2-reorder.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-usb2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-usb2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-virt-manager-basic.x86_64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-virt-manager-basic.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-virt-manager-basic.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-wrong-root.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35-wrong-root.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/q35.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/qemu-ns-alt.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/qemu-ns-alt.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/qemu-ns-commandline-ns0.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/qemu-ns-commandline-ns0.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/qemu-ns-commandline-ns1.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/qemu-ns-commandline-ns1.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/qemu-ns-commandline.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/qemu-ns-commandline.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/qemu-ns-domain-commandline-ns0.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/qemu-ns-domain-commandline-ns0.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/qemu-ns-domain-commandline.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/qemu-ns-domain-commandline.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/qemu-ns-domain-ns0.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/qemu-ns-domain-ns0.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/qemu-ns-no-env.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/qemu-ns-no-env.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/qemu-ns.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/qemu-ns.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/reboot-timeout-disabled.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/reboot-timeout-disabled.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/reboot-timeout-enabled.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/reboot-timeout-enabled.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/restore-v2-fd.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/restore-v2-fd.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/restore-v2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/restore-v2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/riscv64-virt-graphics.riscv64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/riscv64-virt-graphics.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/riscv64-virt-headless-mmio.riscv64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/riscv64-virt-headless-mmio.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/riscv64-virt-headless.riscv64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/riscv64-virt-headless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-allow-bogus-usb-controller.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-allow-bogus-usb-controller.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-allow-bogus-usb-none.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-allow-bogus-usb-none.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-async-teardown-disabled.s390x-6.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-async-teardown-disabled.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-async-teardown-disabled.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-async-teardown-no-attrib.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-async-teardown-no-attrib.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-async-teardown.s390x-6.0.0.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-async-teardown.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-async-teardown.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-default-cpu-kvm-ccw-virtio-2.7.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-default-cpu-kvm-ccw-virtio-4.2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-default-cpu-tcg-ccw-virtio-2.7.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-default-cpu-tcg-ccw-virtio-4.2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-defaultconsole.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-defaultconsole.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-no-parallel.s390x-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-no-parallel.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-panic-address.s390x-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-panic-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-panic-missing.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-panic-missing.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-panic-no-address.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-panic-no-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-panic.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-panic.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-serial-2.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-serial-2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-serial-console.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-serial-console.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-serial.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390-serial.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390x-ccw-graphics.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390x-ccw-graphics.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390x-ccw-headless.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/s390x-ccw-headless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-dac-none.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-dac-none.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-device-duplicates.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-device-duplicates.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-device-multiple.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-device-multiple.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-device-relabel-invalid.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-device-relabel-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-dynamic-baselabel.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-dynamic-baselabel.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-dynamic-labelskip.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-dynamic-labelskip.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-dynamic-none-relabel.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-dynamic-none-relabel.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-dynamic-none.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-dynamic-none.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-dynamic-override.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-dynamic-override.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-dynamic-relabel.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-dynamic-relabel.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-dynamic.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-dynamic.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-multiple.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-multiple.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-none.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-none.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-static-labelskip.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-static-labelskip.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-static-relabel.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-static-relabel.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-static.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/seclabel-static.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-debugcon.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-debugcon.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-dev-chardev-iobase.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-dev-chardev-iobase.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-dev-chardev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-dev-chardev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-file-chardev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-file-chardev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-file-log.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-file-log.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-many-chardev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-many-chardev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-pty-chardev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-pty-chardev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-spiceport.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-spiceport.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-target-port-auto.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-target-port-auto.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-tcp-chardev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-tcp-chardev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-tcp-telnet-chardev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-tcp-telnet-chardev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-tcp-tlsx509-chardev-notls.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-tcp-tlsx509-chardev-notls.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-tcp-tlsx509-chardev-verify.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-tcp-tlsx509-chardev-verify.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-tcp-tlsx509-chardev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-tcp-tlsx509-chardev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-tcp-tlsx509-secret-chardev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-tcp-tlsx509-secret-chardev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-udp-chardev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-udp-chardev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-unix-chardev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-unix-chardev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-unix-missing-source.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-unix-missing-source.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-vc-chardev.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/serial-vc-chardev.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/sgx-epc.x86_64-7.0.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/sgx-epc.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/shmem-invalid-address.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/shmem-invalid-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/shmem-invalid-size.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/shmem-invalid-size.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/shmem-msi-only.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/shmem-msi-only.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/shmem-plain-doorbell.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/shmem-plain-doorbell.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/shmem-small-size.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/shmem-small-size.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smartcard-controller.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smartcard-controller.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smartcard-host-certificates-database.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smartcard-host-certificates-database.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smartcard-host-certificates.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smartcard-host-certificates.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smartcard-host.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smartcard-host.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smartcard-passthrough-spicevmc.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smartcard-passthrough-spicevmc.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smartcard-passthrough-tcp.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smartcard-passthrough-tcp.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smartcard-passthrough-unix.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smartcard-passthrough-unix.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smbios-date.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smbios-date.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smbios-type-fwcfg.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smbios-type-fwcfg.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smbios-uuid-match.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smbios-uuid-match.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smbios.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/smbios.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/sound-device.x86_64-4.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/sound-device.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/sound-device.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/sparc-minimal.sparc-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/sparc-minimal.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tap-vhost-incorrect.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tap-vhost-incorrect.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tap-vhost.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tap-vhost.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-emulator-spapr.ppc64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-emulator-spapr.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-emulator-tpm2-enc.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-emulator-tpm2-enc.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-emulator-tpm2-pstate.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-emulator-tpm2-pstate.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-emulator-tpm2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-emulator-tpm2.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-emulator-tpm2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-emulator.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-emulator.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-emulator.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-external.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-external.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-no-backend-invalid.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-no-backend-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-passthrough-crb.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-passthrough-crb.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-passthrough.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tpm-passthrough.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tseg-explicit-size.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tseg-explicit-size.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tseg-i440fx.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tseg-i440fx.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tseg-invalid-size.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/tseg-invalid-size.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-bus-missing.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-bus-missing.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-default-i440fx.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-default-i440fx.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-default-isapc.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-default-isapc.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-default-q35.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-default-q35.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-default-unavailable-i440fx.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-default-unavailable-i440fx.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-default-unavailable-q35.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-default-unavailable-q35.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-ich9-autoassign.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-ich9-autoassign.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-ich9-companion.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-ich9-companion.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-ich9-ehci-addr.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-ich9-ehci-addr.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-ich9-no-companion.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-ich9-no-companion.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-implicit-i440fx.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-implicit-i440fx.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-implicit-isapc.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-implicit-isapc.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-implicit-q35.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-implicit-q35.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-nec-xhci-limit.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-nec-xhci-limit.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-nec-xhci-unavailable.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-nec-xhci-unavailable.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-nec-xhci.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-nec-xhci.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-nex-xhci-autoassign.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-nex-xhci-autoassign.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-piix3.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-piix3.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-qemu-xhci-limit.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-qemu-xhci-limit.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-qemu-xhci.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-controller-qemu-xhci.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-hub-autoadd-deluxe.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-hub-autoadd-deluxe.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-hub-autoadd.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-hub-autoadd.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-hub-conflict.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-hub-conflict.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-hub-nonexistent.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-hub-nonexistent.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-hub.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-hub.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-long-port-path.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-long-port-path.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-none-hub.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-none-hub.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-none-other.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-none-other.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-none-usbtablet.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-none-usbtablet.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-none.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-none.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-port-autoassign.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-port-autoassign.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-port-missing.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-port-missing.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-ports-out-of-range.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-ports-out-of-range.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-ports.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-ports.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-redir-boot.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-redir-boot.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-redir-filter-version.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-redir-filter-version.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-redir-filter.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-redir-filter.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-redir-unix.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-redir-unix.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-redir.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-redir.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-too-long-port-path-invalid.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb-too-long-port-path-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb1-usb2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/usb1-usb2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/user-aliases-usb.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/user-aliases-usb.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/user-aliases.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/user-aliases.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/user-aliases2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/user-aliases2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vcpu-placement-static.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vcpu-placement-static.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-user-fs-fd-memory.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-user-fs-fd-memory.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-user-fs-hugepages.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-user-fs-hugepages.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-user-fs-readonly.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-user-fs-readonly.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-user-fs-sock.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-user-fs-sock.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-user-gpu-secondary.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-user-gpu-secondary.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-user-vga.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-user-vga.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-vsock-auto.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-vsock-auto.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-vsock-ccw-auto.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-vsock-ccw-auto.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-vsock-ccw-iommu.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-vsock-ccw-iommu.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-vsock-ccw.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-vsock-ccw.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-vsock.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost-vsock.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost_queues-invalid.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vhost_queues-invalid.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-bochs-display-device.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-bochs-display-device.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-device-pciaddr-default.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-device-pciaddr-default.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-invalid-multiple-devices.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-invalid-multiple-devices.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-multiple-primaries.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-multiple-primaries.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-none-device.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-none-device.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-qxl-device-vgamem.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-qxl-device-vgamem.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-qxl-device-vram64.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-qxl-device-vram64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-qxl-device.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-qxl-device.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-qxl-heads.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-qxl-heads.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-qxl-noheads.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-qxl-noheads.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-qxl-resolution.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-qxl-resolution.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-qxl-sec-device-vgamem.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-qxl-sec-device-vgamem.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-qxl-sec-device-vram64.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-qxl-sec-device-vram64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-qxl-sec-device.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-qxl-sec-device.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-ramfb-display-device-pci-address.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-ramfb-display-device-pci-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-ramfb-display-device.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-ramfb-display-device.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-vga-device-vgamem.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-vga-device-vgamem.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-vga-device.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-vga-device.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-vga-qxl-heads.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-vga-qxl-heads.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-blob-off.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-blob-off.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-blob-on.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-blob-on.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-gpu-ccw-auto.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-gpu-ccw-auto.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-gpu-ccw.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-gpu-ccw.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-gpu-device.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-gpu-device.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-gpu-sdl-gl.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-gpu-sdl-gl.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-gpu-secondary.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-gpu-secondary.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-gpu-spice-gl.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-gpu-spice-gl.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-gpu-virgl.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-gpu-virgl.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-vga-gpu-gl.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-vga-gpu-gl.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-vga.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/video-virtio-vga.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-9p-createmode.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-9p-createmode.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-9p-multidevs.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-9p-multidevs.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-input-passthrough.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-input-passthrough.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-input.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-input.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-iommu-aarch64.aarch64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-iommu-aarch64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-iommu-invalid-address-type.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-iommu-invalid-address-type.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-iommu-invalid-address.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-iommu-invalid-address.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-iommu-no-acpi.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-iommu-no-acpi.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-iommu-wrong-machine.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-iommu-wrong-machine.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-iommu-x86_64.x86_64-6.1.0.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-iommu-x86_64.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-iommu-x86_64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-lun.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-lun.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-non-transitional.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-non-transitional.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-controller-ats.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-controller-ats.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-controller-iommu.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-controller-iommu.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-controller-packed.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-controller-packed.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-disk-ats.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-disk-ats.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-disk-iommu.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-disk-iommu.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-disk-packed.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-disk-packed.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-fs-ats.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-fs-ats.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-fs-iommu.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-fs-iommu.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-fs-packed.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-fs-packed.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-input-ats.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-input-ats.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-input-iommu.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-input-iommu.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-input-packed.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-input-packed.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-memballoon-ats.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-memballoon-ats.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-memballoon-freepage-reporting.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-memballoon-freepage-reporting.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-memballoon-iommu.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-memballoon-iommu.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-memballoon-packed.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-memballoon-packed.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-net-ats.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-net-ats.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-net-iommu.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-net-iommu.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-net-packed.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-net-packed.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-rng-ats.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-rng-ats.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-rng-iommu.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-rng-iommu.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-rng-packed.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-rng-packed.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-video-ats.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-video-ats.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-video-iommu.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-video-iommu.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-video-packed.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options-video-packed.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-options.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-rng-builtin.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-rng-builtin.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-rng-builtin.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-rng-ccw.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-rng-ccw.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-rng-default.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-rng-default.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-rng-egd-crash.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-rng-egd-crash.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-rng-egd-unix.x86_64-5.2.0.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-rng-egd-unix.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-rng-egd-unix.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-rng-egd.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-rng-egd.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-rng-multiple.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-rng-multiple.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-rng-random.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-rng-random.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-transitional-not-supported.x86_64-latest.err (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-transitional-not-supported.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-transitional.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/virtio-transitional.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vmcoreinfo.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/vmcoreinfo.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/watchdog-device.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/watchdog-device.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/watchdog-diag288.s390x-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/watchdog-diag288.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/watchdog-dump.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/watchdog-dump.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/watchdog-injectnmi.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/watchdog-injectnmi.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/watchdog-q35-multiple.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/watchdog-q35-multiple.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/watchdog.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/watchdog.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86-kvm-32-on-64.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86-kvm-32-on-64.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86_64-default-cpu-kvm-pc-4.2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86_64-default-cpu-kvm-q35-4.2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86_64-default-cpu-tcg-features.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86_64-default-cpu-tcg-features.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86_64-default-cpu-tcg-pc-4.2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86_64-default-cpu-tcg-q35-4.2.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86_64-pc-graphics.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86_64-pc-graphics.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86_64-pc-headless.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86_64-pc-headless.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86_64-q35-graphics.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86_64-q35-graphics.xml (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86_64-q35-headless.x86_64-latest.args (100%) rename tests/{qemuxml2argvdata => qemuxmlconfdata}/x86_64-q35-headless.xml (100%) diff --git a/tests/qemunbdkittest.c b/tests/qemunbdkittest.c index 559196a1cd..3f6bd09616 100644 --- a/tests/qemunbdkittest.c +++ b/tests/qemunbdkittest.c @@ -129,7 +129,7 @@ typedef enum { static void testInfoSetPaths(TestInfo *info) { - info->infile = g_strdup_printf("%s/qemuxml2argvdata/%s.xml", + info->infile = g_strdup_printf("%s/qemuxmlconfdata/%s.xml", abs_srcdir, info->name); info->outtemplate = g_strdup_printf("%s/qemunbdkitdata/%s", abs_srcdir, info->name); diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index e2989c05aa..b8bb1aecb3 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -31,7 +31,7 @@ struct testData { virQEMUDriver *driver; - const char *file; /* file name to load VM def XML from; qemuxml2argvdata/ */ + const char *file; /* file name to load VM def XML from; qemuxmlconfdata/ */ }; @@ -46,7 +46,7 @@ prepareObjects(virQEMUDriver *driver, g_autofree char *domxml = NULL; g_autofree char *latestCapsFile = NULL; - filename = g_strdup_printf("%s/qemuxml2argvdata/%s.xml", abs_srcdir, xmlname); + filename = g_strdup_printf("%s/qemuxmlconfdata/%s.xml", abs_srcdir, xmlname); if (virTestLoadFile(filename, &domxml) < 0) return -1; diff --git a/tests/qemuxml2argvdata b/tests/qemuxml2argvdata new file mode 120000 index 0000000000..4f6042e85b --- /dev/null +++ b/tests/qemuxml2argvdata @@ -0,0 +1 @@ +qemuxmlconfdata/ \ No newline at end of file diff --git a/tests/qemuxmlactivetest.c b/tests/qemuxmlactivetest.c index fd2318d8e3..2aefc871ee 100644 --- a/tests/qemuxmlactivetest.c +++ b/tests/qemuxmlactivetest.c @@ -175,7 +175,7 @@ testRunActive(const char *name, testQemuInfoSetArgs(info, ap); va_end(ap); - info->infile = g_strdup_printf("%s/qemuxml2argvdata/%s.xml", abs_srcdir, + info->infile = g_strdup_printf("%s/qemuxmlconfdata/%s.xml", abs_srcdir, info->name); info->out_xml_active = g_strdup_printf("%s/qemuxmlactive2xmldata/%s-active%s.xml", diff --git a/tests/qemuxml2argvdata/440fx-ide-address-conflict.x86_64-latest.err b/tests/qemuxmlconfdata/440fx-ide-address-conflict.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/440fx-ide-address-conflict.x86_64-latest.err rename to tests/qemuxmlconfdata/440fx-ide-address-conflict.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml b/tests/qemuxmlconfdata/440fx-ide-address-conflict.xml similarity index 100% rename from tests/qemuxml2argvdata/440fx-ide-address-conflict.xml rename to tests/qemuxmlconfdata/440fx-ide-address-conflict.xml diff --git a/tests/qemuxml2argvdata/440fx-wrong-root.x86_64-latest.err b/tests/qemuxmlconfdata/440fx-wrong-root.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/440fx-wrong-root.x86_64-latest.err rename to tests/qemuxmlconfdata/440fx-wrong-root.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/440fx-wrong-root.xml b/tests/qemuxmlconfdata/440fx-wrong-root.xml similarity index 100% rename from tests/qemuxml2argvdata/440fx-wrong-root.xml rename to tests/qemuxmlconfdata/440fx-wrong-root.xml diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-cpu-passthrough.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-cpu-passthrough.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-cpu-passthrough.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.xml b/tests/qemuxmlconfdata/aarch64-cpu-passthrough.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-cpu-passthrough.xml rename to tests/qemuxmlconfdata/aarch64-cpu-passthrough.xml diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.xml rename to tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.xml diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.xml b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.xml rename to tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.xml diff --git a/tests/qemuxml2argvdata/aarch64-features-sve-disabled.aarch64-latest.err b/tests/qemuxmlconfdata/aarch64-features-sve-disabled.aarch64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/aarch64-features-sve-disabled.aarch64-latest.err rename to tests/qemuxmlconfdata/aarch64-features-sve-disabled.aarch64-latest.err diff --git a/tests/qemuxml2argvdata/aarch64-features-sve-disabled.xml b/tests/qemuxmlconfdata/aarch64-features-sve-disabled.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-features-sve-disabled.xml rename to tests/qemuxmlconfdata/aarch64-features-sve-disabled.xml diff --git a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-features-sve.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-features-sve.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-features-sve.xml b/tests/qemuxmlconfdata/aarch64-features-sve.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-features-sve.xml rename to tests/qemuxmlconfdata/aarch64-features-sve.xml diff --git a/tests/qemuxml2argvdata/aarch64-features-wrong.aarch64-latest.err b/tests/qemuxmlconfdata/aarch64-features-wrong.aarch64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/aarch64-features-wrong.aarch64-latest.err rename to tests/qemuxmlconfdata/aarch64-features-wrong.aarch64-latest.err diff --git a/tests/qemuxml2argvdata/aarch64-features-wrong.xml b/tests/qemuxmlconfdata/aarch64-features-wrong.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-features-wrong.xml rename to tests/qemuxmlconfdata/aarch64-features-wrong.xml diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-default-both.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-default-both.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-gic-default-both.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.xml b/tests/qemuxmlconfdata/aarch64-gic-default-both.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-default-both.xml rename to tests/qemuxmlconfdata/aarch64-gic-default-both.xml diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-default-v2.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-default-v2.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-gic-default-v2.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.xml b/tests/qemuxmlconfdata/aarch64-gic-default-v2.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-default-v2.xml rename to tests/qemuxmlconfdata/aarch64-gic-default-v2.xml diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-default-v3.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-default-v3.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-gic-default-v3.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.xml b/tests/qemuxmlconfdata/aarch64-gic-default-v3.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-default-v3.xml rename to tests/qemuxmlconfdata/aarch64-gic-default-v3.xml diff --git a/tests/qemuxml2argvdata/aarch64-gic-default.aarch64-4.2.0.args b/tests/qemuxmlconfdata/aarch64-gic-default.aarch64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-default.aarch64-4.2.0.args rename to tests/qemuxmlconfdata/aarch64-gic-default.aarch64-4.2.0.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-default.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-default.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-default.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-gic-default.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-default.xml b/tests/qemuxmlconfdata/aarch64-gic-default.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-default.xml rename to tests/qemuxmlconfdata/aarch64-gic-default.xml diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-host.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-host.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-gic-host.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.xml b/tests/qemuxmlconfdata/aarch64-gic-host.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-host.xml rename to tests/qemuxmlconfdata/aarch64-gic-host.xml diff --git a/tests/qemuxml2argvdata/aarch64-gic-invalid.aarch64-latest.err b/tests/qemuxmlconfdata/aarch64-gic-invalid.aarch64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-invalid.aarch64-latest.err rename to tests/qemuxmlconfdata/aarch64-gic-invalid.aarch64-latest.err diff --git a/tests/qemuxml2argvdata/aarch64-gic-invalid.xml b/tests/qemuxmlconfdata/aarch64-gic-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-invalid.xml rename to tests/qemuxmlconfdata/aarch64-gic-invalid.xml diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-both.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-none-both.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-both.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-gic-none-both.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-both.xml b/tests/qemuxmlconfdata/aarch64-gic-none-both.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-both.xml rename to tests/qemuxmlconfdata/aarch64-gic-none-both.xml diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-tcg.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.xml b/tests/qemuxmlconfdata/aarch64-gic-none-tcg.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-tcg.xml rename to tests/qemuxmlconfdata/aarch64-gic-none-tcg.xml diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v2.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-none-v2.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-v2.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-gic-none-v2.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v2.xml b/tests/qemuxmlconfdata/aarch64-gic-none-v2.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-v2.xml rename to tests/qemuxmlconfdata/aarch64-gic-none-v2.xml diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v3.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-none-v3.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-v3.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-gic-none-v3.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v3.xml b/tests/qemuxmlconfdata/aarch64-gic-none-v3.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none-v3.xml rename to tests/qemuxmlconfdata/aarch64-gic-none-v3.xml diff --git a/tests/qemuxml2argvdata/aarch64-gic-none.aarch64-4.2.0.args b/tests/qemuxmlconfdata/aarch64-gic-none.aarch64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none.aarch64-4.2.0.args rename to tests/qemuxmlconfdata/aarch64-gic-none.aarch64-4.2.0.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-none.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-none.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-gic-none.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-none.xml b/tests/qemuxmlconfdata/aarch64-gic-none.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-none.xml rename to tests/qemuxmlconfdata/aarch64-gic-none.xml diff --git a/tests/qemuxml2argvdata/aarch64-gic-not-arm.ppc64-latest.err b/tests/qemuxmlconfdata/aarch64-gic-not-arm.ppc64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-not-arm.ppc64-latest.err rename to tests/qemuxmlconfdata/aarch64-gic-not-arm.ppc64-latest.err diff --git a/tests/qemuxml2argvdata/aarch64-gic-not-arm.xml b/tests/qemuxmlconfdata/aarch64-gic-not-arm.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-not-arm.xml rename to tests/qemuxmlconfdata/aarch64-gic-not-arm.xml diff --git a/tests/qemuxml2argvdata/aarch64-gic-not-virt.aarch64-latest.err b/tests/qemuxmlconfdata/aarch64-gic-not-virt.aarch64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-not-virt.aarch64-latest.err rename to tests/qemuxmlconfdata/aarch64-gic-not-virt.aarch64-latest.err diff --git a/tests/qemuxml2argvdata/aarch64-gic-not-virt.xml b/tests/qemuxmlconfdata/aarch64-gic-not-virt.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-not-virt.xml rename to tests/qemuxmlconfdata/aarch64-gic-not-virt.xml diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-v2.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-v2.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-gic-v2.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.xml b/tests/qemuxmlconfdata/aarch64-gic-v2.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-v2.xml rename to tests/qemuxmlconfdata/aarch64-gic-v2.xml diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-v3.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-v3.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-gic-v3.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.xml b/tests/qemuxmlconfdata/aarch64-gic-v3.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-v3.xml rename to tests/qemuxmlconfdata/aarch64-gic-v3.xml diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-kvm-32-on-64.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-kvm-32-on-64.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-kvm-32-on-64.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.xml b/tests/qemuxmlconfdata/aarch64-kvm-32-on-64.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-kvm-32-on-64.xml rename to tests/qemuxmlconfdata/aarch64-kvm-32-on-64.xml diff --git a/tests/qemuxml2argvdata/aarch64-pci-serial.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-pci-serial.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-pci-serial.xml b/tests/qemuxmlconfdata/aarch64-pci-serial.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-pci-serial.xml rename to tests/qemuxmlconfdata/aarch64-pci-serial.xml diff --git a/tests/qemuxml2argvdata/aarch64-tpm-wrong-model.aarch64-latest.err b/tests/qemuxmlconfdata/aarch64-tpm-wrong-model.aarch64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/aarch64-tpm-wrong-model.aarch64-latest.err rename to tests/qemuxmlconfdata/aarch64-tpm-wrong-model.aarch64-latest.err diff --git a/tests/qemuxml2argvdata/aarch64-tpm-wrong-model.xml b/tests/qemuxmlconfdata/aarch64-tpm-wrong-model.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-tpm-wrong-model.xml rename to tests/qemuxmlconfdata/aarch64-tpm-wrong-model.xml diff --git a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-tpm.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-tpm.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-tpm.xml b/tests/qemuxmlconfdata/aarch64-tpm.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-tpm.xml rename to tests/qemuxmlconfdata/aarch64-tpm.xml diff --git a/tests/qemuxml2argvdata/aarch64-traditional-pci.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-traditional-pci.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-traditional-pci.xml b/tests/qemuxmlconfdata/aarch64-traditional-pci.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-traditional-pci.xml rename to tests/qemuxmlconfdata/aarch64-traditional-pci.xml diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-usb-controller.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller.xml b/tests/qemuxmlconfdata/aarch64-usb-controller.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-usb-controller.xml rename to tests/qemuxmlconfdata/aarch64-usb-controller.xml diff --git a/tests/qemuxml2argvdata/aarch64-video-default.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-video-default.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-video-default.xml b/tests/qemuxmlconfdata/aarch64-video-default.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-video-default.xml rename to tests/qemuxmlconfdata/aarch64-video-default.xml diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.xml b/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.xml rename to tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.xml diff --git a/tests/qemuxml2argvdata/aarch64-virt-default-nic.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-virt-default-nic.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-virt-default-nic.xml b/tests/qemuxmlconfdata/aarch64-virt-default-nic.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-virt-default-nic.xml rename to tests/qemuxmlconfdata/aarch64-virt-default-nic.xml diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml b/tests/qemuxmlconfdata/aarch64-virt-graphics.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-virt-graphics.xml rename to tests/qemuxmlconfdata/aarch64-virt-graphics.xml diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless-mmio.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-virt-headless-mmio.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless-mmio.xml b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-virt-headless-mmio.xml rename to tests/qemuxmlconfdata/aarch64-virt-headless-mmio.xml diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.xml b/tests/qemuxmlconfdata/aarch64-virt-headless.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-virt-headless.xml rename to tests/qemuxmlconfdata/aarch64-virt-headless.xml diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-4.2.0.args b/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-4.2.0.args rename to tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-4.2.0.args diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.xml b/tests/qemuxmlconfdata/aarch64-virt-virtio.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-virt-virtio.xml rename to tests/qemuxmlconfdata/aarch64-virt-virtio.xml diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.args rename to tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.xml b/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.xml similarity index 100% rename from tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.xml rename to tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.xml diff --git a/tests/qemuxml2argvdata/acpi-table.x86_64-latest.args b/tests/qemuxmlconfdata/acpi-table.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/acpi-table.x86_64-latest.args rename to tests/qemuxmlconfdata/acpi-table.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/acpi-table.xml b/tests/qemuxmlconfdata/acpi-table.xml similarity index 100% rename from tests/qemuxml2argvdata/acpi-table.xml rename to tests/qemuxmlconfdata/acpi-table.xml diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.aarch64-latest.args b/tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/arm-vexpressa9-basic.aarch64-latest.args rename to tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.xml b/tests/qemuxmlconfdata/arm-vexpressa9-basic.xml similarity index 100% rename from tests/qemuxml2argvdata/arm-vexpressa9-basic.xml rename to tests/qemuxmlconfdata/arm-vexpressa9-basic.xml diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.aarch64-latest.args b/tests/qemuxmlconfdata/arm-vexpressa9-nodevs.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/arm-vexpressa9-nodevs.aarch64-latest.args rename to tests/qemuxmlconfdata/arm-vexpressa9-nodevs.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.xml b/tests/qemuxmlconfdata/arm-vexpressa9-nodevs.xml similarity index 100% rename from tests/qemuxml2argvdata/arm-vexpressa9-nodevs.xml rename to tests/qemuxmlconfdata/arm-vexpressa9-nodevs.xml diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.aarch64-latest.args b/tests/qemuxmlconfdata/arm-vexpressa9-virtio.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/arm-vexpressa9-virtio.aarch64-latest.args rename to tests/qemuxmlconfdata/arm-vexpressa9-virtio.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.xml b/tests/qemuxmlconfdata/arm-vexpressa9-virtio.xml similarity index 100% rename from tests/qemuxml2argvdata/arm-vexpressa9-virtio.xml rename to tests/qemuxmlconfdata/arm-vexpressa9-virtio.xml diff --git a/tests/qemuxml2argvdata/async-teardown.x86_64-latest.args b/tests/qemuxmlconfdata/async-teardown.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/async-teardown.x86_64-latest.args rename to tests/qemuxmlconfdata/async-teardown.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/async-teardown.xml b/tests/qemuxmlconfdata/async-teardown.xml similarity index 100% rename from tests/qemuxml2argvdata/async-teardown.xml rename to tests/qemuxmlconfdata/async-teardown.xml diff --git a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-alsa-best.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-alsa-best.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-alsa-best.xml b/tests/qemuxmlconfdata/audio-alsa-best.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-alsa-best.xml rename to tests/qemuxmlconfdata/audio-alsa-best.xml diff --git a/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-alsa-full.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-alsa-full.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-alsa-full.xml b/tests/qemuxmlconfdata/audio-alsa-full.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-alsa-full.xml rename to tests/qemuxmlconfdata/audio-alsa-full.xml diff --git a/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-alsa-minimal.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-alsa-minimal.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-alsa-minimal.xml b/tests/qemuxmlconfdata/audio-alsa-minimal.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-alsa-minimal.xml rename to tests/qemuxmlconfdata/audio-alsa-minimal.xml diff --git a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-coreaudio-best.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-coreaudio-best.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-coreaudio-best.xml b/tests/qemuxmlconfdata/audio-coreaudio-best.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-coreaudio-best.xml rename to tests/qemuxmlconfdata/audio-coreaudio-best.xml diff --git a/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-coreaudio-full.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-coreaudio-full.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-coreaudio-full.xml b/tests/qemuxmlconfdata/audio-coreaudio-full.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-coreaudio-full.xml rename to tests/qemuxmlconfdata/audio-coreaudio-full.xml diff --git a/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-coreaudio-minimal.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-coreaudio-minimal.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-coreaudio-minimal.xml b/tests/qemuxmlconfdata/audio-coreaudio-minimal.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-coreaudio-minimal.xml rename to tests/qemuxmlconfdata/audio-coreaudio-minimal.xml diff --git a/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args b/tests/qemuxmlconfdata/audio-default-nographics.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-default-nographics.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-default-nographics.xml b/tests/qemuxmlconfdata/audio-default-nographics.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-default-nographics.xml rename to tests/qemuxmlconfdata/audio-default-nographics.xml diff --git a/tests/qemuxml2argvdata/audio-default-sdl.x86_64-4.2.0.args b/tests/qemuxmlconfdata/audio-default-sdl.x86_64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/audio-default-sdl.x86_64-4.2.0.args rename to tests/qemuxmlconfdata/audio-default-sdl.x86_64-4.2.0.args diff --git a/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args b/tests/qemuxmlconfdata/audio-default-sdl.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-default-sdl.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-default-sdl.xml b/tests/qemuxmlconfdata/audio-default-sdl.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-default-sdl.xml rename to tests/qemuxmlconfdata/audio-default-sdl.xml diff --git a/tests/qemuxml2argvdata/audio-default-spice.x86_64-4.2.0.args b/tests/qemuxmlconfdata/audio-default-spice.x86_64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/audio-default-spice.x86_64-4.2.0.args rename to tests/qemuxmlconfdata/audio-default-spice.x86_64-4.2.0.args diff --git a/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args b/tests/qemuxmlconfdata/audio-default-spice.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-default-spice.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-default-spice.xml b/tests/qemuxmlconfdata/audio-default-spice.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-default-spice.xml rename to tests/qemuxmlconfdata/audio-default-spice.xml diff --git a/tests/qemuxml2argvdata/audio-default-vnc.x86_64-4.2.0.args b/tests/qemuxmlconfdata/audio-default-vnc.x86_64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/audio-default-vnc.x86_64-4.2.0.args rename to tests/qemuxmlconfdata/audio-default-vnc.x86_64-4.2.0.args diff --git a/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args b/tests/qemuxmlconfdata/audio-default-vnc.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-default-vnc.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-default-vnc.xml b/tests/qemuxmlconfdata/audio-default-vnc.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-default-vnc.xml rename to tests/qemuxmlconfdata/audio-default-vnc.xml diff --git a/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-file-best.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-file-best.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-file-best.xml b/tests/qemuxmlconfdata/audio-file-best.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-file-best.xml rename to tests/qemuxmlconfdata/audio-file-best.xml diff --git a/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-file-full.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-file-full.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-file-full.xml b/tests/qemuxmlconfdata/audio-file-full.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-file-full.xml rename to tests/qemuxmlconfdata/audio-file-full.xml diff --git a/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-file-minimal.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-file-minimal.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-file-minimal.xml b/tests/qemuxmlconfdata/audio-file-minimal.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-file-minimal.xml rename to tests/qemuxmlconfdata/audio-file-minimal.xml diff --git a/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-jack-full.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-jack-full.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-jack-full.xml b/tests/qemuxmlconfdata/audio-jack-full.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-jack-full.xml rename to tests/qemuxmlconfdata/audio-jack-full.xml diff --git a/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-jack-minimal.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-jack-minimal.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-jack-minimal.xml b/tests/qemuxmlconfdata/audio-jack-minimal.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-jack-minimal.xml rename to tests/qemuxmlconfdata/audio-jack-minimal.xml diff --git a/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args b/tests/qemuxmlconfdata/audio-many-backends.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-many-backends.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-many-backends.xml b/tests/qemuxmlconfdata/audio-many-backends.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-many-backends.xml rename to tests/qemuxmlconfdata/audio-many-backends.xml diff --git a/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-none-best.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-none-best.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-none-best.xml b/tests/qemuxmlconfdata/audio-none-best.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-none-best.xml rename to tests/qemuxmlconfdata/audio-none-best.xml diff --git a/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-none-full.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-none-full.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-none-full.xml b/tests/qemuxmlconfdata/audio-none-full.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-none-full.xml rename to tests/qemuxmlconfdata/audio-none-full.xml diff --git a/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-none-minimal.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-none-minimal.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-none-minimal.xml b/tests/qemuxmlconfdata/audio-none-minimal.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-none-minimal.xml rename to tests/qemuxmlconfdata/audio-none-minimal.xml diff --git a/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-oss-best.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-oss-best.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-oss-best.xml b/tests/qemuxmlconfdata/audio-oss-best.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-oss-best.xml rename to tests/qemuxmlconfdata/audio-oss-best.xml diff --git a/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-oss-full.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-oss-full.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-oss-full.xml b/tests/qemuxmlconfdata/audio-oss-full.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-oss-full.xml rename to tests/qemuxmlconfdata/audio-oss-full.xml diff --git a/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-oss-minimal.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-oss-minimal.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-oss-minimal.xml b/tests/qemuxmlconfdata/audio-oss-minimal.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-oss-minimal.xml rename to tests/qemuxmlconfdata/audio-oss-minimal.xml diff --git a/tests/qemuxml2argvdata/audio-pipewire-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-pipewire-best.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-pipewire-best.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-pipewire-best.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-pipewire-best.xml b/tests/qemuxmlconfdata/audio-pipewire-best.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-pipewire-best.xml rename to tests/qemuxmlconfdata/audio-pipewire-best.xml diff --git a/tests/qemuxml2argvdata/audio-pipewire-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-pipewire-full.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-pipewire-full.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-pipewire-full.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-pipewire-full.xml b/tests/qemuxmlconfdata/audio-pipewire-full.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-pipewire-full.xml rename to tests/qemuxmlconfdata/audio-pipewire-full.xml diff --git a/tests/qemuxml2argvdata/audio-pipewire-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-pipewire-minimal.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-pipewire-minimal.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-pipewire-minimal.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-pipewire-minimal.xml b/tests/qemuxmlconfdata/audio-pipewire-minimal.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-pipewire-minimal.xml rename to tests/qemuxmlconfdata/audio-pipewire-minimal.xml diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-pulseaudio-best.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-pulseaudio-best.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-best.xml b/tests/qemuxmlconfdata/audio-pulseaudio-best.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-pulseaudio-best.xml rename to tests/qemuxmlconfdata/audio-pulseaudio-best.xml diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-pulseaudio-full.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-pulseaudio-full.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-full.xml b/tests/qemuxmlconfdata/audio-pulseaudio-full.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-pulseaudio-full.xml rename to tests/qemuxmlconfdata/audio-pulseaudio-full.xml diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-pulseaudio-minimal.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-pulseaudio-minimal.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.xml b/tests/qemuxmlconfdata/audio-pulseaudio-minimal.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-pulseaudio-minimal.xml rename to tests/qemuxmlconfdata/audio-pulseaudio-minimal.xml diff --git a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-sdl-best.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-sdl-best.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-sdl-best.xml b/tests/qemuxmlconfdata/audio-sdl-best.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-sdl-best.xml rename to tests/qemuxmlconfdata/audio-sdl-best.xml diff --git a/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-sdl-full.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-sdl-full.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-sdl-full.xml b/tests/qemuxmlconfdata/audio-sdl-full.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-sdl-full.xml rename to tests/qemuxmlconfdata/audio-sdl-full.xml diff --git a/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-sdl-minimal.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-sdl-minimal.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-sdl-minimal.xml b/tests/qemuxmlconfdata/audio-sdl-minimal.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-sdl-minimal.xml rename to tests/qemuxmlconfdata/audio-sdl-minimal.xml diff --git a/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-spice-best.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-spice-best.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-spice-best.xml b/tests/qemuxmlconfdata/audio-spice-best.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-spice-best.xml rename to tests/qemuxmlconfdata/audio-spice-best.xml diff --git a/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-spice-full.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-spice-full.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-spice-full.xml b/tests/qemuxmlconfdata/audio-spice-full.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-spice-full.xml rename to tests/qemuxmlconfdata/audio-spice-full.xml diff --git a/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-spice-minimal.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args rename to tests/qemuxmlconfdata/audio-spice-minimal.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/audio-spice-minimal.xml b/tests/qemuxmlconfdata/audio-spice-minimal.xml similarity index 100% rename from tests/qemuxml2argvdata/audio-spice-minimal.xml rename to tests/qemuxmlconfdata/audio-spice-minimal.xml diff --git a/tests/qemuxml2argvdata/autoindex.x86_64-latest.args b/tests/qemuxmlconfdata/autoindex.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/autoindex.x86_64-latest.args rename to tests/qemuxmlconfdata/autoindex.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/autoindex.xml b/tests/qemuxmlconfdata/autoindex.xml similarity index 100% rename from tests/qemuxml2argvdata/autoindex.xml rename to tests/qemuxmlconfdata/autoindex.xml diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.s390x-latest.args b/tests/qemuxmlconfdata/balloon-ccw-deflate.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/balloon-ccw-deflate.s390x-latest.args rename to tests/qemuxmlconfdata/balloon-ccw-deflate.s390x-latest.args diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.xml b/tests/qemuxmlconfdata/balloon-ccw-deflate.xml similarity index 100% rename from tests/qemuxml2argvdata/balloon-ccw-deflate.xml rename to tests/qemuxmlconfdata/balloon-ccw-deflate.xml diff --git a/tests/qemuxml2argvdata/balloon-device-auto.x86_64-latest.args b/tests/qemuxmlconfdata/balloon-device-auto.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/balloon-device-auto.x86_64-latest.args rename to tests/qemuxmlconfdata/balloon-device-auto.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/balloon-device-auto.xml b/tests/qemuxmlconfdata/balloon-device-auto.xml similarity index 100% rename from tests/qemuxml2argvdata/balloon-device-auto.xml rename to tests/qemuxmlconfdata/balloon-device-auto.xml diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.x86_64-latest.args b/tests/qemuxmlconfdata/balloon-device-deflate-off.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/balloon-device-deflate-off.x86_64-latest.args rename to tests/qemuxmlconfdata/balloon-device-deflate-off.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.xml b/tests/qemuxmlconfdata/balloon-device-deflate-off.xml similarity index 100% rename from tests/qemuxml2argvdata/balloon-device-deflate-off.xml rename to tests/qemuxmlconfdata/balloon-device-deflate-off.xml diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.x86_64-latest.args b/tests/qemuxmlconfdata/balloon-device-deflate.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/balloon-device-deflate.x86_64-latest.args rename to tests/qemuxmlconfdata/balloon-device-deflate.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.xml b/tests/qemuxmlconfdata/balloon-device-deflate.xml similarity index 100% rename from tests/qemuxml2argvdata/balloon-device-deflate.xml rename to tests/qemuxmlconfdata/balloon-device-deflate.xml diff --git a/tests/qemuxml2argvdata/balloon-device-period.x86_64-latest.args b/tests/qemuxmlconfdata/balloon-device-period.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/balloon-device-period.x86_64-latest.args rename to tests/qemuxmlconfdata/balloon-device-period.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/balloon-device-period.xml b/tests/qemuxmlconfdata/balloon-device-period.xml similarity index 100% rename from tests/qemuxml2argvdata/balloon-device-period.xml rename to tests/qemuxmlconfdata/balloon-device-period.xml diff --git a/tests/qemuxml2argvdata/balloon-device.x86_64-latest.args b/tests/qemuxmlconfdata/balloon-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/balloon-device.x86_64-latest.args rename to tests/qemuxmlconfdata/balloon-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/balloon-device.xml b/tests/qemuxmlconfdata/balloon-device.xml similarity index 100% rename from tests/qemuxml2argvdata/balloon-device.xml rename to tests/qemuxmlconfdata/balloon-device.xml diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args b/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args rename to tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.xml b/tests/qemuxmlconfdata/balloon-mmio-deflate.xml similarity index 100% rename from tests/qemuxml2argvdata/balloon-mmio-deflate.xml rename to tests/qemuxmlconfdata/balloon-mmio-deflate.xml diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args b/tests/qemuxmlconfdata/blkdeviotune-group-num.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args rename to tests/qemuxmlconfdata/blkdeviotune-group-num.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.xml b/tests/qemuxmlconfdata/blkdeviotune-group-num.xml similarity index 100% rename from tests/qemuxml2argvdata/blkdeviotune-group-num.xml rename to tests/qemuxmlconfdata/blkdeviotune-group-num.xml diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args b/tests/qemuxmlconfdata/blkdeviotune-max-length.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args rename to tests/qemuxmlconfdata/blkdeviotune-max-length.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.xml b/tests/qemuxmlconfdata/blkdeviotune-max-length.xml similarity index 100% rename from tests/qemuxml2argvdata/blkdeviotune-max-length.xml rename to tests/qemuxmlconfdata/blkdeviotune-max-length.xml diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args b/tests/qemuxmlconfdata/blkdeviotune-max.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args rename to tests/qemuxmlconfdata/blkdeviotune-max.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.xml b/tests/qemuxmlconfdata/blkdeviotune-max.xml similarity index 100% rename from tests/qemuxml2argvdata/blkdeviotune-max.xml rename to tests/qemuxmlconfdata/blkdeviotune-max.xml diff --git a/tests/qemuxml2argvdata/blkdeviotune.x86_64-latest.args b/tests/qemuxmlconfdata/blkdeviotune.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/blkdeviotune.x86_64-latest.args rename to tests/qemuxmlconfdata/blkdeviotune.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/blkdeviotune.xml b/tests/qemuxmlconfdata/blkdeviotune.xml similarity index 100% rename from tests/qemuxml2argvdata/blkdeviotune.xml rename to tests/qemuxmlconfdata/blkdeviotune.xml diff --git a/tests/qemuxml2argvdata/blkiotune-device.x86_64-latest.args b/tests/qemuxmlconfdata/blkiotune-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/blkiotune-device.x86_64-latest.args rename to tests/qemuxmlconfdata/blkiotune-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/blkiotune-device.xml b/tests/qemuxmlconfdata/blkiotune-device.xml similarity index 100% rename from tests/qemuxml2argvdata/blkiotune-device.xml rename to tests/qemuxmlconfdata/blkiotune-device.xml diff --git a/tests/qemuxml2argvdata/blkiotune.x86_64-latest.args b/tests/qemuxmlconfdata/blkiotune.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/blkiotune.x86_64-latest.args rename to tests/qemuxmlconfdata/blkiotune.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/blkiotune.xml b/tests/qemuxmlconfdata/blkiotune.xml similarity index 100% rename from tests/qemuxml2argvdata/blkiotune.xml rename to tests/qemuxmlconfdata/blkiotune.xml diff --git a/tests/qemuxml2argvdata/boot-cdrom.x86_64-latest.args b/tests/qemuxmlconfdata/boot-cdrom.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/boot-cdrom.x86_64-latest.args rename to tests/qemuxmlconfdata/boot-cdrom.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/boot-cdrom.xml b/tests/qemuxmlconfdata/boot-cdrom.xml similarity index 100% rename from tests/qemuxml2argvdata/boot-cdrom.xml rename to tests/qemuxmlconfdata/boot-cdrom.xml diff --git a/tests/qemuxml2argvdata/boot-complex.x86_64-latest.args b/tests/qemuxmlconfdata/boot-complex.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/boot-complex.x86_64-latest.args rename to tests/qemuxmlconfdata/boot-complex.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/boot-complex.xml b/tests/qemuxmlconfdata/boot-complex.xml similarity index 100% rename from tests/qemuxml2argvdata/boot-complex.xml rename to tests/qemuxmlconfdata/boot-complex.xml diff --git a/tests/qemuxml2argvdata/boot-dev+order.x86_64-latest.err b/tests/qemuxmlconfdata/boot-dev+order.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/boot-dev+order.x86_64-latest.err rename to tests/qemuxmlconfdata/boot-dev+order.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/boot-dev+order.xml b/tests/qemuxmlconfdata/boot-dev+order.xml similarity index 100% rename from tests/qemuxml2argvdata/boot-dev+order.xml rename to tests/qemuxmlconfdata/boot-dev+order.xml diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args b/tests/qemuxmlconfdata/boot-floppy-q35.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args rename to tests/qemuxmlconfdata/boot-floppy-q35.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.xml b/tests/qemuxmlconfdata/boot-floppy-q35.xml similarity index 100% rename from tests/qemuxml2argvdata/boot-floppy-q35.xml rename to tests/qemuxmlconfdata/boot-floppy-q35.xml diff --git a/tests/qemuxml2argvdata/boot-floppy.x86_64-latest.args b/tests/qemuxmlconfdata/boot-floppy.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/boot-floppy.x86_64-latest.args rename to tests/qemuxmlconfdata/boot-floppy.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/boot-floppy.xml b/tests/qemuxmlconfdata/boot-floppy.xml similarity index 100% rename from tests/qemuxml2argvdata/boot-floppy.xml rename to tests/qemuxmlconfdata/boot-floppy.xml diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.x86_64-latest.args b/tests/qemuxmlconfdata/boot-menu-disable-drive.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/boot-menu-disable-drive.x86_64-latest.args rename to tests/qemuxmlconfdata/boot-menu-disable-drive.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.xml b/tests/qemuxmlconfdata/boot-menu-disable-drive.xml similarity index 100% rename from tests/qemuxml2argvdata/boot-menu-disable-drive.xml rename to tests/qemuxmlconfdata/boot-menu-disable-drive.xml diff --git a/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.x86_64-latest.args b/tests/qemuxmlconfdata/boot-menu-disable-with-timeout.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/boot-menu-disable-with-timeout.x86_64-latest.args rename to tests/qemuxmlconfdata/boot-menu-disable-with-timeout.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml b/tests/qemuxmlconfdata/boot-menu-disable-with-timeout.xml similarity index 100% rename from tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml rename to tests/qemuxmlconfdata/boot-menu-disable-with-timeout.xml diff --git a/tests/qemuxml2argvdata/boot-menu-disable.x86_64-latest.args b/tests/qemuxmlconfdata/boot-menu-disable.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/boot-menu-disable.x86_64-latest.args rename to tests/qemuxmlconfdata/boot-menu-disable.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/boot-menu-disable.xml b/tests/qemuxmlconfdata/boot-menu-disable.xml similarity index 100% rename from tests/qemuxml2argvdata/boot-menu-disable.xml rename to tests/qemuxmlconfdata/boot-menu-disable.xml diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/boot-menu-enable-with-timeout-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.x86_64-latest.err rename to tests/qemuxmlconfdata/boot-menu-enable-with-timeout-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml b/tests/qemuxmlconfdata/boot-menu-enable-with-timeout-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml rename to tests/qemuxmlconfdata/boot-menu-enable-with-timeout-invalid.xml diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.x86_64-latest.args b/tests/qemuxmlconfdata/boot-menu-enable-with-timeout.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/boot-menu-enable-with-timeout.x86_64-latest.args rename to tests/qemuxmlconfdata/boot-menu-enable-with-timeout.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml b/tests/qemuxmlconfdata/boot-menu-enable-with-timeout.xml similarity index 100% rename from tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml rename to tests/qemuxmlconfdata/boot-menu-enable-with-timeout.xml diff --git a/tests/qemuxml2argvdata/boot-menu-enable.x86_64-latest.args b/tests/qemuxmlconfdata/boot-menu-enable.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/boot-menu-enable.x86_64-latest.args rename to tests/qemuxmlconfdata/boot-menu-enable.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/boot-menu-enable.xml b/tests/qemuxmlconfdata/boot-menu-enable.xml similarity index 100% rename from tests/qemuxml2argvdata/boot-menu-enable.xml rename to tests/qemuxmlconfdata/boot-menu-enable.xml diff --git a/tests/qemuxml2argvdata/boot-multi.x86_64-latest.args b/tests/qemuxmlconfdata/boot-multi.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/boot-multi.x86_64-latest.args rename to tests/qemuxmlconfdata/boot-multi.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/boot-multi.xml b/tests/qemuxmlconfdata/boot-multi.xml similarity index 100% rename from tests/qemuxml2argvdata/boot-multi.xml rename to tests/qemuxmlconfdata/boot-multi.xml diff --git a/tests/qemuxml2argvdata/boot-network.x86_64-latest.args b/tests/qemuxmlconfdata/boot-network.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/boot-network.x86_64-latest.args rename to tests/qemuxmlconfdata/boot-network.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/boot-network.xml b/tests/qemuxmlconfdata/boot-network.xml similarity index 100% rename from tests/qemuxml2argvdata/boot-network.xml rename to tests/qemuxmlconfdata/boot-network.xml diff --git a/tests/qemuxml2argvdata/boot-order.x86_64-latest.args b/tests/qemuxmlconfdata/boot-order.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/boot-order.x86_64-latest.args rename to tests/qemuxmlconfdata/boot-order.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/boot-order.xml b/tests/qemuxmlconfdata/boot-order.xml similarity index 100% rename from tests/qemuxml2argvdata/boot-order.xml rename to tests/qemuxmlconfdata/boot-order.xml diff --git a/tests/qemuxml2argvdata/channel-guestfwd.x86_64-latest.args b/tests/qemuxmlconfdata/channel-guestfwd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-guestfwd.x86_64-latest.args rename to tests/qemuxmlconfdata/channel-guestfwd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-guestfwd.xml b/tests/qemuxmlconfdata/channel-guestfwd.xml similarity index 100% rename from tests/qemuxml2argvdata/channel-guestfwd.xml rename to tests/qemuxmlconfdata/channel-guestfwd.xml diff --git a/tests/qemuxml2argvdata/channel-qemu-vdagent-features.x86_64-latest.args b/tests/qemuxmlconfdata/channel-qemu-vdagent-features.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-qemu-vdagent-features.x86_64-latest.args rename to tests/qemuxmlconfdata/channel-qemu-vdagent-features.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-qemu-vdagent-features.xml b/tests/qemuxmlconfdata/channel-qemu-vdagent-features.xml similarity index 100% rename from tests/qemuxml2argvdata/channel-qemu-vdagent-features.xml rename to tests/qemuxmlconfdata/channel-qemu-vdagent-features.xml diff --git a/tests/qemuxml2argvdata/channel-qemu-vdagent.x86_64-latest.args b/tests/qemuxmlconfdata/channel-qemu-vdagent.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-qemu-vdagent.x86_64-latest.args rename to tests/qemuxmlconfdata/channel-qemu-vdagent.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-qemu-vdagent.xml b/tests/qemuxmlconfdata/channel-qemu-vdagent.xml similarity index 100% rename from tests/qemuxml2argvdata/channel-qemu-vdagent.xml rename to tests/qemuxmlconfdata/channel-qemu-vdagent.xml diff --git a/tests/qemuxml2argvdata/channel-spicevmc.x86_64-latest.args b/tests/qemuxmlconfdata/channel-spicevmc.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-spicevmc.x86_64-latest.args rename to tests/qemuxmlconfdata/channel-spicevmc.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-spicevmc.xml b/tests/qemuxmlconfdata/channel-spicevmc.xml similarity index 100% rename from tests/qemuxml2argvdata/channel-spicevmc.xml rename to tests/qemuxmlconfdata/channel-spicevmc.xml diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args b/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args rename to tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.xml b/tests/qemuxmlconfdata/channel-unix-guestfwd.xml similarity index 100% rename from tests/qemuxml2argvdata/channel-unix-guestfwd.xml rename to tests/qemuxmlconfdata/channel-unix-guestfwd.xml diff --git a/tests/qemuxml2argvdata/channel-unix-source-path.x86_64-latest.args b/tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-unix-source-path.x86_64-latest.args rename to tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-unix-source-path.xml b/tests/qemuxmlconfdata/channel-unix-source-path.xml similarity index 100% rename from tests/qemuxml2argvdata/channel-unix-source-path.xml rename to tests/qemuxmlconfdata/channel-unix-source-path.xml diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-auto.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio-auto.x86_64-latest.args rename to tests/qemuxmlconfdata/channel-virtio-auto.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.xml b/tests/qemuxmlconfdata/channel-virtio-auto.xml similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio-auto.xml rename to tests/qemuxmlconfdata/channel-virtio-auto.xml diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-autoadd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio-autoadd.x86_64-latest.args rename to tests/qemuxmlconfdata/channel-virtio-autoadd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.xml b/tests/qemuxmlconfdata/channel-virtio-autoadd.xml similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio-autoadd.xml rename to tests/qemuxmlconfdata/channel-virtio-autoadd.xml diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-autoassign.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio-autoassign.x86_64-latest.args rename to tests/qemuxmlconfdata/channel-virtio-autoassign.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.xml b/tests/qemuxmlconfdata/channel-virtio-autoassign.xml similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio-autoassign.xml rename to tests/qemuxmlconfdata/channel-virtio-autoassign.xml diff --git a/tests/qemuxml2argvdata/channel-virtio-default.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-default.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio-default.x86_64-latest.args rename to tests/qemuxmlconfdata/channel-virtio-default.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-virtio-default.xml b/tests/qemuxmlconfdata/channel-virtio-default.xml similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio-default.xml rename to tests/qemuxmlconfdata/channel-virtio-default.xml diff --git a/tests/qemuxml2argvdata/channel-virtio-state.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-state.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio-state.x86_64-latest.args rename to tests/qemuxmlconfdata/channel-virtio-state.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-virtio-state.xml b/tests/qemuxmlconfdata/channel-virtio-state.xml similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio-state.xml rename to tests/qemuxmlconfdata/channel-virtio-state.xml diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio-unix.x86_64-latest.args rename to tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.xml b/tests/qemuxmlconfdata/channel-virtio-unix.xml similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio-unix.xml rename to tests/qemuxmlconfdata/channel-virtio-unix.xml diff --git a/tests/qemuxml2argvdata/channel-virtio.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio.x86_64-latest.args rename to tests/qemuxmlconfdata/channel-virtio.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/channel-virtio.xml b/tests/qemuxmlconfdata/channel-virtio.xml similarity index 100% rename from tests/qemuxml2argvdata/channel-virtio.xml rename to tests/qemuxmlconfdata/channel-virtio.xml diff --git a/tests/qemuxml2argvdata/chardev-label.x86_64-latest.args b/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/chardev-label.x86_64-latest.args rename to tests/qemuxmlconfdata/chardev-label.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/chardev-label.xml b/tests/qemuxmlconfdata/chardev-label.xml similarity index 100% rename from tests/qemuxml2argvdata/chardev-label.xml rename to tests/qemuxmlconfdata/chardev-label.xml diff --git a/tests/qemuxml2argvdata/chardev-reconnect-generated-path.x86_64-latest.err b/tests/qemuxmlconfdata/chardev-reconnect-generated-path.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/chardev-reconnect-generated-path.x86_64-latest.err rename to tests/qemuxmlconfdata/chardev-reconnect-generated-path.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml b/tests/qemuxmlconfdata/chardev-reconnect-generated-path.xml similarity index 100% rename from tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml rename to tests/qemuxmlconfdata/chardev-reconnect-generated-path.xml diff --git a/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.x86_64-latest.err b/tests/qemuxmlconfdata/chardev-reconnect-invalid-timeout.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.x86_64-latest.err rename to tests/qemuxmlconfdata/chardev-reconnect-invalid-timeout.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml b/tests/qemuxmlconfdata/chardev-reconnect-invalid-timeout.xml similarity index 100% rename from tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml rename to tests/qemuxmlconfdata/chardev-reconnect-invalid-timeout.xml diff --git a/tests/qemuxml2argvdata/chardev-reconnect.x86_64-latest.args b/tests/qemuxmlconfdata/chardev-reconnect.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/chardev-reconnect.x86_64-latest.args rename to tests/qemuxmlconfdata/chardev-reconnect.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/chardev-reconnect.xml b/tests/qemuxmlconfdata/chardev-reconnect.xml similarity index 100% rename from tests/qemuxml2argvdata/chardev-reconnect.xml rename to tests/qemuxmlconfdata/chardev-reconnect.xml diff --git a/tests/qemuxml2argvdata/clock-absolute.x86_64-latest.args b/tests/qemuxmlconfdata/clock-absolute.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/clock-absolute.x86_64-latest.args rename to tests/qemuxmlconfdata/clock-absolute.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/clock-absolute.xml b/tests/qemuxmlconfdata/clock-absolute.xml similarity index 100% rename from tests/qemuxml2argvdata/clock-absolute.xml rename to tests/qemuxmlconfdata/clock-absolute.xml diff --git a/tests/qemuxml2argvdata/clock-catchup.x86_64-latest.args b/tests/qemuxmlconfdata/clock-catchup.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/clock-catchup.x86_64-latest.args rename to tests/qemuxmlconfdata/clock-catchup.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/clock-catchup.xml b/tests/qemuxmlconfdata/clock-catchup.xml similarity index 100% rename from tests/qemuxml2argvdata/clock-catchup.xml rename to tests/qemuxmlconfdata/clock-catchup.xml diff --git a/tests/qemuxml2argvdata/clock-france.x86_64-latest.args b/tests/qemuxmlconfdata/clock-france.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/clock-france.x86_64-latest.args rename to tests/qemuxmlconfdata/clock-france.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/clock-france.xml b/tests/qemuxmlconfdata/clock-france.xml similarity index 100% rename from tests/qemuxml2argvdata/clock-france.xml rename to tests/qemuxmlconfdata/clock-france.xml diff --git a/tests/qemuxml2argvdata/clock-hpet-off.x86_64-7.2.0.args b/tests/qemuxmlconfdata/clock-hpet-off.x86_64-7.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/clock-hpet-off.x86_64-7.2.0.args rename to tests/qemuxmlconfdata/clock-hpet-off.x86_64-7.2.0.args diff --git a/tests/qemuxml2argvdata/clock-hpet-off.x86_64-latest.args b/tests/qemuxmlconfdata/clock-hpet-off.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/clock-hpet-off.x86_64-latest.args rename to tests/qemuxmlconfdata/clock-hpet-off.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/clock-hpet-off.xml b/tests/qemuxmlconfdata/clock-hpet-off.xml similarity index 100% rename from tests/qemuxml2argvdata/clock-hpet-off.xml rename to tests/qemuxmlconfdata/clock-hpet-off.xml diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.x86_64-latest.args b/tests/qemuxmlconfdata/clock-localtime-basis-localtime.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/clock-localtime-basis-localtime.x86_64-latest.args rename to tests/qemuxmlconfdata/clock-localtime-basis-localtime.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml b/tests/qemuxmlconfdata/clock-localtime-basis-localtime.xml similarity index 100% rename from tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml rename to tests/qemuxmlconfdata/clock-localtime-basis-localtime.xml diff --git a/tests/qemuxml2argvdata/clock-localtime.x86_64-latest.args b/tests/qemuxmlconfdata/clock-localtime.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/clock-localtime.x86_64-latest.args rename to tests/qemuxmlconfdata/clock-localtime.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/clock-localtime.xml b/tests/qemuxmlconfdata/clock-localtime.xml similarity index 100% rename from tests/qemuxml2argvdata/clock-localtime.xml rename to tests/qemuxmlconfdata/clock-localtime.xml diff --git a/tests/qemuxml2argvdata/clock-realtime.x86_64-latest.args b/tests/qemuxmlconfdata/clock-realtime.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/clock-realtime.x86_64-latest.args rename to tests/qemuxmlconfdata/clock-realtime.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/clock-realtime.xml b/tests/qemuxmlconfdata/clock-realtime.xml similarity index 100% rename from tests/qemuxml2argvdata/clock-realtime.xml rename to tests/qemuxmlconfdata/clock-realtime.xml diff --git a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args b/tests/qemuxmlconfdata/clock-timer-armvtimer.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args rename to tests/qemuxmlconfdata/clock-timer-armvtimer.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/clock-timer-armvtimer.xml b/tests/qemuxmlconfdata/clock-timer-armvtimer.xml similarity index 100% rename from tests/qemuxml2argvdata/clock-timer-armvtimer.xml rename to tests/qemuxmlconfdata/clock-timer-armvtimer.xml diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.x86_64-latest.args b/tests/qemuxmlconfdata/clock-timer-hyperv-rtc.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/clock-timer-hyperv-rtc.x86_64-latest.args rename to tests/qemuxmlconfdata/clock-timer-hyperv-rtc.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml b/tests/qemuxmlconfdata/clock-timer-hyperv-rtc.xml similarity index 100% rename from tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml rename to tests/qemuxmlconfdata/clock-timer-hyperv-rtc.xml diff --git a/tests/qemuxml2argvdata/clock-utc.x86_64-latest.args b/tests/qemuxmlconfdata/clock-utc.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/clock-utc.x86_64-latest.args rename to tests/qemuxmlconfdata/clock-utc.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/clock-utc.xml b/tests/qemuxmlconfdata/clock-utc.xml similarity index 100% rename from tests/qemuxml2argvdata/clock-utc.xml rename to tests/qemuxmlconfdata/clock-utc.xml diff --git a/tests/qemuxml2argvdata/clock-variable.x86_64-latest.args b/tests/qemuxmlconfdata/clock-variable.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/clock-variable.x86_64-latest.args rename to tests/qemuxmlconfdata/clock-variable.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/clock-variable.xml b/tests/qemuxmlconfdata/clock-variable.xml similarity index 100% rename from tests/qemuxml2argvdata/clock-variable.xml rename to tests/qemuxmlconfdata/clock-variable.xml diff --git a/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args b/tests/qemuxmlconfdata/console-compat-auto.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args rename to tests/qemuxmlconfdata/console-compat-auto.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/console-compat-auto.xml b/tests/qemuxmlconfdata/console-compat-auto.xml similarity index 100% rename from tests/qemuxml2argvdata/console-compat-auto.xml rename to tests/qemuxmlconfdata/console-compat-auto.xml diff --git a/tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/console-compat-chardev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.args rename to tests/qemuxmlconfdata/console-compat-chardev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/console-compat-chardev.xml b/tests/qemuxmlconfdata/console-compat-chardev.xml similarity index 100% rename from tests/qemuxml2argvdata/console-compat-chardev.xml rename to tests/qemuxmlconfdata/console-compat-chardev.xml diff --git a/tests/qemuxml2argvdata/console-compat.x86_64-latest.args b/tests/qemuxmlconfdata/console-compat.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/console-compat.x86_64-latest.args rename to tests/qemuxmlconfdata/console-compat.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/console-compat.xml b/tests/qemuxmlconfdata/console-compat.xml similarity index 100% rename from tests/qemuxml2argvdata/console-compat.xml rename to tests/qemuxmlconfdata/console-compat.xml diff --git a/tests/qemuxml2argvdata/console-compat2.x86_64-latest.args b/tests/qemuxmlconfdata/console-compat2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/console-compat2.x86_64-latest.args rename to tests/qemuxmlconfdata/console-compat2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/console-compat2.xml b/tests/qemuxmlconfdata/console-compat2.xml similarity index 100% rename from tests/qemuxml2argvdata/console-compat2.xml rename to tests/qemuxmlconfdata/console-compat2.xml diff --git a/tests/qemuxml2argvdata/console-sclp.s390x-latest.args b/tests/qemuxmlconfdata/console-sclp.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/console-sclp.s390x-latest.args rename to tests/qemuxmlconfdata/console-sclp.s390x-latest.args diff --git a/tests/qemuxml2argvdata/console-sclp.xml b/tests/qemuxmlconfdata/console-sclp.xml similarity index 100% rename from tests/qemuxml2argvdata/console-sclp.xml rename to tests/qemuxmlconfdata/console-sclp.xml diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.s390x-latest.args b/tests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/console-virtio-ccw.s390x-latest.args rename to tests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.args diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.xml b/tests/qemuxmlconfdata/console-virtio-ccw.xml similarity index 100% rename from tests/qemuxml2argvdata/console-virtio-ccw.xml rename to tests/qemuxmlconfdata/console-virtio-ccw.xml diff --git a/tests/qemuxml2argvdata/console-virtio-many.x86_64-latest.args b/tests/qemuxmlconfdata/console-virtio-many.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/console-virtio-many.x86_64-latest.args rename to tests/qemuxmlconfdata/console-virtio-many.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/console-virtio-many.xml b/tests/qemuxmlconfdata/console-virtio-many.xml similarity index 100% rename from tests/qemuxml2argvdata/console-virtio-many.xml rename to tests/qemuxmlconfdata/console-virtio-many.xml diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args b/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args rename to tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/console-virtio-unix.xml b/tests/qemuxmlconfdata/console-virtio-unix.xml similarity index 100% rename from tests/qemuxml2argvdata/console-virtio-unix.xml rename to tests/qemuxmlconfdata/console-virtio-unix.xml diff --git a/tests/qemuxml2argvdata/console-virtio.x86_64-latest.args b/tests/qemuxmlconfdata/console-virtio.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/console-virtio.x86_64-latest.args rename to tests/qemuxmlconfdata/console-virtio.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/console-virtio.xml b/tests/qemuxmlconfdata/console-virtio.xml similarity index 100% rename from tests/qemuxml2argvdata/console-virtio.xml rename to tests/qemuxmlconfdata/console-virtio.xml diff --git a/tests/qemuxml2argvdata/controller-order.x86_64-latest.args b/tests/qemuxmlconfdata/controller-order.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/controller-order.x86_64-latest.args rename to tests/qemuxmlconfdata/controller-order.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/controller-order.xml b/tests/qemuxmlconfdata/controller-order.xml similarity index 100% rename from tests/qemuxml2argvdata/controller-order.xml rename to tests/qemuxmlconfdata/controller-order.xml diff --git a/tests/qemuxml2argvdata/controller-usb-order.x86_64-latest.args b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/controller-usb-order.x86_64-latest.args rename to tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/controller-usb-order.xml b/tests/qemuxmlconfdata/controller-usb-order.xml similarity index 100% rename from tests/qemuxml2argvdata/controller-usb-order.xml rename to tests/qemuxmlconfdata/controller-usb-order.xml diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args b/tests/qemuxmlconfdata/controller-virtio-scsi.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args rename to tests/qemuxmlconfdata/controller-virtio-scsi.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.xml b/tests/qemuxmlconfdata/controller-virtio-scsi.xml similarity index 100% rename from tests/qemuxml2argvdata/controller-virtio-scsi.xml rename to tests/qemuxmlconfdata/controller-virtio-scsi.xml diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-Haswell-noTSX.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell-noTSX.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-Haswell-noTSX.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.xml b/tests/qemuxmlconfdata/cpu-Haswell-noTSX.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell-noTSX.xml rename to tests/qemuxmlconfdata/cpu-Haswell-noTSX.xml diff --git a/tests/qemuxml2argvdata/cpu-Haswell.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-Haswell.xml b/tests/qemuxmlconfdata/cpu-Haswell.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell.xml rename to tests/qemuxmlconfdata/cpu-Haswell.xml diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell2.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.xml b/tests/qemuxmlconfdata/cpu-Haswell2.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell2.xml rename to tests/qemuxmlconfdata/cpu-Haswell2.xml diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell3.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.xml b/tests/qemuxmlconfdata/cpu-Haswell3.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell3.xml rename to tests/qemuxmlconfdata/cpu-Haswell3.xml diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-Icelake-Server-pconfig.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-Icelake-Server-pconfig.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.xml b/tests/qemuxmlconfdata/cpu-Icelake-Server-pconfig.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.xml rename to tests/qemuxmlconfdata/cpu-Icelake-Server-pconfig.xml diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-cache-disable.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-disable.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-cache-disable.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.xml b/tests/qemuxmlconfdata/cpu-cache-disable.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-disable.xml rename to tests/qemuxmlconfdata/cpu-cache-disable.xml diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-cache-disable3.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-disable3.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-cache-disable3.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.xml b/tests/qemuxmlconfdata/cpu-cache-disable3.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-disable3.xml rename to tests/qemuxmlconfdata/cpu-cache-disable3.xml diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l2.x86_64-latest.err b/tests/qemuxmlconfdata/cpu-cache-emulate-l2.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-emulate-l2.x86_64-latest.err rename to tests/qemuxmlconfdata/cpu-cache-emulate-l2.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l2.xml b/tests/qemuxmlconfdata/cpu-cache-emulate-l2.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-emulate-l2.xml rename to tests/qemuxmlconfdata/cpu-cache-emulate-l2.xml diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-cache-emulate-l3.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-emulate-l3.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-cache-emulate-l3.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.xml b/tests/qemuxmlconfdata/cpu-cache-emulate-l3.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-emulate-l3.xml rename to tests/qemuxmlconfdata/cpu-cache-emulate-l3.xml diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough-l3.x86_64-latest.err b/tests/qemuxmlconfdata/cpu-cache-passthrough-l3.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-passthrough-l3.x86_64-latest.err rename to tests/qemuxmlconfdata/cpu-cache-passthrough-l3.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough-l3.xml b/tests/qemuxmlconfdata/cpu-cache-passthrough-l3.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-passthrough-l3.xml rename to tests/qemuxmlconfdata/cpu-cache-passthrough-l3.xml diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-cache-passthrough.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-passthrough.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-cache-passthrough.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.xml b/tests/qemuxmlconfdata/cpu-cache-passthrough.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-passthrough.xml rename to tests/qemuxmlconfdata/cpu-cache-passthrough.xml diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough3.x86_64-latest.err b/tests/qemuxmlconfdata/cpu-cache-passthrough3.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-passthrough3.x86_64-latest.err rename to tests/qemuxmlconfdata/cpu-cache-passthrough3.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough3.xml b/tests/qemuxmlconfdata/cpu-cache-passthrough3.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-cache-passthrough3.xml rename to tests/qemuxmlconfdata/cpu-cache-passthrough3.xml diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-check-default-none.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-check-default-none.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-check-default-none.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.xml b/tests/qemuxmlconfdata/cpu-check-default-none.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-check-default-none.xml rename to tests/qemuxmlconfdata/cpu-check-default-none.xml diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-check-default-none2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-check-default-none2.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-check-default-none2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.xml b/tests/qemuxmlconfdata/cpu-check-default-none2.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-check-default-none2.xml rename to tests/qemuxmlconfdata/cpu-check-default-none2.xml diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-check-default-partial.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-check-default-partial.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-check-default-partial.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.xml b/tests/qemuxmlconfdata/cpu-check-default-partial.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-check-default-partial.xml rename to tests/qemuxmlconfdata/cpu-check-default-partial.xml diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-check-default-partial2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-check-default-partial2.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-check-default-partial2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.xml b/tests/qemuxmlconfdata/cpu-check-default-partial2.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-check-default-partial2.xml rename to tests/qemuxmlconfdata/cpu-check-default-partial2.xml diff --git a/tests/qemuxml2argvdata/cpu-check-full.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-check-full.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-check-full.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-check-full.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-check-full.xml b/tests/qemuxmlconfdata/cpu-check-full.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-check-full.xml rename to tests/qemuxmlconfdata/cpu-check-full.xml diff --git a/tests/qemuxml2argvdata/cpu-check-none.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-check-none.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-check-none.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-check-none.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-check-none.xml b/tests/qemuxmlconfdata/cpu-check-none.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-check-none.xml rename to tests/qemuxmlconfdata/cpu-check-none.xml diff --git a/tests/qemuxml2argvdata/cpu-check-partial.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-check-partial.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-check-partial.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-check-partial.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-check-partial.xml b/tests/qemuxmlconfdata/cpu-check-partial.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-check-partial.xml rename to tests/qemuxmlconfdata/cpu-check-partial.xml diff --git a/tests/qemuxml2argvdata/cpu-empty.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-empty.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-empty.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-empty.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-empty.xml b/tests/qemuxmlconfdata/cpu-empty.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-empty.xml rename to tests/qemuxmlconfdata/cpu-empty.xml diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-eoi-disabled.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-eoi-disabled.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-eoi-disabled.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.xml b/tests/qemuxmlconfdata/cpu-eoi-disabled.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-eoi-disabled.xml rename to tests/qemuxmlconfdata/cpu-eoi-disabled.xml diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-eoi-enabled.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-eoi-enabled.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-eoi-enabled.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.xml b/tests/qemuxmlconfdata/cpu-eoi-enabled.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-eoi-enabled.xml rename to tests/qemuxmlconfdata/cpu-eoi-enabled.xml diff --git a/tests/qemuxml2argvdata/cpu-exact1.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-exact1.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-exact1.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-exact1.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-exact1.xml b/tests/qemuxmlconfdata/cpu-exact1.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-exact1.xml rename to tests/qemuxmlconfdata/cpu-exact1.xml diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-exact2-nofallback.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-exact2-nofallback.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-exact2-nofallback.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.xml b/tests/qemuxmlconfdata/cpu-exact2-nofallback.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-exact2-nofallback.xml rename to tests/qemuxmlconfdata/cpu-exact2-nofallback.xml diff --git a/tests/qemuxml2argvdata/cpu-exact2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-exact2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-exact2.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-exact2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-exact2.xml b/tests/qemuxmlconfdata/cpu-exact2.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-exact2.xml rename to tests/qemuxmlconfdata/cpu-exact2.xml diff --git a/tests/qemuxml2argvdata/cpu-fallback.x86_64-5.2.0.args b/tests/qemuxmlconfdata/cpu-fallback.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-fallback.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/cpu-fallback.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-fallback.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-fallback.x86_64-8.0.0.args rename to tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-fallback.xml b/tests/qemuxmlconfdata/cpu-fallback.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-fallback.xml rename to tests/qemuxmlconfdata/cpu-fallback.xml diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-kvmclock.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-kvmclock.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-host-kvmclock.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.xml b/tests/qemuxmlconfdata/cpu-host-kvmclock.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-kvmclock.xml rename to tests/qemuxmlconfdata/cpu-host-kvmclock.xml diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-cmt.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-host-model-cmt.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.xml b/tests/qemuxmlconfdata/cpu-host-model-cmt.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-cmt.xml rename to tests/qemuxmlconfdata/cpu-host-model-cmt.xml diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-5.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-5.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-5.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-6.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-6.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-6.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-6.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-6.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-6.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-6.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-6.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-6.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-6.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-6.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-6.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-7.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-7.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-7.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-7.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-kvm.xml rename to tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.xml diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-fallback-tcg.xml rename to tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.xml diff --git a/tests/qemuxml2argvdata/cpu-host-model-features.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-features.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-features.xml b/tests/qemuxmlconfdata/cpu-host-model-features.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-features.xml rename to tests/qemuxmlconfdata/cpu-host-model-features.xml diff --git a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-4.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-4.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-5.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-5.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-5.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-5.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-5.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-6.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-6.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-6.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-6.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-6.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-6.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-6.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-6.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-6.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-6.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-6.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-6.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-7.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-7.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-7.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-7.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-7.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-7.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-8.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-8.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-8.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-kvm.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-kvm.xml b/tests/qemuxmlconfdata/cpu-host-model-kvm.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-kvm.xml rename to tests/qemuxmlconfdata/cpu-host-model-kvm.xml diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-5.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-5.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-5.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-6.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-6.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-6.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-6.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-6.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-6.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-6.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-6.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-6.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-6.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-6.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-6.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-7.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-7.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-7.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-7.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-kvm.xml rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.xml diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.xml b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-nofallback-tcg.xml rename to tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.xml diff --git a/tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-4.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-4.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-5.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-5.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-5.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-5.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-5.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-6.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-6.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-6.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-6.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-6.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-6.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-7.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-7.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-7.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-7.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-7.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-7.2.0.args rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-8.0.0.args rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-8.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-8.1.0.args rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-tcg.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-tcg.xml b/tests/qemuxmlconfdata/cpu-host-model-tcg.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-tcg.xml rename to tests/qemuxmlconfdata/cpu-host-model-tcg.xml diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-vendor.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-vendor.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-host-model-vendor.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.xml b/tests/qemuxmlconfdata/cpu-host-model-vendor.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-vendor.xml rename to tests/qemuxmlconfdata/cpu-host-model-vendor.xml diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-passthrough-features.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-passthrough-features.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-host-passthrough-features.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.xml b/tests/qemuxmlconfdata/cpu-host-passthrough-features.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-passthrough-features.xml rename to tests/qemuxmlconfdata/cpu-host-passthrough-features.xml diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-passthrough.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-passthrough.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-host-passthrough.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.xml b/tests/qemuxmlconfdata/cpu-host-passthrough.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-passthrough.xml rename to tests/qemuxmlconfdata/cpu-host-passthrough.xml diff --git a/tests/qemuxml2argvdata/cpu-hotplug-granularity.ppc64-latest.err b/tests/qemuxmlconfdata/cpu-hotplug-granularity.ppc64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/cpu-hotplug-granularity.ppc64-latest.err rename to tests/qemuxmlconfdata/cpu-hotplug-granularity.ppc64-latest.err diff --git a/tests/qemuxml2argvdata/cpu-hotplug-granularity.xml b/tests/qemuxmlconfdata/cpu-hotplug-granularity.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-hotplug-granularity.xml rename to tests/qemuxmlconfdata/cpu-hotplug-granularity.xml diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-hotplug-startup.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-hotplug-startup.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.xml b/tests/qemuxmlconfdata/cpu-hotplug-startup.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-hotplug-startup.xml rename to tests/qemuxmlconfdata/cpu-hotplug-startup.xml diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-kvmclock.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-kvmclock.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-kvmclock.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.xml b/tests/qemuxmlconfdata/cpu-kvmclock.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-kvmclock.xml rename to tests/qemuxmlconfdata/cpu-kvmclock.xml diff --git a/tests/qemuxml2argvdata/cpu-minimum1.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-minimum1.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-minimum1.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-minimum1.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-minimum1.xml b/tests/qemuxmlconfdata/cpu-minimum1.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-minimum1.xml rename to tests/qemuxmlconfdata/cpu-minimum1.xml diff --git a/tests/qemuxml2argvdata/cpu-minimum2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-minimum2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-minimum2.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-minimum2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-minimum2.xml b/tests/qemuxmlconfdata/cpu-minimum2.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-minimum2.xml rename to tests/qemuxmlconfdata/cpu-minimum2.xml diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-no-removed-features.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-no-removed-features.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-no-removed-features.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.xml b/tests/qemuxmlconfdata/cpu-no-removed-features.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-no-removed-features.xml rename to tests/qemuxmlconfdata/cpu-no-removed-features.xml diff --git a/tests/qemuxml2argvdata/cpu-nofallback.x86_64-5.2.0.err b/tests/qemuxmlconfdata/cpu-nofallback.x86_64-5.2.0.err similarity index 100% rename from tests/qemuxml2argvdata/cpu-nofallback.x86_64-5.2.0.err rename to tests/qemuxmlconfdata/cpu-nofallback.x86_64-5.2.0.err diff --git a/tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args rename to tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.args diff --git a/tests/qemuxml2argvdata/cpu-nofallback.xml b/tests/qemuxmlconfdata/cpu-nofallback.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-nofallback.xml rename to tests/qemuxmlconfdata/cpu-nofallback.xml diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-numa-disjoint.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-numa-disjoint.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.xml b/tests/qemuxmlconfdata/cpu-numa-disjoint.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa-disjoint.xml rename to tests/qemuxmlconfdata/cpu-numa-disjoint.xml diff --git a/tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-numa-disordered.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-numa-disordered.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-numa-disordered.xml b/tests/qemuxmlconfdata/cpu-numa-disordered.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa-disordered.xml rename to tests/qemuxmlconfdata/cpu-numa-disordered.xml diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-numa-memshared.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-numa-memshared.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.xml b/tests/qemuxmlconfdata/cpu-numa-memshared.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa-memshared.xml rename to tests/qemuxmlconfdata/cpu-numa-memshared.xml diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-numa-no-memory-element.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-numa-no-memory-element.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.xml b/tests/qemuxmlconfdata/cpu-numa-no-memory-element.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa-no-memory-element.xml rename to tests/qemuxmlconfdata/cpu-numa-no-memory-element.xml diff --git a/tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-numa1.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-numa1.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-numa1.xml b/tests/qemuxmlconfdata/cpu-numa1.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa1.xml rename to tests/qemuxmlconfdata/cpu-numa1.xml diff --git a/tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-numa2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-numa2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-numa2.xml b/tests/qemuxmlconfdata/cpu-numa2.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa2.xml rename to tests/qemuxmlconfdata/cpu-numa2.xml diff --git a/tests/qemuxml2argvdata/cpu-numa3.x86_64-latest.err b/tests/qemuxmlconfdata/cpu-numa3.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa3.x86_64-latest.err rename to tests/qemuxmlconfdata/cpu-numa3.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/cpu-numa3.xml b/tests/qemuxmlconfdata/cpu-numa3.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-numa3.xml rename to tests/qemuxmlconfdata/cpu-numa3.xml diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate-bare.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-phys-bits-emulate-bare.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-phys-bits-emulate-bare.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-phys-bits-emulate-bare.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate-bare.xml b/tests/qemuxmlconfdata/cpu-phys-bits-emulate-bare.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-phys-bits-emulate-bare.xml rename to tests/qemuxmlconfdata/cpu-phys-bits-emulate-bare.xml diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-phys-bits-emulate.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-phys-bits-emulate.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-phys-bits-emulate.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.xml b/tests/qemuxmlconfdata/cpu-phys-bits-emulate.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-phys-bits-emulate.xml rename to tests/qemuxmlconfdata/cpu-phys-bits-emulate.xml diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-phys-bits-emulate2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-phys-bits-emulate2.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-phys-bits-emulate2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.xml b/tests/qemuxmlconfdata/cpu-phys-bits-emulate2.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-phys-bits-emulate2.xml rename to tests/qemuxmlconfdata/cpu-phys-bits-emulate2.xml diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-limit.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-phys-bits-limit.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-phys-bits-limit.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-phys-bits-limit.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-limit.xml b/tests/qemuxmlconfdata/cpu-phys-bits-limit.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-phys-bits-limit.xml rename to tests/qemuxmlconfdata/cpu-phys-bits-limit.xml diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-phys-bits-passthrough.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-phys-bits-passthrough.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-phys-bits-passthrough.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.xml b/tests/qemuxmlconfdata/cpu-phys-bits-passthrough.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-phys-bits-passthrough.xml rename to tests/qemuxmlconfdata/cpu-phys-bits-passthrough.xml diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.x86_64-latest.err b/tests/qemuxmlconfdata/cpu-phys-bits-passthrough2.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.x86_64-latest.err rename to tests/qemuxmlconfdata/cpu-phys-bits-passthrough2.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.xml b/tests/qemuxmlconfdata/cpu-phys-bits-passthrough2.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.xml rename to tests/qemuxmlconfdata/cpu-phys-bits-passthrough2.xml diff --git a/tests/qemuxml2argvdata/cpu-qemu-host-passthrough.x86_64-latest.err b/tests/qemuxmlconfdata/cpu-qemu-host-passthrough.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/cpu-qemu-host-passthrough.x86_64-latest.err rename to tests/qemuxmlconfdata/cpu-qemu-host-passthrough.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/cpu-qemu-host-passthrough.xml b/tests/qemuxmlconfdata/cpu-qemu-host-passthrough.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-qemu-host-passthrough.xml rename to tests/qemuxmlconfdata/cpu-qemu-host-passthrough.xml diff --git a/tests/qemuxml2argvdata/cpu-s390-features.s390x-latest.args b/tests/qemuxmlconfdata/cpu-s390-features.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-s390-features.s390x-latest.args rename to tests/qemuxmlconfdata/cpu-s390-features.s390x-latest.args diff --git a/tests/qemuxml2argvdata/cpu-s390-features.xml b/tests/qemuxmlconfdata/cpu-s390-features.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-s390-features.xml rename to tests/qemuxmlconfdata/cpu-s390-features.xml diff --git a/tests/qemuxml2argvdata/cpu-s390-zEC12.s390x-latest.args b/tests/qemuxmlconfdata/cpu-s390-zEC12.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-s390-zEC12.s390x-latest.args rename to tests/qemuxmlconfdata/cpu-s390-zEC12.s390x-latest.args diff --git a/tests/qemuxml2argvdata/cpu-s390-zEC12.xml b/tests/qemuxmlconfdata/cpu-s390-zEC12.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-s390-zEC12.xml rename to tests/qemuxmlconfdata/cpu-s390-zEC12.xml diff --git a/tests/qemuxml2argvdata/cpu-strict1.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-strict1.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-strict1.xml b/tests/qemuxmlconfdata/cpu-strict1.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-strict1.xml rename to tests/qemuxmlconfdata/cpu-strict1.xml diff --git a/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-topology1.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-topology1.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-topology1.xml b/tests/qemuxmlconfdata/cpu-topology1.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-topology1.xml rename to tests/qemuxmlconfdata/cpu-topology1.xml diff --git a/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-topology2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-topology2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-topology2.xml b/tests/qemuxmlconfdata/cpu-topology2.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-topology2.xml rename to tests/qemuxmlconfdata/cpu-topology2.xml diff --git a/tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-topology3.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-topology3.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-topology3.xml b/tests/qemuxmlconfdata/cpu-topology3.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-topology3.xml rename to tests/qemuxmlconfdata/cpu-topology3.xml diff --git a/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-topology4.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-topology4.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-topology4.xml b/tests/qemuxmlconfdata/cpu-topology4.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-topology4.xml rename to tests/qemuxmlconfdata/cpu-topology4.xml diff --git a/tests/qemuxml2argvdata/cpu-topology5.aarch64-latest.args b/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-topology5.aarch64-latest.args rename to tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-topology5.xml b/tests/qemuxmlconfdata/cpu-topology5.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-topology5.xml rename to tests/qemuxmlconfdata/cpu-topology5.xml diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-translation.xml b/tests/qemuxmlconfdata/cpu-translation.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-translation.xml rename to tests/qemuxmlconfdata/cpu-translation.xml diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-latest.args rename to tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.xml b/tests/qemuxmlconfdata/cpu-tsc-frequency.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-tsc-frequency.xml rename to tests/qemuxmlconfdata/cpu-tsc-frequency.xml diff --git a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args b/tests/qemuxmlconfdata/cputune-cpuset-big-id.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args rename to tests/qemuxmlconfdata/cputune-cpuset-big-id.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cputune-cpuset-big-id.xml b/tests/qemuxmlconfdata/cputune-cpuset-big-id.xml similarity index 100% rename from tests/qemuxml2argvdata/cputune-cpuset-big-id.xml rename to tests/qemuxmlconfdata/cputune-cpuset-big-id.xml diff --git a/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.x86_64-latest.err b/tests/qemuxmlconfdata/cputune-iothreadsched-toomuch.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.x86_64-latest.err rename to tests/qemuxmlconfdata/cputune-iothreadsched-toomuch.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml b/tests/qemuxmlconfdata/cputune-iothreadsched-toomuch.xml similarity index 100% rename from tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml rename to tests/qemuxmlconfdata/cputune-iothreadsched-toomuch.xml diff --git a/tests/qemuxml2argvdata/cputune-numatune.x86_64-latest.args b/tests/qemuxmlconfdata/cputune-numatune.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cputune-numatune.x86_64-latest.args rename to tests/qemuxmlconfdata/cputune-numatune.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cputune-numatune.xml b/tests/qemuxmlconfdata/cputune-numatune.xml similarity index 100% rename from tests/qemuxml2argvdata/cputune-numatune.xml rename to tests/qemuxmlconfdata/cputune-numatune.xml diff --git a/tests/qemuxml2argvdata/cputune-vcpusched-overlap.x86_64-latest.err b/tests/qemuxmlconfdata/cputune-vcpusched-overlap.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/cputune-vcpusched-overlap.x86_64-latest.err rename to tests/qemuxmlconfdata/cputune-vcpusched-overlap.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml b/tests/qemuxmlconfdata/cputune-vcpusched-overlap.xml similarity index 100% rename from tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml rename to tests/qemuxmlconfdata/cputune-vcpusched-overlap.xml diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.x86_64-latest.args b/tests/qemuxmlconfdata/cputune-zero-shares.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cputune-zero-shares.x86_64-latest.args rename to tests/qemuxmlconfdata/cputune-zero-shares.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.xml b/tests/qemuxmlconfdata/cputune-zero-shares.xml similarity index 100% rename from tests/qemuxml2argvdata/cputune-zero-shares.xml rename to tests/qemuxmlconfdata/cputune-zero-shares.xml diff --git a/tests/qemuxml2argvdata/cputune.x86_64-latest.args b/tests/qemuxmlconfdata/cputune.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cputune.x86_64-latest.args rename to tests/qemuxmlconfdata/cputune.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cputune.xml b/tests/qemuxmlconfdata/cputune.xml similarity index 100% rename from tests/qemuxml2argvdata/cputune.xml rename to tests/qemuxmlconfdata/cputune.xml diff --git a/tests/qemuxml2argvdata/crypto-builtin.x86_64-latest.args b/tests/qemuxmlconfdata/crypto-builtin.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/crypto-builtin.x86_64-latest.args rename to tests/qemuxmlconfdata/crypto-builtin.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/crypto-builtin.xml b/tests/qemuxmlconfdata/crypto-builtin.xml similarity index 100% rename from tests/qemuxml2argvdata/crypto-builtin.xml rename to tests/qemuxmlconfdata/crypto-builtin.xml diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.x86_64-latest.args b/tests/qemuxmlconfdata/default-kvm-host-arch.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/default-kvm-host-arch.x86_64-latest.args rename to tests/qemuxmlconfdata/default-kvm-host-arch.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.xml b/tests/qemuxmlconfdata/default-kvm-host-arch.xml similarity index 100% rename from tests/qemuxml2argvdata/default-kvm-host-arch.xml rename to tests/qemuxmlconfdata/default-kvm-host-arch.xml diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.x86_64-latest.args b/tests/qemuxmlconfdata/default-qemu-host-arch.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/default-qemu-host-arch.x86_64-latest.args rename to tests/qemuxmlconfdata/default-qemu-host-arch.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.xml b/tests/qemuxmlconfdata/default-qemu-host-arch.xml similarity index 100% rename from tests/qemuxml2argvdata/default-qemu-host-arch.xml rename to tests/qemuxmlconfdata/default-qemu-host-arch.xml diff --git a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/default-video-type-aarch64.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args rename to tests/qemuxmlconfdata/default-video-type-aarch64.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/default-video-type-aarch64.xml b/tests/qemuxmlconfdata/default-video-type-aarch64.xml similarity index 100% rename from tests/qemuxml2argvdata/default-video-type-aarch64.xml rename to tests/qemuxmlconfdata/default-video-type-aarch64.xml diff --git a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args b/tests/qemuxmlconfdata/default-video-type-ppc64.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args rename to tests/qemuxmlconfdata/default-video-type-ppc64.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/default-video-type-ppc64.xml b/tests/qemuxmlconfdata/default-video-type-ppc64.xml similarity index 100% rename from tests/qemuxml2argvdata/default-video-type-ppc64.xml rename to tests/qemuxmlconfdata/default-video-type-ppc64.xml diff --git a/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args b/tests/qemuxmlconfdata/default-video-type-riscv64.riscv64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args rename to tests/qemuxmlconfdata/default-video-type-riscv64.riscv64-latest.args diff --git a/tests/qemuxml2argvdata/default-video-type-riscv64.xml b/tests/qemuxmlconfdata/default-video-type-riscv64.xml similarity index 100% rename from tests/qemuxml2argvdata/default-video-type-riscv64.xml rename to tests/qemuxmlconfdata/default-video-type-riscv64.xml diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args b/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args rename to tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.xml b/tests/qemuxmlconfdata/default-video-type-s390x.xml similarity index 100% rename from tests/qemuxml2argvdata/default-video-type-s390x.xml rename to tests/qemuxmlconfdata/default-video-type-s390x.xml diff --git a/tests/qemuxml2argvdata/default-video-type-x86_64.x86_64-latest.args b/tests/qemuxmlconfdata/default-video-type-x86_64.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/default-video-type-x86_64.x86_64-latest.args rename to tests/qemuxmlconfdata/default-video-type-x86_64.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/default-video-type-x86_64.xml b/tests/qemuxmlconfdata/default-video-type-x86_64.xml similarity index 100% rename from tests/qemuxml2argvdata/default-video-type-x86_64.xml rename to tests/qemuxmlconfdata/default-video-type-x86_64.xml diff --git a/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args b/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args rename to tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/devices-acpi-index.xml b/tests/qemuxmlconfdata/devices-acpi-index.xml similarity index 100% rename from tests/qemuxml2argvdata/devices-acpi-index.xml rename to tests/qemuxmlconfdata/devices-acpi-index.xml diff --git a/tests/qemuxml2argvdata/disk-active-commit.x86_64-latest.args b/tests/qemuxmlconfdata/disk-active-commit.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-active-commit.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-active-commit.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-active-commit.xml b/tests/qemuxmlconfdata/disk-active-commit.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-active-commit.xml rename to tests/qemuxmlconfdata/disk-active-commit.xml diff --git a/tests/qemuxml2argvdata/disk-address-conflict.x86_64-latest.err b/tests/qemuxmlconfdata/disk-address-conflict.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-address-conflict.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-address-conflict.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-address-conflict.xml b/tests/qemuxmlconfdata/disk-address-conflict.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-address-conflict.xml rename to tests/qemuxmlconfdata/disk-address-conflict.xml diff --git a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args b/tests/qemuxmlconfdata/disk-aio-io_uring.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-aio-io_uring.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-aio-io_uring.xml b/tests/qemuxmlconfdata/disk-aio-io_uring.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-aio-io_uring.xml rename to tests/qemuxmlconfdata/disk-aio-io_uring.xml diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args b/tests/qemuxmlconfdata/disk-aio.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-aio.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-aio.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-aio.xml b/tests/qemuxmlconfdata/disk-aio.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-aio.xml rename to tests/qemuxmlconfdata/disk-aio.xml diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args b/tests/qemuxmlconfdata/disk-arm-virtio-sd.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args rename to tests/qemuxmlconfdata/disk-arm-virtio-sd.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.xml b/tests/qemuxmlconfdata/disk-arm-virtio-sd.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-arm-virtio-sd.xml rename to tests/qemuxmlconfdata/disk-arm-virtio-sd.xml diff --git a/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.x86_64-latest.err b/tests/qemuxmlconfdata/disk-attaching-partition-nosupport.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-attaching-partition-nosupport.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-attaching-partition-nosupport.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml b/tests/qemuxmlconfdata/disk-attaching-partition-nosupport.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml rename to tests/qemuxmlconfdata/disk-attaching-partition-nosupport.xml diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args b/tests/qemuxmlconfdata/disk-backing-chains-index.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-backing-chains-index.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.xml b/tests/qemuxmlconfdata/disk-backing-chains-index.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-backing-chains-index.xml rename to tests/qemuxmlconfdata/disk-backing-chains-index.xml diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args b/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.xml b/tests/qemuxmlconfdata/disk-backing-chains-noindex.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-backing-chains-noindex.xml rename to tests/qemuxmlconfdata/disk-backing-chains-noindex.xml diff --git a/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args b/tests/qemuxmlconfdata/disk-blockio.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-blockio.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-blockio.xml b/tests/qemuxmlconfdata/disk-blockio.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-blockio.xml rename to tests/qemuxmlconfdata/disk-blockio.xml diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args b/tests/qemuxmlconfdata/disk-boot-cdrom.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-boot-cdrom.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.xml b/tests/qemuxmlconfdata/disk-boot-cdrom.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-boot-cdrom.xml rename to tests/qemuxmlconfdata/disk-boot-cdrom.xml diff --git a/tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args b/tests/qemuxmlconfdata/disk-boot-disk.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-boot-disk.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-boot-disk.xml b/tests/qemuxmlconfdata/disk-boot-disk.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-boot-disk.xml rename to tests/qemuxmlconfdata/disk-boot-disk.xml diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/qemuxmlconfdata/disk-cache.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-cache.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-cache.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-cache.xml b/tests/qemuxmlconfdata/disk-cache.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-cache.xml rename to tests/qemuxmlconfdata/disk-cache.xml diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args b/tests/qemuxmlconfdata/disk-cdrom-bus-other.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-cdrom-bus-other.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.xml b/tests/qemuxmlconfdata/disk-cdrom-bus-other.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-cdrom-bus-other.xml rename to tests/qemuxmlconfdata/disk-cdrom-bus-other.xml diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args b/tests/qemuxmlconfdata/disk-cdrom-empty-network-invalid.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-cdrom-empty-network-invalid.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.xml b/tests/qemuxmlconfdata/disk-cdrom-empty-network-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.xml rename to tests/qemuxmlconfdata/disk-cdrom-empty-network-invalid.xml diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-nbdkit.x86_64-latest.args b/tests/qemuxmlconfdata/disk-cdrom-network-nbdkit.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-cdrom-network-nbdkit.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-cdrom-network-nbdkit.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-cdrom-network-nbdkit.xml b/tests/qemuxmlconfdata/disk-cdrom-network-nbdkit.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-cdrom-network-nbdkit.xml rename to tests/qemuxmlconfdata/disk-cdrom-network-nbdkit.xml diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args b/tests/qemuxmlconfdata/disk-cdrom-network.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-cdrom-network.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.xml b/tests/qemuxmlconfdata/disk-cdrom-network.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-cdrom-network.xml rename to tests/qemuxmlconfdata/disk-cdrom-network.xml diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args b/tests/qemuxmlconfdata/disk-cdrom-tray.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-cdrom-tray.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.xml b/tests/qemuxmlconfdata/disk-cdrom-tray.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-cdrom-tray.xml rename to tests/qemuxmlconfdata/disk-cdrom-tray.xml diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/qemuxmlconfdata/disk-cdrom.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-cdrom.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-cdrom.xml b/tests/qemuxmlconfdata/disk-cdrom.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-cdrom.xml rename to tests/qemuxmlconfdata/disk-cdrom.xml diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args b/tests/qemuxmlconfdata/disk-copy_on_read.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-copy_on_read.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.xml b/tests/qemuxmlconfdata/disk-copy_on_read.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-copy_on_read.xml rename to tests/qemuxmlconfdata/disk-copy_on_read.xml diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args b/tests/qemuxmlconfdata/disk-detect-zeroes.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-detect-zeroes.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.xml b/tests/qemuxmlconfdata/disk-detect-zeroes.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-detect-zeroes.xml rename to tests/qemuxmlconfdata/disk-detect-zeroes.xml diff --git a/tests/qemuxml2argvdata/disk-device-lun-type-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/disk-device-lun-type-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-device-lun-type-invalid.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-device-lun-type-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-device-lun-type-invalid.xml b/tests/qemuxmlconfdata/disk-device-lun-type-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-device-lun-type-invalid.xml rename to tests/qemuxmlconfdata/disk-device-lun-type-invalid.xml diff --git a/tests/qemuxml2argvdata/disk-device-removable.x86_64-latest.args b/tests/qemuxmlconfdata/disk-device-removable.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-device-removable.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-device-removable.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-device-removable.xml b/tests/qemuxmlconfdata/disk-device-removable.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-device-removable.xml rename to tests/qemuxmlconfdata/disk-device-removable.xml diff --git a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args b/tests/qemuxmlconfdata/disk-discard.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-discard.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-discard.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-discard.xml b/tests/qemuxmlconfdata/disk-discard.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-discard.xml rename to tests/qemuxmlconfdata/disk-discard.xml diff --git a/tests/qemuxml2argvdata/disk-discard_no_unref.x86_64-latest.args b/tests/qemuxmlconfdata/disk-discard_no_unref.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-discard_no_unref.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-discard_no_unref.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-discard_no_unref.xml b/tests/qemuxmlconfdata/disk-discard_no_unref.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-discard_no_unref.xml rename to tests/qemuxmlconfdata/disk-discard_no_unref.xml diff --git a/tests/qemuxml2argvdata/disk-encryption-wrong.x86_64-latest.err b/tests/qemuxmlconfdata/disk-encryption-wrong.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-encryption-wrong.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-encryption-wrong.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-encryption-wrong.xml b/tests/qemuxmlconfdata/disk-encryption-wrong.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-encryption-wrong.xml rename to tests/qemuxmlconfdata/disk-encryption-wrong.xml diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args b/tests/qemuxmlconfdata/disk-error-policy-s390x.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args rename to tests/qemuxmlconfdata/disk-error-policy-s390x.s390x-latest.args diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.xml b/tests/qemuxmlconfdata/disk-error-policy-s390x.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-error-policy-s390x.xml rename to tests/qemuxmlconfdata/disk-error-policy-s390x.xml diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args b/tests/qemuxmlconfdata/disk-error-policy.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-error-policy.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-error-policy.xml b/tests/qemuxmlconfdata/disk-error-policy.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-error-policy.xml rename to tests/qemuxmlconfdata/disk-error-policy.xml diff --git a/tests/qemuxml2argvdata/disk-fdc-incompatible-address.x86_64-latest.err b/tests/qemuxmlconfdata/disk-fdc-incompatible-address.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-fdc-incompatible-address.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-fdc-incompatible-address.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-fdc-incompatible-address.xml b/tests/qemuxmlconfdata/disk-fdc-incompatible-address.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-fdc-incompatible-address.xml rename to tests/qemuxmlconfdata/disk-fdc-incompatible-address.xml diff --git a/tests/qemuxml2argvdata/disk-floppy-pseries.ppc64-latest.err b/tests/qemuxmlconfdata/disk-floppy-pseries.ppc64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-floppy-pseries.ppc64-latest.err rename to tests/qemuxmlconfdata/disk-floppy-pseries.ppc64-latest.err diff --git a/tests/qemuxml2argvdata/disk-floppy-pseries.xml b/tests/qemuxmlconfdata/disk-floppy-pseries.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-floppy-pseries.xml rename to tests/qemuxmlconfdata/disk-floppy-pseries.xml diff --git a/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args b/tests/qemuxmlconfdata/disk-floppy-q35.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-floppy-q35.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-floppy-q35.xml b/tests/qemuxmlconfdata/disk-floppy-q35.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-floppy-q35.xml rename to tests/qemuxmlconfdata/disk-floppy-q35.xml diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args b/tests/qemuxmlconfdata/disk-floppy-tray.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-floppy-tray.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.xml b/tests/qemuxmlconfdata/disk-floppy-tray.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-floppy-tray.xml rename to tests/qemuxmlconfdata/disk-floppy-tray.xml diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args b/tests/qemuxmlconfdata/disk-floppy.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-floppy.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-floppy.xml b/tests/qemuxmlconfdata/disk-floppy.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-floppy.xml rename to tests/qemuxmlconfdata/disk-floppy.xml diff --git a/tests/qemuxml2argvdata/disk-fmt-cow.x86_64-latest.err b/tests/qemuxmlconfdata/disk-fmt-cow.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-fmt-cow.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-fmt-cow.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-fmt-cow.xml b/tests/qemuxmlconfdata/disk-fmt-cow.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-fmt-cow.xml rename to tests/qemuxmlconfdata/disk-fmt-cow.xml diff --git a/tests/qemuxml2argvdata/disk-fmt-dir.x86_64-latest.err b/tests/qemuxmlconfdata/disk-fmt-dir.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-fmt-dir.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-fmt-dir.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-fmt-dir.xml b/tests/qemuxmlconfdata/disk-fmt-dir.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-fmt-dir.xml rename to tests/qemuxmlconfdata/disk-fmt-dir.xml diff --git a/tests/qemuxml2argvdata/disk-fmt-iso.x86_64-latest.err b/tests/qemuxmlconfdata/disk-fmt-iso.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-fmt-iso.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-fmt-iso.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-fmt-iso.xml b/tests/qemuxmlconfdata/disk-fmt-iso.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-fmt-iso.xml rename to tests/qemuxmlconfdata/disk-fmt-iso.xml diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args b/tests/qemuxmlconfdata/disk-fmt-qcow.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-fmt-qcow.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.xml b/tests/qemuxmlconfdata/disk-fmt-qcow.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-fmt-qcow.xml rename to tests/qemuxmlconfdata/disk-fmt-qcow.xml diff --git a/tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args b/tests/qemuxmlconfdata/disk-geometry.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-geometry.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-geometry.xml b/tests/qemuxmlconfdata/disk-geometry.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-geometry.xml rename to tests/qemuxmlconfdata/disk-geometry.xml diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.x86_64-latest.err b/tests/qemuxmlconfdata/disk-hostdev-scsi-address-conflict.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-hostdev-scsi-address-conflict.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.xml b/tests/qemuxmlconfdata/disk-hostdev-scsi-address-conflict.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-hostdev-scsi-address-conflict.xml rename to tests/qemuxmlconfdata/disk-hostdev-scsi-address-conflict.xml diff --git a/tests/qemuxml2argvdata/disk-ide-incompatible-address.x86_64-latest.err b/tests/qemuxmlconfdata/disk-ide-incompatible-address.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-ide-incompatible-address.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-ide-incompatible-address.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-ide-incompatible-address.xml b/tests/qemuxmlconfdata/disk-ide-incompatible-address.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-ide-incompatible-address.xml rename to tests/qemuxmlconfdata/disk-ide-incompatible-address.xml diff --git a/tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args b/tests/qemuxmlconfdata/disk-ide-split.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-ide-split.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-ide-split.xml b/tests/qemuxmlconfdata/disk-ide-split.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-ide-split.xml rename to tests/qemuxmlconfdata/disk-ide-split.xml diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args b/tests/qemuxmlconfdata/disk-ide-wwn.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-ide-wwn.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.xml b/tests/qemuxmlconfdata/disk-ide-wwn.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-ide-wwn.xml rename to tests/qemuxmlconfdata/disk-ide-wwn.xml diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-ioeventfd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-ioeventfd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.xml b/tests/qemuxmlconfdata/disk-ioeventfd.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-ioeventfd.xml rename to tests/qemuxmlconfdata/disk-ioeventfd.xml diff --git a/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args b/tests/qemuxmlconfdata/disk-metadata-cache.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-metadata-cache.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-metadata-cache.xml b/tests/qemuxmlconfdata/disk-metadata-cache.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-metadata-cache.xml rename to tests/qemuxmlconfdata/disk-metadata-cache.xml diff --git a/tests/qemuxml2argvdata/disk-mirror-old.x86_64-latest.args b/tests/qemuxmlconfdata/disk-mirror-old.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-mirror-old.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-mirror-old.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-mirror-old.xml b/tests/qemuxmlconfdata/disk-mirror-old.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-mirror-old.xml rename to tests/qemuxmlconfdata/disk-mirror-old.xml diff --git a/tests/qemuxml2argvdata/disk-mirror.x86_64-latest.args b/tests/qemuxmlconfdata/disk-mirror.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-mirror.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-mirror.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-mirror.xml b/tests/qemuxmlconfdata/disk-mirror.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-mirror.xml rename to tests/qemuxmlconfdata/disk-mirror.xml diff --git a/tests/qemuxml2argvdata/disk-missing-target-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/disk-missing-target-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-missing-target-invalid.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-missing-target-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-missing-target-invalid.xml b/tests/qemuxmlconfdata/disk-missing-target-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-missing-target-invalid.xml rename to tests/qemuxmlconfdata/disk-missing-target-invalid.xml diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-gluster.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-gluster.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-gluster.xml b/tests/qemuxmlconfdata/disk-network-gluster.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-gluster.xml rename to tests/qemuxmlconfdata/disk-network-gluster.xml diff --git a/tests/qemuxml2argvdata/disk-network-http-nbdkit.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-http-nbdkit.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-http-nbdkit.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-http-nbdkit.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-http-nbdkit.xml b/tests/qemuxmlconfdata/disk-network-http-nbdkit.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-http-nbdkit.xml rename to tests/qemuxmlconfdata/disk-network-http-nbdkit.xml diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-http.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-http.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-http.xml b/tests/qemuxmlconfdata/disk-network-http.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-http.xml rename to tests/qemuxmlconfdata/disk-network-http.xml diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/disk-network-iscsi-auth-secrettype-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-network-iscsi-auth-secrettype-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid.xml b/tests/qemuxmlconfdata/disk-network-iscsi-auth-secrettype-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-iscsi-auth-secrettype-invalid.xml rename to tests/qemuxmlconfdata/disk-network-iscsi-auth-secrettype-invalid.xml diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.x86_64-latest.err b/tests/qemuxmlconfdata/disk-network-iscsi-auth-wrong-secrettype.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-network-iscsi-auth-wrong-secrettype.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.xml b/tests/qemuxmlconfdata/disk-network-iscsi-auth-wrong-secrettype.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-iscsi-auth-wrong-secrettype.xml rename to tests/qemuxmlconfdata/disk-network-iscsi-auth-wrong-secrettype.xml diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-iscsi.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-iscsi.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.xml b/tests/qemuxmlconfdata/disk-network-iscsi.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-iscsi.xml rename to tests/qemuxmlconfdata/disk-network-iscsi.xml diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-nbd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-nbd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-nbd.xml b/tests/qemuxmlconfdata/disk-network-nbd.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-nbd.xml rename to tests/qemuxmlconfdata/disk-network-nbd.xml diff --git a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-nfs.xml b/tests/qemuxmlconfdata/disk-network-nfs.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-nfs.xml rename to tests/qemuxmlconfdata/disk-network-nfs.xml diff --git a/tests/qemuxml2argvdata/disk-network-rbd-encryption-layering.x86_64-7.2.0.err b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-7.2.0.err similarity index 100% rename from tests/qemuxml2argvdata/disk-network-rbd-encryption-layering.x86_64-7.2.0.err rename to tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-7.2.0.err diff --git a/tests/qemuxml2argvdata/disk-network-rbd-encryption-layering.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-rbd-encryption-layering.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-rbd-encryption-layering.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-rbd-encryption-layering.xml rename to tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.xml diff --git a/tests/qemuxml2argvdata/disk-network-rbd-encryption-luks-any.x86_64-7.2.0.err b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-7.2.0.err similarity index 100% rename from tests/qemuxml2argvdata/disk-network-rbd-encryption-luks-any.x86_64-7.2.0.err rename to tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-7.2.0.err diff --git a/tests/qemuxml2argvdata/disk-network-rbd-encryption-luks-any.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-rbd-encryption-luks-any.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-rbd-encryption-luks-any.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-rbd-encryption-luks-any.xml rename to tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.xml diff --git a/tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-6.0.0.err b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-6.0.0.err similarity index 100% rename from tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-6.0.0.err rename to tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-6.0.0.err diff --git a/tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-rbd-encryption.xml b/tests/qemuxmlconfdata/disk-network-rbd-encryption.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-rbd-encryption.xml rename to tests/qemuxmlconfdata/disk-network-rbd-encryption.xml diff --git a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd-no-colon.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-rbd-no-colon.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.xml b/tests/qemuxmlconfdata/disk-network-rbd-no-colon.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-rbd-no-colon.xml rename to tests/qemuxmlconfdata/disk-network-rbd-no-colon.xml diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-rbd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-rbd.xml b/tests/qemuxmlconfdata/disk-network-rbd.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-rbd.xml rename to tests/qemuxmlconfdata/disk-network-rbd.xml diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-6.0.0.args b/tests/qemuxmlconfdata/disk-network-sheepdog.x86_64-6.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-6.0.0.args rename to tests/qemuxmlconfdata/disk-network-sheepdog.x86_64-6.0.0.args diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.xml b/tests/qemuxmlconfdata/disk-network-sheepdog.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-sheepdog.xml rename to tests/qemuxmlconfdata/disk-network-sheepdog.xml diff --git a/tests/qemuxml2argvdata/disk-network-source-auth-both.x86_64-latest.err b/tests/qemuxmlconfdata/disk-network-source-auth-both.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-network-source-auth-both.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-network-source-auth-both.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-network-source-auth-both.xml b/tests/qemuxmlconfdata/disk-network-source-auth-both.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-source-auth-both.xml rename to tests/qemuxmlconfdata/disk-network-source-auth-both.xml diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-source-auth.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-source-auth.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.xml b/tests/qemuxmlconfdata/disk-network-source-auth.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-source-auth.xml rename to tests/qemuxmlconfdata/disk-network-source-auth.xml diff --git a/tests/qemuxml2argvdata/disk-network-source-curl-nbdkit-backing.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit-backing.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-source-curl-nbdkit-backing.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-source-curl-nbdkit-backing.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-source-curl-nbdkit-backing.xml b/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit-backing.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-source-curl-nbdkit-backing.xml rename to tests/qemuxmlconfdata/disk-network-source-curl-nbdkit-backing.xml diff --git a/tests/qemuxml2argvdata/disk-network-source-curl-nbdkit.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-source-curl-nbdkit.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-source-curl-nbdkit.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-source-curl-nbdkit.xml b/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-source-curl-nbdkit.xml rename to tests/qemuxmlconfdata/disk-network-source-curl-nbdkit.xml diff --git a/tests/qemuxml2argvdata/disk-network-source-curl.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-source-curl.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-source-curl.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-source-curl.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-source-curl.xml b/tests/qemuxmlconfdata/disk-network-source-curl.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-source-curl.xml rename to tests/qemuxmlconfdata/disk-network-source-curl.xml diff --git a/tests/qemuxml2argvdata/disk-network-ssh-key.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-ssh-key.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-ssh-key.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-ssh-key.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-ssh-key.xml b/tests/qemuxmlconfdata/disk-network-ssh-key.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-ssh-key.xml rename to tests/qemuxmlconfdata/disk-network-ssh-key.xml diff --git a/tests/qemuxml2argvdata/disk-network-ssh-nbdkit.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-ssh-nbdkit.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-ssh-nbdkit.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-ssh-nbdkit.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-ssh-nbdkit.xml b/tests/qemuxmlconfdata/disk-network-ssh-nbdkit.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-ssh-nbdkit.xml rename to tests/qemuxmlconfdata/disk-network-ssh-nbdkit.xml diff --git a/tests/qemuxml2argvdata/disk-network-ssh-password.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-ssh-password.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-ssh-password.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-ssh-password.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-ssh-password.xml b/tests/qemuxmlconfdata/disk-network-ssh-password.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-ssh-password.xml rename to tests/qemuxmlconfdata/disk-network-ssh-password.xml diff --git a/tests/qemuxml2argvdata/disk-network-ssh.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-ssh.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-ssh.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-ssh.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-ssh.xml b/tests/qemuxmlconfdata/disk-network-ssh.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-ssh.xml rename to tests/qemuxmlconfdata/disk-network-ssh.xml diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-6.2.0.err b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.x86_64-6.2.0.err similarity index 100% rename from tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-6.2.0.err rename to tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.x86_64-6.2.0.err diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.xml b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-tlsx509-nbd-hostname.xml rename to tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.xml diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-network-tlsx509-nbd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.xml b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-tlsx509-nbd.xml rename to tests/qemuxmlconfdata/disk-network-tlsx509-nbd.xml diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args b/tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args rename to tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.xml b/tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.xml rename to tests/qemuxmlconfdata/disk-network-tlsx509-vxhs.xml diff --git a/tests/qemuxml2argvdata/disk-network-vxhs.x86_64-5.0.0.args b/tests/qemuxmlconfdata/disk-network-vxhs.x86_64-5.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/disk-network-vxhs.x86_64-5.0.0.args rename to tests/qemuxmlconfdata/disk-network-vxhs.x86_64-5.0.0.args diff --git a/tests/qemuxml2argvdata/disk-network-vxhs.xml b/tests/qemuxmlconfdata/disk-network-vxhs.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-network-vxhs.xml rename to tests/qemuxmlconfdata/disk-network-vxhs.xml diff --git a/tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args b/tests/qemuxmlconfdata/disk-no-boot.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-no-boot.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-no-boot.xml b/tests/qemuxmlconfdata/disk-no-boot.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-no-boot.xml rename to tests/qemuxmlconfdata/disk-no-boot.xml diff --git a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args b/tests/qemuxmlconfdata/disk-nvme.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-nvme.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-nvme.xml b/tests/qemuxmlconfdata/disk-nvme.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-nvme.xml rename to tests/qemuxmlconfdata/disk-nvme.xml diff --git a/tests/qemuxml2argvdata/disk-order.x86_64-latest.args b/tests/qemuxmlconfdata/disk-order.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-order.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-order.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-order.xml b/tests/qemuxmlconfdata/disk-order.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-order.xml rename to tests/qemuxmlconfdata/disk-order.xml diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args b/tests/qemuxmlconfdata/disk-readonly-disk.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-readonly-disk.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.xml b/tests/qemuxmlconfdata/disk-readonly-disk.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-readonly-disk.xml rename to tests/qemuxmlconfdata/disk-readonly-disk.xml diff --git a/tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args b/tests/qemuxmlconfdata/disk-rotation.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-rotation.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-rotation.xml b/tests/qemuxmlconfdata/disk-rotation.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-rotation.xml rename to tests/qemuxmlconfdata/disk-rotation.xml diff --git a/tests/qemuxml2argvdata/disk-same-targets.x86_64-latest.err b/tests/qemuxmlconfdata/disk-same-targets.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-same-targets.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-same-targets.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-same-targets.xml b/tests/qemuxmlconfdata/disk-same-targets.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-same-targets.xml rename to tests/qemuxmlconfdata/disk-same-targets.xml diff --git a/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args b/tests/qemuxmlconfdata/disk-sata-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-sata-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-sata-device.xml b/tests/qemuxmlconfdata/disk-sata-device.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-sata-device.xml rename to tests/qemuxmlconfdata/disk-sata-device.xml diff --git a/tests/qemuxml2argvdata/disk-sata-incompatible-address.x86_64-latest.err b/tests/qemuxmlconfdata/disk-sata-incompatible-address.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-sata-incompatible-address.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-sata-incompatible-address.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-sata-incompatible-address.xml b/tests/qemuxmlconfdata/disk-sata-incompatible-address.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-sata-incompatible-address.xml rename to tests/qemuxmlconfdata/disk-sata-incompatible-address.xml diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args b/tests/qemuxmlconfdata/disk-scsi-device-auto.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-scsi-device-auto.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.xml b/tests/qemuxmlconfdata/disk-scsi-device-auto.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-device-auto.xml rename to tests/qemuxmlconfdata/disk-scsi-device-auto.xml diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args b/tests/qemuxmlconfdata/disk-scsi-disk-split.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-scsi-disk-split.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.xml b/tests/qemuxmlconfdata/disk-scsi-disk-split.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-disk-split.xml rename to tests/qemuxmlconfdata/disk-scsi-disk-split.xml diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err b/tests/qemuxmlconfdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-scsi-disk-vpd-build-error.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.xml b/tests/qemuxmlconfdata/disk-scsi-disk-vpd-build-error.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-disk-vpd-build-error.xml rename to tests/qemuxmlconfdata/disk-scsi-disk-vpd-build-error.xml diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.xml b/tests/qemuxmlconfdata/disk-scsi-disk-vpd.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-disk-vpd.xml rename to tests/qemuxmlconfdata/disk-scsi-disk-vpd.xml diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args b/tests/qemuxmlconfdata/disk-scsi-disk-wwn.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-scsi-disk-wwn.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.xml b/tests/qemuxmlconfdata/disk-scsi-disk-wwn.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-disk-wwn.xml rename to tests/qemuxmlconfdata/disk-scsi-disk-wwn.xml diff --git a/tests/qemuxml2argvdata/disk-scsi-incompatible-address.x86_64-latest.err b/tests/qemuxmlconfdata/disk-scsi-incompatible-address.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-incompatible-address.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-scsi-incompatible-address.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-scsi-incompatible-address.xml b/tests/qemuxmlconfdata/disk-scsi-incompatible-address.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-incompatible-address.xml rename to tests/qemuxmlconfdata/disk-scsi-incompatible-address.xml diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/disk-scsi-lun-passthrough.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-scsi-lun-passthrough.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.xml b/tests/qemuxmlconfdata/disk-scsi-lun-passthrough.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi-lun-passthrough.xml rename to tests/qemuxmlconfdata/disk-scsi-lun-passthrough.xml diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qemuxmlconfdata/disk-scsi.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-scsi.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-scsi.xml b/tests/qemuxmlconfdata/disk-scsi.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-scsi.xml rename to tests/qemuxmlconfdata/disk-scsi.xml diff --git a/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args b/tests/qemuxmlconfdata/disk-serial.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-serial.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-serial.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-serial.xml b/tests/qemuxmlconfdata/disk-serial.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-serial.xml rename to tests/qemuxmlconfdata/disk-serial.xml diff --git a/tests/qemuxml2argvdata/disk-shared-qcow.x86_64-latest.err b/tests/qemuxmlconfdata/disk-shared-qcow.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-shared-qcow.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-shared-qcow.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-shared-qcow.xml b/tests/qemuxmlconfdata/disk-shared-qcow.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-shared-qcow.xml rename to tests/qemuxmlconfdata/disk-shared-qcow.xml diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args b/tests/qemuxmlconfdata/disk-shared.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-shared.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-shared.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-shared.xml b/tests/qemuxmlconfdata/disk-shared.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-shared.xml rename to tests/qemuxmlconfdata/disk-shared.xml diff --git a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args b/tests/qemuxmlconfdata/disk-slices.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-slices.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-slices.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-slices.xml b/tests/qemuxmlconfdata/disk-slices.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-slices.xml rename to tests/qemuxmlconfdata/disk-slices.xml diff --git a/tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args b/tests/qemuxmlconfdata/disk-snapshot.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-snapshot.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-snapshot.xml b/tests/qemuxmlconfdata/disk-snapshot.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-snapshot.xml rename to tests/qemuxmlconfdata/disk-snapshot.xml diff --git a/tests/qemuxml2argvdata/disk-source-fd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-source-fd.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-source-fd.xml b/tests/qemuxmlconfdata/disk-source-fd.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-source-fd.xml rename to tests/qemuxmlconfdata/disk-source-fd.xml diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args b/tests/qemuxmlconfdata/disk-source-pool-mode.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-source-pool-mode.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.xml b/tests/qemuxmlconfdata/disk-source-pool-mode.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-source-pool-mode.xml rename to tests/qemuxmlconfdata/disk-source-pool-mode.xml diff --git a/tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args b/tests/qemuxmlconfdata/disk-source-pool.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-source-pool.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-source-pool.xml b/tests/qemuxmlconfdata/disk-source-pool.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-source-pool.xml rename to tests/qemuxmlconfdata/disk-source-pool.xml diff --git a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args b/tests/qemuxmlconfdata/disk-transient.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-transient.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-transient.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-transient.xml b/tests/qemuxmlconfdata/disk-transient.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-transient.xml rename to tests/qemuxmlconfdata/disk-transient.xml diff --git a/tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-usb-device.xml b/tests/qemuxmlconfdata/disk-usb-device.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-usb-device.xml rename to tests/qemuxmlconfdata/disk-usb-device.xml diff --git a/tests/qemuxml2argvdata/disk-usb-pci.x86_64-latest.err b/tests/qemuxmlconfdata/disk-usb-pci.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/disk-usb-pci.x86_64-latest.err rename to tests/qemuxmlconfdata/disk-usb-pci.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/disk-usb-pci.xml b/tests/qemuxmlconfdata/disk-usb-pci.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-usb-pci.xml rename to tests/qemuxmlconfdata/disk-usb-pci.xml diff --git a/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-4.2.0.args b/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-4.2.0.args rename to tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-4.2.0.args diff --git a/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-latest.args b/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-vhostuser-numa.xml b/tests/qemuxmlconfdata/disk-vhostuser-numa.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-vhostuser-numa.xml rename to tests/qemuxmlconfdata/disk-vhostuser-numa.xml diff --git a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args b/tests/qemuxmlconfdata/disk-vhostuser.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-vhostuser.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-vhostuser.xml b/tests/qemuxmlconfdata/disk-vhostuser.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-vhostuser.xml rename to tests/qemuxmlconfdata/disk-vhostuser.xml diff --git a/tests/qemuxml2argvdata/disk-vhostvdpa.x86_64-latest.args b/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-vhostvdpa.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-vhostvdpa.xml b/tests/qemuxmlconfdata/disk-vhostvdpa.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-vhostvdpa.xml rename to tests/qemuxmlconfdata/disk-vhostvdpa.xml diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args b/tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args rename to tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.args diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw-many.xml b/tests/qemuxmlconfdata/disk-virtio-ccw-many.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-virtio-ccw-many.xml rename to tests/qemuxmlconfdata/disk-virtio-ccw-many.xml diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args b/tests/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args rename to tests/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.args diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw.xml b/tests/qemuxmlconfdata/disk-virtio-ccw.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-virtio-ccw.xml rename to tests/qemuxmlconfdata/disk-virtio-ccw.xml diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args b/tests/qemuxmlconfdata/disk-virtio-queues.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-virtio-queues.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.xml b/tests/qemuxmlconfdata/disk-virtio-queues.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-virtio-queues.xml rename to tests/qemuxmlconfdata/disk-virtio-queues.xml diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args b/tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args rename to tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.args diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml b/tests/qemuxmlconfdata/disk-virtio-s390-zpci.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml rename to tests/qemuxmlconfdata/disk-virtio-s390-zpci.xml diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-5.2.0.args b/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args b/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml b/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml rename to tests/qemuxmlconfdata/disk-virtio-scsi-reservations.xml diff --git a/tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args b/tests/qemuxmlconfdata/disk-virtio.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args rename to tests/qemuxmlconfdata/disk-virtio.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/disk-virtio.xml b/tests/qemuxmlconfdata/disk-virtio.xml similarity index 100% rename from tests/qemuxml2argvdata/disk-virtio.xml rename to tests/qemuxmlconfdata/disk-virtio.xml diff --git a/tests/qemuxml2argvdata/downscript.x86_64-latest.args b/tests/qemuxmlconfdata/downscript.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/downscript.x86_64-latest.args rename to tests/qemuxmlconfdata/downscript.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/downscript.xml b/tests/qemuxmlconfdata/downscript.xml similarity index 100% rename from tests/qemuxml2argvdata/downscript.xml rename to tests/qemuxmlconfdata/downscript.xml diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args b/tests/qemuxmlconfdata/encrypted-disk-usage.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args rename to tests/qemuxmlconfdata/encrypted-disk-usage.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.xml b/tests/qemuxmlconfdata/encrypted-disk-usage.xml similarity index 100% rename from tests/qemuxml2argvdata/encrypted-disk-usage.xml rename to tests/qemuxmlconfdata/encrypted-disk-usage.xml diff --git a/tests/qemuxml2argvdata/encrypted-disk.x86_64-latest.args b/tests/qemuxmlconfdata/encrypted-disk.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/encrypted-disk.x86_64-latest.args rename to tests/qemuxmlconfdata/encrypted-disk.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/encrypted-disk.xml b/tests/qemuxmlconfdata/encrypted-disk.xml similarity index 100% rename from tests/qemuxml2argvdata/encrypted-disk.xml rename to tests/qemuxmlconfdata/encrypted-disk.xml diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args b/tests/qemuxmlconfdata/eoi-disabled.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args rename to tests/qemuxmlconfdata/eoi-disabled.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/eoi-disabled.xml b/tests/qemuxmlconfdata/eoi-disabled.xml similarity index 100% rename from tests/qemuxml2argvdata/eoi-disabled.xml rename to tests/qemuxmlconfdata/eoi-disabled.xml diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args b/tests/qemuxmlconfdata/eoi-enabled.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args rename to tests/qemuxmlconfdata/eoi-enabled.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/eoi-enabled.xml b/tests/qemuxmlconfdata/eoi-enabled.xml similarity index 100% rename from tests/qemuxml2argvdata/eoi-enabled.xml rename to tests/qemuxmlconfdata/eoi-enabled.xml diff --git a/tests/qemuxml2argvdata/event_idx.x86_64-latest.args b/tests/qemuxmlconfdata/event_idx.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/event_idx.x86_64-latest.args rename to tests/qemuxmlconfdata/event_idx.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/event_idx.xml b/tests/qemuxmlconfdata/event_idx.xml similarity index 100% rename from tests/qemuxml2argvdata/event_idx.xml rename to tests/qemuxmlconfdata/event_idx.xml diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args b/tests/qemuxmlconfdata/fd-memory-no-numa-topology.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args rename to tests/qemuxmlconfdata/fd-memory-no-numa-topology.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml b/tests/qemuxmlconfdata/fd-memory-no-numa-topology.xml similarity index 100% rename from tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml rename to tests/qemuxmlconfdata/fd-memory-no-numa-topology.xml diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args b/tests/qemuxmlconfdata/fd-memory-numa-topology.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args rename to tests/qemuxmlconfdata/fd-memory-numa-topology.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml b/tests/qemuxmlconfdata/fd-memory-numa-topology.xml similarity index 100% rename from tests/qemuxml2argvdata/fd-memory-numa-topology.xml rename to tests/qemuxmlconfdata/fd-memory-numa-topology.xml diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args b/tests/qemuxmlconfdata/fd-memory-numa-topology2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args rename to tests/qemuxmlconfdata/fd-memory-numa-topology2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml b/tests/qemuxmlconfdata/fd-memory-numa-topology2.xml similarity index 100% rename from tests/qemuxml2argvdata/fd-memory-numa-topology2.xml rename to tests/qemuxmlconfdata/fd-memory-numa-topology2.xml diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args b/tests/qemuxmlconfdata/fd-memory-numa-topology3.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args rename to tests/qemuxmlconfdata/fd-memory-numa-topology3.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml b/tests/qemuxmlconfdata/fd-memory-numa-topology3.xml similarity index 100% rename from tests/qemuxml2argvdata/fd-memory-numa-topology3.xml rename to tests/qemuxmlconfdata/fd-memory-numa-topology3.xml diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology4.x86_64-latest.args b/tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/fd-memory-numa-topology4.x86_64-latest.args rename to tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology4.xml b/tests/qemuxmlconfdata/fd-memory-numa-topology4.xml similarity index 100% rename from tests/qemuxml2argvdata/fd-memory-numa-topology4.xml rename to tests/qemuxmlconfdata/fd-memory-numa-topology4.xml diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args b/tests/qemuxmlconfdata/fips-enabled.x86_64-5.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args rename to tests/qemuxmlconfdata/fips-enabled.x86_64-5.1.0.args diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args b/tests/qemuxmlconfdata/fips-enabled.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args rename to tests/qemuxmlconfdata/fips-enabled.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/fips-enabled.xml b/tests/qemuxmlconfdata/fips-enabled.xml similarity index 100% rename from tests/qemuxml2argvdata/fips-enabled.xml rename to tests/qemuxmlconfdata/fips-enabled.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-auto-bios-not-stateless.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.x86_64-latest.err rename to tests/qemuxmlconfdata/firmware-auto-bios-not-stateless.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml b/tests/qemuxmlconfdata/firmware-auto-bios-not-stateless.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml rename to tests/qemuxmlconfdata/firmware-auto-bios-not-stateless.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-nvram.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-auto-bios-nvram.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-bios-nvram.x86_64-latest.err rename to tests/qemuxmlconfdata/firmware-auto-bios-nvram.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-nvram.xml b/tests/qemuxmlconfdata/firmware-auto-bios-nvram.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-bios-nvram.xml rename to tests/qemuxmlconfdata/firmware-auto-bios-nvram.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml rename to tests/qemuxmlconfdata/firmware-auto-bios-stateless.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-bios.xml b/tests/qemuxmlconfdata/firmware-auto-bios.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-bios.xml rename to tests/qemuxmlconfdata/firmware-auto-bios.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.xml b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-aarch64.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-aarch64.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-abi-update-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-abi-update-aarch64.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-abi-update-aarch64.aarch64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-abi-update-aarch64.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-abi-update-aarch64.xml b/tests/qemuxmlconfdata/firmware-auto-efi-abi-update-aarch64.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-abi-update-aarch64.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-abi-update-aarch64.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-abi-update.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-abi-update.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-abi-update.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-abi-update.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-abi-update.xml b/tests/qemuxmlconfdata/firmware-auto-efi-abi-update.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-abi-update.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-abi-update.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys-no-secboot.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-no-secboot.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys-no-secboot.x86_64-latest.err rename to tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-no-secboot.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys-no-secboot.xml b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-no-secboot.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys-no-secboot.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-no-secboot.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.xml b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-qcow2-nvram-path.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-format-loader-qcow2-nvram-path.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-qcow2.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-format-loader-qcow2.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-raw-abi-update.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw-abi-update.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-format-loader-raw-abi-update.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw-abi-update.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-loader-raw.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-format-loader-raw.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-mismatch.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-format-mismatch.x86_64-latest.err rename to tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-mismatch.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-format-mismatch.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2-path.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2-path.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2.xml b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-format-nvram-qcow2.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstandard.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstandard.x86_64-latest.err rename to tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstandard.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstandard.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-loader-path-nonstandard.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-loader-path.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-loader-path.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure-abi-update.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure-abi-update.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-loader-secure-abi-update.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-loader-secure-abi-update.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure-abi-update.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure-abi-update.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-loader-secure-abi-update.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-loader-secure-abi-update.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.xml b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.xml b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.xml b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-file.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-nvram-file.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-file.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-nvram-file.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-iscsi.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-iscsi.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-iscsi.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-iscsi.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-nbd.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-nbd.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-nbd.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-nvram-network-nbd.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-path.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-nvram-path.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-path.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-nvram-path.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-template-nonstandard.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstandard.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-nvram-template-nonstandard.x86_64-latest.err rename to tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstandard.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-template-nonstandard.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstandard.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-nvram-template-nonstandard.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-nvram-template-nonstandard.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-template.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-nvram-template.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram-template.xml b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-nvram-template.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-rw-abi-update.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-auto-efi-rw-abi-update.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-rw-abi-update.x86_64-latest.err rename to tests/qemuxmlconfdata/firmware-auto-efi-rw-abi-update.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-rw-abi-update.xml b/tests/qemuxmlconfdata/firmware-auto-efi-rw-abi-update.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-rw-abi-update.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-rw-abi-update.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-rw.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-rw.x86_64-latest.err rename to tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-rw.xml b/tests/qemuxmlconfdata/firmware-auto-efi-rw.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-rw.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-rw.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.xml b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-secboot.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-secboot.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-smm-off.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-smm-off.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-smm-off.xml b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-smm-off.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-smm-off.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml rename to tests/qemuxmlconfdata/firmware-auto-efi-stateless.xml diff --git a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-auto-efi.xml b/tests/qemuxmlconfdata/firmware-auto-efi.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-auto-efi.xml rename to tests/qemuxmlconfdata/firmware-auto-efi.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.x86_64-latest.err rename to tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml b/tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml rename to tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml rename to tests/qemuxmlconfdata/firmware-manual-bios-stateless.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-bios.xml b/tests/qemuxmlconfdata/firmware-manual-bios.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-bios.xml rename to tests/qemuxmlconfdata/firmware-manual-bios.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-aarch64-legacy-paths.xml b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-aarch64-legacy-paths.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.xml b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.xml b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-features.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-features.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-features.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-features.x86_64-latest.err rename to tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-features.xml b/tests/qemuxmlconfdata/firmware-manual-efi-features.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-features.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-features.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-loader-no-path.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-manual-efi-loader-no-path.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-loader-no-path.x86_64-latest.err rename to tests/qemuxmlconfdata/firmware-manual-efi-loader-no-path.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-loader-no-path.xml b/tests/qemuxmlconfdata/firmware-manual-efi-loader-no-path.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-loader-no-path.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-loader-no-path.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-loader-path-nonstandard.xml b/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-loader-path-nonstandard.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.xml b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-no-enrolled-keys.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot-legacy-paths.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-no-secboot-legacy-paths.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-no-secboot.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-secboot.xml b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-no-secboot.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.xml b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-q35.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.x86_64-latest.err rename to tests/qemuxmlconfdata/firmware-manual-efi-noacpi-q35.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.xml b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-q35.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-noacpi-q35.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-stateless.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.x86_64-latest.err rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-stateless.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-stateless.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-stateless.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-nonstandard.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-nonstandard.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.x86_64-latest.err b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-stateless.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.x86_64-latest.err rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-stateless.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-stateless.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-stateless.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.xml b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.xml b/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw-legacy-paths.xml b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-rw-legacy-paths.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw-modern-paths.xml b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-rw-modern-paths.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-rw.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-rw.xml b/tests/qemuxmlconfdata/firmware-manual-efi-rw.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-rw.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-rw.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secboot-legacy-paths.xml b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-secboot-legacy-paths.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secboot.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-secboot.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secboot.xml b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-secboot.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-secboot.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml b/tests/qemuxmlconfdata/firmware-manual-efi-stateless.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml rename to tests/qemuxmlconfdata/firmware-manual-efi-stateless.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-efi.xml b/tests/qemuxmlconfdata/firmware-manual-efi.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-efi.xml rename to tests/qemuxmlconfdata/firmware-manual-efi.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.aarch64-latest.err b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.aarch64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.aarch64-latest.err rename to tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.aarch64-latest.err diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.xml b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.xml rename to tests/qemuxmlconfdata/firmware-manual-noefi-acpi-aarch64.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.xml b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.xml rename to tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.xml b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.xml rename to tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.xml diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args rename to tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.xml b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.xml similarity index 100% rename from tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.xml rename to tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.xml diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args b/tests/qemuxmlconfdata/floppy-drive-fat.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args rename to tests/qemuxmlconfdata/floppy-drive-fat.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.xml b/tests/qemuxmlconfdata/floppy-drive-fat.xml similarity index 100% rename from tests/qemuxml2argvdata/floppy-drive-fat.xml rename to tests/qemuxmlconfdata/floppy-drive-fat.xml diff --git a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args b/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args rename to tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args diff --git a/tests/qemuxml2argvdata/fs9p-ccw.xml b/tests/qemuxmlconfdata/fs9p-ccw.xml similarity index 100% rename from tests/qemuxml2argvdata/fs9p-ccw.xml rename to tests/qemuxmlconfdata/fs9p-ccw.xml diff --git a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args b/tests/qemuxmlconfdata/fs9p.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/fs9p.x86_64-latest.args rename to tests/qemuxmlconfdata/fs9p.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/fs9p.xml b/tests/qemuxmlconfdata/fs9p.xml similarity index 100% rename from tests/qemuxml2argvdata/fs9p.xml rename to tests/qemuxmlconfdata/fs9p.xml diff --git a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args b/tests/qemuxmlconfdata/genid-auto.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/genid-auto.x86_64-latest.args rename to tests/qemuxmlconfdata/genid-auto.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/genid-auto.xml b/tests/qemuxmlconfdata/genid-auto.xml similarity index 100% rename from tests/qemuxml2argvdata/genid-auto.xml rename to tests/qemuxmlconfdata/genid-auto.xml diff --git a/tests/qemuxml2argvdata/genid.x86_64-latest.args b/tests/qemuxmlconfdata/genid.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/genid.x86_64-latest.args rename to tests/qemuxmlconfdata/genid.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/genid.xml b/tests/qemuxmlconfdata/genid.xml similarity index 100% rename from tests/qemuxml2argvdata/genid.xml rename to tests/qemuxmlconfdata/genid.xml diff --git a/tests/qemuxml2argvdata/graphics-dbus-address.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-dbus-address.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-dbus-address.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-dbus-address.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-dbus-address.xml b/tests/qemuxmlconfdata/graphics-dbus-address.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-dbus-address.xml rename to tests/qemuxmlconfdata/graphics-dbus-address.xml diff --git a/tests/qemuxml2argvdata/graphics-dbus-audio.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-dbus-audio.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-dbus-audio.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-dbus-audio.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-dbus-audio.xml b/tests/qemuxmlconfdata/graphics-dbus-audio.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-dbus-audio.xml rename to tests/qemuxmlconfdata/graphics-dbus-audio.xml diff --git a/tests/qemuxml2argvdata/graphics-dbus-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-dbus-chardev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-dbus-chardev.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-dbus-chardev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-dbus-chardev.xml b/tests/qemuxmlconfdata/graphics-dbus-chardev.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-dbus-chardev.xml rename to tests/qemuxmlconfdata/graphics-dbus-chardev.xml diff --git a/tests/qemuxml2argvdata/graphics-dbus-p2p.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-dbus-p2p.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-dbus-p2p.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-dbus-p2p.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-dbus-p2p.xml b/tests/qemuxmlconfdata/graphics-dbus-p2p.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-dbus-p2p.xml rename to tests/qemuxmlconfdata/graphics-dbus-p2p.xml diff --git a/tests/qemuxml2argvdata/graphics-dbus-usbredir.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-dbus-usbredir.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-dbus-usbredir.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-dbus-usbredir.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-dbus-usbredir.xml b/tests/qemuxmlconfdata/graphics-dbus-usbredir.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-dbus-usbredir.xml rename to tests/qemuxmlconfdata/graphics-dbus-usbredir.xml diff --git a/tests/qemuxml2argvdata/graphics-dbus.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-dbus.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-dbus.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-dbus.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-dbus.xml b/tests/qemuxmlconfdata/graphics-dbus.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-dbus.xml rename to tests/qemuxmlconfdata/graphics-dbus.xml diff --git a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-egl-headless-rendernode.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-egl-headless-rendernode.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.xml b/tests/qemuxmlconfdata/graphics-egl-headless-rendernode.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-egl-headless-rendernode.xml rename to tests/qemuxmlconfdata/graphics-egl-headless-rendernode.xml diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-egl-headless.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-egl-headless.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.xml b/tests/qemuxmlconfdata/graphics-egl-headless.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-egl-headless.xml rename to tests/qemuxmlconfdata/graphics-egl-headless.xml diff --git a/tests/qemuxml2argvdata/graphics-listen-network.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-listen-network.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-listen-network.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-listen-network.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-listen-network.xml b/tests/qemuxmlconfdata/graphics-listen-network.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-listen-network.xml rename to tests/qemuxmlconfdata/graphics-listen-network.xml diff --git a/tests/qemuxml2argvdata/graphics-sdl-egl-headless.x86_64-latest.err b/tests/qemuxmlconfdata/graphics-sdl-egl-headless.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/graphics-sdl-egl-headless.x86_64-latest.err rename to tests/qemuxmlconfdata/graphics-sdl-egl-headless.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml b/tests/qemuxmlconfdata/graphics-sdl-egl-headless.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml rename to tests/qemuxmlconfdata/graphics-sdl-egl-headless.xml diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-sdl-fullscreen.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-sdl-fullscreen.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-sdl-fullscreen.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml b/tests/qemuxmlconfdata/graphics-sdl-fullscreen.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-sdl-fullscreen.xml rename to tests/qemuxmlconfdata/graphics-sdl-fullscreen.xml diff --git a/tests/qemuxml2argvdata/graphics-sdl.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-sdl.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-sdl.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-sdl.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-sdl.xml b/tests/qemuxmlconfdata/graphics-sdl.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-sdl.xml rename to tests/qemuxmlconfdata/graphics-sdl.xml diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-agent-file-xfer.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-spice-agent-file-xfer.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml b/tests/qemuxmlconfdata/graphics-spice-agent-file-xfer.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.xml rename to tests/qemuxmlconfdata/graphics-spice-agent-file-xfer.xml diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-agentmouse.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-spice-agentmouse.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.xml b/tests/qemuxmlconfdata/graphics-spice-agentmouse.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-agentmouse.xml rename to tests/qemuxmlconfdata/graphics-spice-agentmouse.xml diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-auto-socket-cfg.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-spice-auto-socket-cfg.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.xml b/tests/qemuxmlconfdata/graphics-spice-auto-socket-cfg.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.xml rename to tests/qemuxmlconfdata/graphics-spice-auto-socket-cfg.xml diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-auto-socket.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-spice-auto-socket.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.xml b/tests/qemuxmlconfdata/graphics-spice-auto-socket.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-auto-socket.xml rename to tests/qemuxmlconfdata/graphics-spice-auto-socket.xml diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-compression.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-spice-compression.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.xml b/tests/qemuxmlconfdata/graphics-spice-compression.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-compression.xml rename to tests/qemuxmlconfdata/graphics-spice-compression.xml diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-egl-headless.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-spice-egl-headless.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.xml b/tests/qemuxmlconfdata/graphics-spice-egl-headless.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-egl-headless.xml rename to tests/qemuxmlconfdata/graphics-spice-egl-headless.xml diff --git a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.xml b/tests/qemuxmlconfdata/graphics-spice-gl-auto-rendernode.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.xml rename to tests/qemuxmlconfdata/graphics-spice-gl-auto-rendernode.xml diff --git a/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.x86_64-latest.err b/tests/qemuxmlconfdata/graphics-spice-invalid-egl-headless.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.x86_64-latest.err rename to tests/qemuxmlconfdata/graphics-spice-invalid-egl-headless.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml b/tests/qemuxmlconfdata/graphics-spice-invalid-egl-headless.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml rename to tests/qemuxmlconfdata/graphics-spice-invalid-egl-headless.xml diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-no-args.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-spice-no-args.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.xml b/tests/qemuxmlconfdata/graphics-spice-no-args.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-no-args.xml rename to tests/qemuxmlconfdata/graphics-spice-no-args.xml diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-qxl-vga.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-spice-qxl-vga.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml b/tests/qemuxmlconfdata/graphics-spice-qxl-vga.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-qxl-vga.xml rename to tests/qemuxmlconfdata/graphics-spice-qxl-vga.xml diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.xml b/tests/qemuxmlconfdata/graphics-spice-sasl.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-sasl.xml rename to tests/qemuxmlconfdata/graphics-spice-sasl.xml diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-socket.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-spice-socket.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.xml b/tests/qemuxmlconfdata/graphics-spice-socket.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-socket.xml rename to tests/qemuxmlconfdata/graphics-spice-socket.xml diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.xml b/tests/qemuxmlconfdata/graphics-spice-timeout.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-timeout.xml rename to tests/qemuxmlconfdata/graphics-spice-timeout.xml diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-usb-redir.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-spice-usb-redir.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.xml b/tests/qemuxmlconfdata/graphics-spice-usb-redir.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice-usb-redir.xml rename to tests/qemuxmlconfdata/graphics-spice-usb-redir.xml diff --git a/tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-spice.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-spice.xml b/tests/qemuxmlconfdata/graphics-spice.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-spice.xml rename to tests/qemuxmlconfdata/graphics-spice.xml diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.xml b/tests/qemuxmlconfdata/graphics-vnc-auto-socket-cfg.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.xml rename to tests/qemuxmlconfdata/graphics-vnc-auto-socket-cfg.xml diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-auto-socket.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-vnc-auto-socket.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.xml b/tests/qemuxmlconfdata/graphics-vnc-auto-socket.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-auto-socket.xml rename to tests/qemuxmlconfdata/graphics-vnc-auto-socket.xml diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-egl-headless.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-vnc-egl-headless.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml b/tests/qemuxmlconfdata/graphics-vnc-egl-headless.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml rename to tests/qemuxmlconfdata/graphics-vnc-egl-headless.xml diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-no-listen-attr.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-vnc-no-listen-attr.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.xml b/tests/qemuxmlconfdata/graphics-vnc-no-listen-attr.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.xml rename to tests/qemuxmlconfdata/graphics-vnc-no-listen-attr.xml diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-none.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-vnc-none.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.xml b/tests/qemuxmlconfdata/graphics-vnc-none.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-none.xml rename to tests/qemuxmlconfdata/graphics-vnc-none.xml diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-policy.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-vnc-policy.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.xml b/tests/qemuxmlconfdata/graphics-vnc-policy.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-policy.xml rename to tests/qemuxmlconfdata/graphics-vnc-policy.xml diff --git a/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-power.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-vnc-power.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-vnc-power.xml b/tests/qemuxmlconfdata/graphics-vnc-power.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-power.xml rename to tests/qemuxmlconfdata/graphics-vnc-power.xml diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-remove-generated-socket.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-vnc-remove-generated-socket.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.xml b/tests/qemuxmlconfdata/graphics-vnc-remove-generated-socket.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.xml rename to tests/qemuxmlconfdata/graphics-vnc-remove-generated-socket.xml diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.xml b/tests/qemuxmlconfdata/graphics-vnc-sasl.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-sasl.xml rename to tests/qemuxmlconfdata/graphics-vnc-sasl.xml diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-socket-new-cmdline.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-vnc-socket-new-cmdline.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.xml b/tests/qemuxmlconfdata/graphics-vnc-socket-new-cmdline.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.xml rename to tests/qemuxmlconfdata/graphics-vnc-socket-new-cmdline.xml diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-socket.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-vnc-socket.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.xml b/tests/qemuxmlconfdata/graphics-vnc-socket.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-socket.xml rename to tests/qemuxmlconfdata/graphics-vnc-socket.xml diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args b/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.xml b/tests/qemuxmlconfdata/graphics-vnc-tls-secret.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-tls-secret.xml rename to tests/qemuxmlconfdata/graphics-vnc-tls-secret.xml diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.xml b/tests/qemuxmlconfdata/graphics-vnc-tls.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-tls.xml rename to tests/qemuxmlconfdata/graphics-vnc-tls.xml diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-websocket.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-vnc-websocket.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.xml b/tests/qemuxmlconfdata/graphics-vnc-websocket.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc-websocket.xml rename to tests/qemuxmlconfdata/graphics-vnc-websocket.xml diff --git a/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args rename to tests/qemuxmlconfdata/graphics-vnc.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/graphics-vnc.xml b/tests/qemuxmlconfdata/graphics-vnc.xml similarity index 100% rename from tests/qemuxml2argvdata/graphics-vnc.xml rename to tests/qemuxmlconfdata/graphics-vnc.xml diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.x86_64-latest.err b/tests/qemuxmlconfdata/hostdev-mdev-display-missing-graphics.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.x86_64-latest.err rename to tests/qemuxmlconfdata/hostdev-mdev-display-missing-graphics.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml b/tests/qemuxmlconfdata/hostdev-mdev-display-missing-graphics.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml rename to tests/qemuxmlconfdata/hostdev-mdev-display-missing-graphics.xml diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb-multiple.x86_64-latest.err b/tests/qemuxmlconfdata/hostdev-mdev-display-ramfb-multiple.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-display-ramfb-multiple.x86_64-latest.err rename to tests/qemuxmlconfdata/hostdev-mdev-display-ramfb-multiple.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb-multiple.xml b/tests/qemuxmlconfdata/hostdev-mdev-display-ramfb-multiple.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-display-ramfb-multiple.xml rename to tests/qemuxmlconfdata/hostdev-mdev-display-ramfb-multiple.xml diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-mdev-display-ramfb.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-mdev-display-ramfb.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.xml b/tests/qemuxmlconfdata/hostdev-mdev-display-ramfb.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.xml rename to tests/qemuxmlconfdata/hostdev-mdev-display-ramfb.xml diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml b/tests/qemuxmlconfdata/hostdev-mdev-display-spice-egl-headless.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml rename to tests/qemuxmlconfdata/hostdev-mdev-display-spice-egl-headless.xml diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml b/tests/qemuxmlconfdata/hostdev-mdev-display-spice-opengl.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml rename to tests/qemuxmlconfdata/hostdev-mdev-display-spice-opengl.xml diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml b/tests/qemuxmlconfdata/hostdev-mdev-display-vnc-egl-headless.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml rename to tests/qemuxmlconfdata/hostdev-mdev-display-vnc-egl-headless.xml diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-mdev-display-vnc.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-mdev-display-vnc.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml b/tests/qemuxmlconfdata/hostdev-mdev-display-vnc.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml rename to tests/qemuxmlconfdata/hostdev-mdev-display-vnc.xml diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-mdev-display.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-display.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-mdev-display.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display.xml b/tests/qemuxmlconfdata/hostdev-mdev-display.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-display.xml rename to tests/qemuxmlconfdata/hostdev-mdev-display.xml diff --git a/tests/qemuxml2argvdata/hostdev-mdev-duplicate.x86_64-latest.err b/tests/qemuxmlconfdata/hostdev-mdev-duplicate.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-duplicate.x86_64-latest.err rename to tests/qemuxmlconfdata/hostdev-mdev-duplicate.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml b/tests/qemuxmlconfdata/hostdev-mdev-duplicate.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml rename to tests/qemuxmlconfdata/hostdev-mdev-duplicate.xml diff --git a/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.x86_64-latest.err b/tests/qemuxmlconfdata/hostdev-mdev-invalid-target-address.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.x86_64-latest.err rename to tests/qemuxmlconfdata/hostdev-mdev-invalid-target-address.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml b/tests/qemuxmlconfdata/hostdev-mdev-invalid-target-address.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-invalid-target-address.xml rename to tests/qemuxmlconfdata/hostdev-mdev-invalid-target-address.xml diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-mdev-precreated.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-precreated.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-mdev-precreated.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.xml b/tests/qemuxmlconfdata/hostdev-mdev-precreated.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-precreated.xml rename to tests/qemuxmlconfdata/hostdev-mdev-precreated.xml diff --git a/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/hostdev-mdev-src-address-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.x86_64-latest.err rename to tests/qemuxmlconfdata/hostdev-mdev-src-address-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml b/tests/qemuxmlconfdata/hostdev-mdev-src-address-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-mdev-src-address-invalid.xml rename to tests/qemuxmlconfdata/hostdev-mdev-src-address-invalid.xml diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-pci-address-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-pci-address-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.xml b/tests/qemuxmlconfdata/hostdev-pci-address-device.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-pci-address-device.xml rename to tests/qemuxmlconfdata/hostdev-pci-address-device.xml diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-pci-address-unassigned.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-pci-address-unassigned.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-pci-address-unassigned.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.xml b/tests/qemuxmlconfdata/hostdev-pci-address-unassigned.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-pci-address-unassigned.xml rename to tests/qemuxmlconfdata/hostdev-pci-address-unassigned.xml diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-pci-address.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-pci-address.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.xml b/tests/qemuxmlconfdata/hostdev-pci-address.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-pci-address.xml rename to tests/qemuxmlconfdata/hostdev-pci-address.xml diff --git a/tests/qemuxml2argvdata/hostdev-pci-duplicate.x86_64-latest.err b/tests/qemuxmlconfdata/hostdev-pci-duplicate.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-pci-duplicate.x86_64-latest.err rename to tests/qemuxmlconfdata/hostdev-pci-duplicate.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-pci-duplicate.xml b/tests/qemuxmlconfdata/hostdev-pci-duplicate.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-pci-duplicate.xml rename to tests/qemuxmlconfdata/hostdev-pci-duplicate.xml diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-pci-multifunction.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-pci-multifunction.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-pci-multifunction.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.xml b/tests/qemuxmlconfdata/hostdev-pci-multifunction.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-pci-multifunction.xml rename to tests/qemuxmlconfdata/hostdev-pci-multifunction.xml diff --git a/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-autogen-address.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-autogen-address.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-scsi-autogen-address.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml b/tests/qemuxmlconfdata/hostdev-scsi-autogen-address.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-autogen-address.xml rename to tests/qemuxmlconfdata/hostdev-scsi-autogen-address.xml diff --git a/tests/qemuxml2argvdata/hostdev-scsi-duplicate.x86_64-latest.err b/tests/qemuxmlconfdata/hostdev-scsi-duplicate.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-duplicate.x86_64-latest.err rename to tests/qemuxmlconfdata/hostdev-scsi-duplicate.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml b/tests/qemuxmlconfdata/hostdev-scsi-duplicate.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml rename to tests/qemuxmlconfdata/hostdev-scsi-duplicate.xml diff --git a/tests/qemuxml2argvdata/hostdev-scsi-large-unit.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-large-unit.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-large-unit.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-scsi-large-unit.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml b/tests/qemuxmlconfdata/hostdev-scsi-large-unit.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-large-unit.xml rename to tests/qemuxmlconfdata/hostdev-scsi-large-unit.xml diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-lsi.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-scsi-lsi.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.xml b/tests/qemuxmlconfdata/hostdev-scsi-lsi.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-lsi.xml rename to tests/qemuxmlconfdata/hostdev-scsi-lsi.xml diff --git a/tests/qemuxml2argvdata/hostdev-scsi-shareable.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-shareable.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-shareable.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-scsi-shareable.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-scsi-shareable.xml b/tests/qemuxmlconfdata/hostdev-scsi-shareable.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-shareable.xml rename to tests/qemuxmlconfdata/hostdev-scsi-shareable.xml diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args rename to tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.xml rename to tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.xml diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci-boot-fail.x86_64-latest.err b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pci-boot-fail.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci-boot-fail.x86_64-latest.err rename to tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pci-boot-fail.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci-boot-fail.xml b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pci-boot-fail.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci-boot-fail.xml rename to tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pci-boot-fail.xml diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pci.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.xml rename to tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pci.xml diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args rename to tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.xml b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.xml rename to tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.xml diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-virtio-scsi.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-scsi-virtio-scsi.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml b/tests/qemuxmlconfdata/hostdev-scsi-virtio-scsi.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml rename to tests/qemuxmlconfdata/hostdev-scsi-virtio-scsi.xml diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap-boot-fail.s390x-latest.err b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ap-boot-fail.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap-boot-fail.s390x-latest.err rename to tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ap-boot-fail.s390x-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap-boot-fail.xml b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ap-boot-fail.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap-boot-fail.xml rename to tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ap-boot-fail.xml diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args rename to tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.xml b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ap.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.xml rename to tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ap.xml diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args rename to tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.xml b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-boot.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.xml rename to tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-boot.xml diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-duplicate-address.s390x-latest.err b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-duplicate-address.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-duplicate-address.s390x-latest.err rename to tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-duplicate-address.s390x-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-duplicate-address.xml b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-duplicate-address.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-duplicate-address.xml rename to tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-duplicate-address.xml diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-invalid-address.s390x-latest.err b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-invalid-address.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-invalid-address.s390x-latest.err rename to tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-invalid-address.s390x-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-invalid-address.xml b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-invalid-address.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-invalid-address.xml rename to tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-invalid-address.xml diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args rename to tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.xml b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.xml rename to tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw.xml diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-usb-address-device-boot.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-usb-address-device-boot.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml b/tests/qemuxmlconfdata/hostdev-usb-address-device-boot.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml rename to tests/qemuxmlconfdata/hostdev-usb-address-device-boot.xml diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-usb-address-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-usb-address-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.xml b/tests/qemuxmlconfdata/hostdev-usb-address-device.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-usb-address-device.xml rename to tests/qemuxmlconfdata/hostdev-usb-address-device.xml diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-usb-address.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-usb-address.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.xml b/tests/qemuxmlconfdata/hostdev-usb-address.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-usb-address.xml rename to tests/qemuxmlconfdata/hostdev-usb-address.xml diff --git a/tests/qemuxml2argvdata/hostdev-usb-duplicate.x86_64-latest.err b/tests/qemuxmlconfdata/hostdev-usb-duplicate.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-usb-duplicate.x86_64-latest.err rename to tests/qemuxmlconfdata/hostdev-usb-duplicate.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-usb-duplicate.xml b/tests/qemuxmlconfdata/hostdev-usb-duplicate.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-usb-duplicate.xml rename to tests/qemuxmlconfdata/hostdev-usb-duplicate.xml diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-multidomain.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-multidomain.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-vfio-multidomain.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml b/tests/qemuxmlconfdata/hostdev-vfio-multidomain.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-multidomain.xml rename to tests/qemuxmlconfdata/hostdev-vfio-multidomain.xml diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.args rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-fids.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.xml rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-fids.xml diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.args rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-uids.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.xml rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-uids.xml diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.s390x-latest.args rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate.s390x-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate.xml diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-boundaries.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.s390x-latest.args rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-boundaries.s390x-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci-boundaries.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-boundaries.xml diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.xml rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.xml diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-duplicate.s390x-latest.err b/tests/qemuxmlconfdata/hostdev-vfio-zpci-duplicate.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-duplicate.s390x-latest.err rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-duplicate.s390x-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-duplicate.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci-duplicate.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-duplicate.xml rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-duplicate.xml diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-invalid-uid-valid-fid.s390x-latest.err b/tests/qemuxmlconfdata/hostdev-vfio-zpci-invalid-uid-valid-fid.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-invalid-uid-valid-fid.s390x-latest.err rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-invalid-uid-valid-fid.s390x-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-invalid-uid-valid-fid.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci-invalid-uid-valid-fid.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-invalid-uid-valid-fid.xml rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-invalid-uid-valid-fid.xml diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.args rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci-multidomain-many.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-multidomain-many.xml diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-set-zero.s390x-latest.err b/tests/qemuxmlconfdata/hostdev-vfio-zpci-set-zero.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-set-zero.s390x-latest.err rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-set-zero.s390x-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-set-zero.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci-set-zero.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-set-zero.xml rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-set-zero.xml diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.s390x-latest.err b/tests/qemuxmlconfdata/hostdev-vfio-zpci-uid-set-zero.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.s390x-latest.err rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-uid-set-zero.s390x-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci-uid-set-zero.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.xml rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-uid-set-zero.xml diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.x86_64-latest.err b/tests/qemuxmlconfdata/hostdev-vfio-zpci-wrong-arch.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.x86_64-latest.err rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-wrong-arch.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci-wrong-arch.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-wrong-arch.xml rename to tests/qemuxmlconfdata/hostdev-vfio-zpci-wrong-arch.xml diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci.s390x-latest.args rename to tests/qemuxmlconfdata/hostdev-vfio-zpci.s390x-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.xml b/tests/qemuxmlconfdata/hostdev-vfio-zpci.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci.xml rename to tests/qemuxmlconfdata/hostdev-vfio-zpci.xml diff --git a/tests/qemuxml2argvdata/hostdev-vfio.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-vfio.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio.x86_64-latest.args rename to tests/qemuxmlconfdata/hostdev-vfio.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hostdev-vfio.xml b/tests/qemuxmlconfdata/hostdev-vfio.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio.xml rename to tests/qemuxmlconfdata/hostdev-vfio.xml diff --git a/tests/qemuxml2argvdata/hostdevs-drive-address-conflict.x86_64-latest.err b/tests/qemuxmlconfdata/hostdevs-drive-address-conflict.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdevs-drive-address-conflict.x86_64-latest.err rename to tests/qemuxmlconfdata/hostdevs-drive-address-conflict.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hostdevs-drive-address-conflict.xml b/tests/qemuxmlconfdata/hostdevs-drive-address-conflict.xml similarity index 100% rename from tests/qemuxml2argvdata/hostdevs-drive-address-conflict.xml rename to tests/qemuxmlconfdata/hostdevs-drive-address-conflict.xml diff --git a/tests/qemuxml2argvdata/hotplug-base.x86_64-latest.args b/tests/qemuxmlconfdata/hotplug-base.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hotplug-base.x86_64-latest.args rename to tests/qemuxmlconfdata/hotplug-base.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hotplug-base.xml b/tests/qemuxmlconfdata/hotplug-base.xml similarity index 100% rename from tests/qemuxml2argvdata/hotplug-base.xml rename to tests/qemuxmlconfdata/hotplug-base.xml diff --git a/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.x86_64-latest.err b/tests/qemuxmlconfdata/hugepages-default-1G-nodeset-2M.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.x86_64-latest.err rename to tests/qemuxmlconfdata/hugepages-default-1G-nodeset-2M.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml b/tests/qemuxmlconfdata/hugepages-default-1G-nodeset-2M.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml rename to tests/qemuxmlconfdata/hugepages-default-1G-nodeset-2M.xml diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-default-2M.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hugepages-default-2M.x86_64-latest.args rename to tests/qemuxmlconfdata/hugepages-default-2M.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.xml b/tests/qemuxmlconfdata/hugepages-default-2M.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-default-2M.xml rename to tests/qemuxmlconfdata/hugepages-default-2M.xml diff --git a/tests/qemuxml2argvdata/hugepages-default-5M.x86_64-latest.err b/tests/qemuxmlconfdata/hugepages-default-5M.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hugepages-default-5M.x86_64-latest.err rename to tests/qemuxmlconfdata/hugepages-default-5M.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hugepages-default-5M.xml b/tests/qemuxmlconfdata/hugepages-default-5M.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-default-5M.xml rename to tests/qemuxmlconfdata/hugepages-default-5M.xml diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-default-system-size.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hugepages-default-system-size.x86_64-latest.args rename to tests/qemuxmlconfdata/hugepages-default-system-size.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.xml b/tests/qemuxmlconfdata/hugepages-default-system-size.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-default-system-size.xml rename to tests/qemuxmlconfdata/hugepages-default-system-size.xml diff --git a/tests/qemuxml2argvdata/hugepages-default.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-default.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hugepages-default.x86_64-latest.args rename to tests/qemuxmlconfdata/hugepages-default.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hugepages-default.xml b/tests/qemuxmlconfdata/hugepages-default.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-default.xml rename to tests/qemuxmlconfdata/hugepages-default.xml diff --git a/tests/qemuxml2argvdata/hugepages-memaccess-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/hugepages-memaccess-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hugepages-memaccess-invalid.x86_64-latest.err rename to tests/qemuxmlconfdata/hugepages-memaccess-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml b/tests/qemuxmlconfdata/hugepages-memaccess-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-memaccess-invalid.xml rename to tests/qemuxmlconfdata/hugepages-memaccess-invalid.xml diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-memaccess.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hugepages-memaccess.x86_64-latest.args rename to tests/qemuxmlconfdata/hugepages-memaccess.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.xml b/tests/qemuxmlconfdata/hugepages-memaccess.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-memaccess.xml rename to tests/qemuxmlconfdata/hugepages-memaccess.xml diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-memaccess2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hugepages-memaccess2.x86_64-latest.args rename to tests/qemuxmlconfdata/hugepages-memaccess2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.xml b/tests/qemuxmlconfdata/hugepages-memaccess2.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-memaccess2.xml rename to tests/qemuxmlconfdata/hugepages-memaccess2.xml diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-5.1.0.err b/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-5.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-5.1.0.err rename to tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-5.1.0.err diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args rename to tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.xml b/tests/qemuxmlconfdata/hugepages-memaccess3.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-memaccess3.xml rename to tests/qemuxmlconfdata/hugepages-memaccess3.xml diff --git a/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.x86_64-latest.err b/tests/qemuxmlconfdata/hugepages-nodeset-nonexist.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hugepages-nodeset-nonexist.x86_64-latest.err rename to tests/qemuxmlconfdata/hugepages-nodeset-nonexist.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml b/tests/qemuxmlconfdata/hugepages-nodeset-nonexist.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-nodeset-nonexist.xml rename to tests/qemuxmlconfdata/hugepages-nodeset-nonexist.xml diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-nodeset.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hugepages-nodeset.x86_64-latest.args rename to tests/qemuxmlconfdata/hugepages-nodeset.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.xml b/tests/qemuxmlconfdata/hugepages-nodeset.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-nodeset.xml rename to tests/qemuxmlconfdata/hugepages-nodeset.xml diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-numa-default-2M.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hugepages-numa-default-2M.x86_64-latest.args rename to tests/qemuxmlconfdata/hugepages-numa-default-2M.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.xml b/tests/qemuxmlconfdata/hugepages-numa-default-2M.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-numa-default-2M.xml rename to tests/qemuxmlconfdata/hugepages-numa-default-2M.xml diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-numa-default-dimm.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hugepages-numa-default-dimm.x86_64-latest.args rename to tests/qemuxmlconfdata/hugepages-numa-default-dimm.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml b/tests/qemuxmlconfdata/hugepages-numa-default-dimm.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml rename to tests/qemuxmlconfdata/hugepages-numa-default-dimm.xml diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-numa-default.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hugepages-numa-default.x86_64-latest.args rename to tests/qemuxmlconfdata/hugepages-numa-default.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.xml b/tests/qemuxmlconfdata/hugepages-numa-default.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-numa-default.xml rename to tests/qemuxmlconfdata/hugepages-numa-default.xml diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.x86_64-latest.err b/tests/qemuxmlconfdata/hugepages-numa-nodeset-nonexist.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.x86_64-latest.err rename to tests/qemuxmlconfdata/hugepages-numa-nodeset-nonexist.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml b/tests/qemuxmlconfdata/hugepages-numa-nodeset-nonexist.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-numa-nodeset-nonexist.xml rename to tests/qemuxmlconfdata/hugepages-numa-nodeset-nonexist.xml diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-numa-nodeset-part.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hugepages-numa-nodeset-part.x86_64-latest.args rename to tests/qemuxmlconfdata/hugepages-numa-nodeset-part.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml b/tests/qemuxmlconfdata/hugepages-numa-nodeset-part.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml rename to tests/qemuxmlconfdata/hugepages-numa-nodeset-part.xml diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-numa-nodeset.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hugepages-numa-nodeset.x86_64-latest.args rename to tests/qemuxmlconfdata/hugepages-numa-nodeset.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.xml b/tests/qemuxmlconfdata/hugepages-numa-nodeset.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-numa-nodeset.xml rename to tests/qemuxmlconfdata/hugepages-numa-nodeset.xml diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-nvdimm.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args rename to tests/qemuxmlconfdata/hugepages-nvdimm.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.xml b/tests/qemuxmlconfdata/hugepages-nvdimm.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-nvdimm.xml rename to tests/qemuxmlconfdata/hugepages-nvdimm.xml diff --git a/tests/qemuxml2argvdata/hugepages-shared.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-shared.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hugepages-shared.x86_64-latest.args rename to tests/qemuxmlconfdata/hugepages-shared.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hugepages-shared.xml b/tests/qemuxmlconfdata/hugepages-shared.xml similarity index 100% rename from tests/qemuxml2argvdata/hugepages-shared.xml rename to tests/qemuxmlconfdata/hugepages-shared.xml diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.aarch64-latest.args b/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hvf-aarch64-virt-headless.aarch64-latest.args rename to tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml b/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.xml similarity index 100% rename from tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml rename to tests/qemuxmlconfdata/hvf-aarch64-virt-headless.xml diff --git a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.x86_64-latest.args b/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hvf-x86_64-q35-headless.x86_64-latest.args rename to tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.x86_64-latest.err b/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hvf-x86_64-q35-headless.x86_64-latest.err rename to tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.xml b/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.xml similarity index 100% rename from tests/qemuxml2argvdata/hvf-x86_64-q35-headless.xml rename to tests/qemuxmlconfdata/hvf-x86_64-q35-headless.xml diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv-off.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args rename to tests/qemuxmlconfdata/hyperv-off.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hyperv-off.xml b/tests/qemuxmlconfdata/hyperv-off.xml similarity index 100% rename from tests/qemuxml2argvdata/hyperv-off.xml rename to tests/qemuxmlconfdata/hyperv-off.xml diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv-panic.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args rename to tests/qemuxmlconfdata/hyperv-panic.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hyperv-panic.xml b/tests/qemuxmlconfdata/hyperv-panic.xml similarity index 100% rename from tests/qemuxml2argvdata/hyperv-panic.xml rename to tests/qemuxmlconfdata/hyperv-panic.xml diff --git a/tests/qemuxml2argvdata/hyperv-passthrough.x86_64-6.1.0.args b/tests/qemuxmlconfdata/hyperv-passthrough.x86_64-6.1.0.args similarity index 100% rename from tests/qemuxml2argvdata/hyperv-passthrough.x86_64-6.1.0.args rename to tests/qemuxmlconfdata/hyperv-passthrough.x86_64-6.1.0.args diff --git a/tests/qemuxml2argvdata/hyperv-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv-passthrough.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hyperv-passthrough.x86_64-latest.args rename to tests/qemuxmlconfdata/hyperv-passthrough.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hyperv-passthrough.xml b/tests/qemuxmlconfdata/hyperv-passthrough.xml similarity index 100% rename from tests/qemuxml2argvdata/hyperv-passthrough.xml rename to tests/qemuxmlconfdata/hyperv-passthrough.xml diff --git a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv-stimer-direct.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args rename to tests/qemuxmlconfdata/hyperv-stimer-direct.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hyperv-stimer-direct.xml b/tests/qemuxmlconfdata/hyperv-stimer-direct.xml similarity index 100% rename from tests/qemuxml2argvdata/hyperv-stimer-direct.xml rename to tests/qemuxmlconfdata/hyperv-stimer-direct.xml diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/hyperv.x86_64-latest.args rename to tests/qemuxmlconfdata/hyperv.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/hyperv.xml b/tests/qemuxmlconfdata/hyperv.xml similarity index 100% rename from tests/qemuxml2argvdata/hyperv.xml rename to tests/qemuxmlconfdata/hyperv.xml diff --git a/tests/qemuxml2argvdata/input-linux.x86_64-latest.args b/tests/qemuxmlconfdata/input-linux.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/input-linux.x86_64-latest.args rename to tests/qemuxmlconfdata/input-linux.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/input-linux.xml b/tests/qemuxmlconfdata/input-linux.xml similarity index 100% rename from tests/qemuxml2argvdata/input-linux.xml rename to tests/qemuxmlconfdata/input-linux.xml diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.x86_64-latest.args b/tests/qemuxmlconfdata/input-usbmouse-addr.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/input-usbmouse-addr.x86_64-latest.args rename to tests/qemuxmlconfdata/input-usbmouse-addr.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.xml b/tests/qemuxmlconfdata/input-usbmouse-addr.xml similarity index 100% rename from tests/qemuxml2argvdata/input-usbmouse-addr.xml rename to tests/qemuxmlconfdata/input-usbmouse-addr.xml diff --git a/tests/qemuxml2argvdata/input-usbmouse.x86_64-latest.args b/tests/qemuxmlconfdata/input-usbmouse.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/input-usbmouse.x86_64-latest.args rename to tests/qemuxmlconfdata/input-usbmouse.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/input-usbmouse.xml b/tests/qemuxmlconfdata/input-usbmouse.xml similarity index 100% rename from tests/qemuxml2argvdata/input-usbmouse.xml rename to tests/qemuxmlconfdata/input-usbmouse.xml diff --git a/tests/qemuxml2argvdata/input-usbtablet.x86_64-latest.args b/tests/qemuxmlconfdata/input-usbtablet.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/input-usbtablet.x86_64-latest.args rename to tests/qemuxmlconfdata/input-usbtablet.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/input-usbtablet.xml b/tests/qemuxmlconfdata/input-usbtablet.xml similarity index 100% rename from tests/qemuxml2argvdata/input-usbtablet.xml rename to tests/qemuxmlconfdata/input-usbtablet.xml diff --git a/tests/qemuxml2argvdata/input-virtio-ccw.s390x-latest.args b/tests/qemuxmlconfdata/input-virtio-ccw.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/input-virtio-ccw.s390x-latest.args rename to tests/qemuxmlconfdata/input-virtio-ccw.s390x-latest.args diff --git a/tests/qemuxml2argvdata/input-virtio-ccw.xml b/tests/qemuxmlconfdata/input-virtio-ccw.xml similarity index 100% rename from tests/qemuxml2argvdata/input-virtio-ccw.xml rename to tests/qemuxmlconfdata/input-virtio-ccw.xml diff --git a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args b/tests/qemuxmlconfdata/intel-iommu-aw-bits.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args rename to tests/qemuxmlconfdata/intel-iommu-aw-bits.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/intel-iommu-aw-bits.xml b/tests/qemuxmlconfdata/intel-iommu-aw-bits.xml similarity index 100% rename from tests/qemuxml2argvdata/intel-iommu-aw-bits.xml rename to tests/qemuxmlconfdata/intel-iommu-aw-bits.xml diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args b/tests/qemuxmlconfdata/intel-iommu-caching-mode.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args rename to tests/qemuxmlconfdata/intel-iommu-caching-mode.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.xml b/tests/qemuxmlconfdata/intel-iommu-caching-mode.xml similarity index 100% rename from tests/qemuxml2argvdata/intel-iommu-caching-mode.xml rename to tests/qemuxmlconfdata/intel-iommu-caching-mode.xml diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args b/tests/qemuxmlconfdata/intel-iommu-device-iotlb.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args rename to tests/qemuxmlconfdata/intel-iommu-device-iotlb.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.xml b/tests/qemuxmlconfdata/intel-iommu-device-iotlb.xml similarity index 100% rename from tests/qemuxml2argvdata/intel-iommu-device-iotlb.xml rename to tests/qemuxmlconfdata/intel-iommu-device-iotlb.xml diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args b/tests/qemuxmlconfdata/intel-iommu-eim.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args rename to tests/qemuxmlconfdata/intel-iommu-eim.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.xml b/tests/qemuxmlconfdata/intel-iommu-eim.xml similarity index 100% rename from tests/qemuxml2argvdata/intel-iommu-eim.xml rename to tests/qemuxmlconfdata/intel-iommu-eim.xml diff --git a/tests/qemuxml2argvdata/intel-iommu-wrong-machine.x86_64-latest.err b/tests/qemuxmlconfdata/intel-iommu-wrong-machine.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/intel-iommu-wrong-machine.x86_64-latest.err rename to tests/qemuxmlconfdata/intel-iommu-wrong-machine.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/intel-iommu-wrong-machine.xml b/tests/qemuxmlconfdata/intel-iommu-wrong-machine.xml similarity index 100% rename from tests/qemuxml2argvdata/intel-iommu-wrong-machine.xml rename to tests/qemuxmlconfdata/intel-iommu-wrong-machine.xml diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/intel-iommu.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args rename to tests/qemuxmlconfdata/intel-iommu.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/intel-iommu.xml b/tests/qemuxmlconfdata/intel-iommu.xml similarity index 100% rename from tests/qemuxml2argvdata/intel-iommu.xml rename to tests/qemuxmlconfdata/intel-iommu.xml diff --git a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args b/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args rename to tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/iommu-smmuv3.xml b/tests/qemuxmlconfdata/iommu-smmuv3.xml similarity index 100% rename from tests/qemuxml2argvdata/iommu-smmuv3.xml rename to tests/qemuxmlconfdata/iommu-smmuv3.xml diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.s390x-4.2.0.args b/tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.s390x-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.s390x-4.2.0.args rename to tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.s390x-4.2.0.args diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.xml b/tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.xml similarity index 100% rename from tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.xml rename to tests/qemuxmlconfdata/iothreads-disk-virtio-ccw.xml diff --git a/tests/qemuxml2argvdata/iothreads-disk.x86_64-latest.args b/tests/qemuxmlconfdata/iothreads-disk.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/iothreads-disk.x86_64-latest.args rename to tests/qemuxmlconfdata/iothreads-disk.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/iothreads-disk.xml b/tests/qemuxmlconfdata/iothreads-disk.xml similarity index 100% rename from tests/qemuxml2argvdata/iothreads-disk.xml rename to tests/qemuxmlconfdata/iothreads-disk.xml diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.x86_64-latest.args b/tests/qemuxmlconfdata/iothreads-ids-partial.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/iothreads-ids-partial.x86_64-latest.args rename to tests/qemuxmlconfdata/iothreads-ids-partial.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.xml b/tests/qemuxmlconfdata/iothreads-ids-partial.xml similarity index 100% rename from tests/qemuxml2argvdata/iothreads-ids-partial.xml rename to tests/qemuxmlconfdata/iothreads-ids-partial.xml diff --git a/tests/qemuxml2argvdata/iothreads-ids-pool-sizes.x86_64-latest.args b/tests/qemuxmlconfdata/iothreads-ids-pool-sizes.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/iothreads-ids-pool-sizes.x86_64-latest.args rename to tests/qemuxmlconfdata/iothreads-ids-pool-sizes.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/iothreads-ids-pool-sizes.xml b/tests/qemuxmlconfdata/iothreads-ids-pool-sizes.xml similarity index 100% rename from tests/qemuxml2argvdata/iothreads-ids-pool-sizes.xml rename to tests/qemuxmlconfdata/iothreads-ids-pool-sizes.xml diff --git a/tests/qemuxml2argvdata/iothreads-ids.x86_64-latest.args b/tests/qemuxmlconfdata/iothreads-ids.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/iothreads-ids.x86_64-latest.args rename to tests/qemuxmlconfdata/iothreads-ids.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/iothreads-ids.xml b/tests/qemuxmlconfdata/iothreads-ids.xml similarity index 100% rename from tests/qemuxml2argvdata/iothreads-ids.xml rename to tests/qemuxmlconfdata/iothreads-ids.xml diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args b/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args rename to tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.args diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.xml b/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.xml similarity index 100% rename from tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.xml rename to tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.xml diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.args b/tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args b/tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args rename to tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.xml b/tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.xml similarity index 100% rename from tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.xml rename to tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.xml diff --git a/tests/qemuxml2argvdata/kvm-features-off.x86_64-latest.args b/tests/qemuxmlconfdata/kvm-features-off.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/kvm-features-off.x86_64-latest.args rename to tests/qemuxmlconfdata/kvm-features-off.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/kvm-features-off.xml b/tests/qemuxmlconfdata/kvm-features-off.xml similarity index 100% rename from tests/qemuxml2argvdata/kvm-features-off.xml rename to tests/qemuxmlconfdata/kvm-features-off.xml diff --git a/tests/qemuxml2argvdata/kvm-features.x86_64-latest.args b/tests/qemuxmlconfdata/kvm-features.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/kvm-features.x86_64-latest.args rename to tests/qemuxmlconfdata/kvm-features.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/kvm-features.xml b/tests/qemuxmlconfdata/kvm-features.xml similarity index 100% rename from tests/qemuxml2argvdata/kvm-features.xml rename to tests/qemuxmlconfdata/kvm-features.xml diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.x86_64-latest.args b/tests/qemuxmlconfdata/kvm-pit-delay.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/kvm-pit-delay.x86_64-latest.args rename to tests/qemuxmlconfdata/kvm-pit-delay.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.xml b/tests/qemuxmlconfdata/kvm-pit-delay.xml similarity index 100% rename from tests/qemuxml2argvdata/kvm-pit-delay.xml rename to tests/qemuxmlconfdata/kvm-pit-delay.xml diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.x86_64-latest.args b/tests/qemuxmlconfdata/kvm-pit-discard.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/kvm-pit-discard.x86_64-latest.args rename to tests/qemuxmlconfdata/kvm-pit-discard.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.xml b/tests/qemuxmlconfdata/kvm-pit-discard.xml similarity index 100% rename from tests/qemuxml2argvdata/kvm-pit-discard.xml rename to tests/qemuxmlconfdata/kvm-pit-discard.xml diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args b/tests/qemuxmlconfdata/kvmclock+eoi-disabled.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args rename to tests/qemuxmlconfdata/kvmclock+eoi-disabled.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.xml b/tests/qemuxmlconfdata/kvmclock+eoi-disabled.xml similarity index 100% rename from tests/qemuxml2argvdata/kvmclock+eoi-disabled.xml rename to tests/qemuxmlconfdata/kvmclock+eoi-disabled.xml diff --git a/tests/qemuxml2argvdata/kvmclock.x86_64-latest.args b/tests/qemuxmlconfdata/kvmclock.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/kvmclock.x86_64-latest.args rename to tests/qemuxmlconfdata/kvmclock.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/kvmclock.xml b/tests/qemuxmlconfdata/kvmclock.xml similarity index 100% rename from tests/qemuxml2argvdata/kvmclock.xml rename to tests/qemuxmlconfdata/kvmclock.xml diff --git a/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args b/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args rename to tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args diff --git a/tests/qemuxml2argvdata/launch-security-s390-pv.xml b/tests/qemuxmlconfdata/launch-security-s390-pv.xml similarity index 100% rename from tests/qemuxml2argvdata/launch-security-s390-pv.xml rename to tests/qemuxmlconfdata/launch-security-s390-pv.xml diff --git a/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-latest.args b/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-latest.args rename to tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/launch-security-sev-direct.xml b/tests/qemuxmlconfdata/launch-security-sev-direct.xml similarity index 100% rename from tests/qemuxml2argvdata/launch-security-sev-direct.xml rename to tests/qemuxmlconfdata/launch-security-sev-direct.xml diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args b/tests/qemuxmlconfdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args rename to tests/qemuxmlconfdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.xml b/tests/qemuxmlconfdata/launch-security-sev-missing-platform-info.xml similarity index 100% rename from tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.xml rename to tests/qemuxmlconfdata/launch-security-sev-missing-platform-info.xml diff --git a/tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args b/tests/qemuxmlconfdata/launch-security-sev.x86_64-6.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args rename to tests/qemuxmlconfdata/launch-security-sev.x86_64-6.0.0.args diff --git a/tests/qemuxml2argvdata/launch-security-sev.xml b/tests/qemuxmlconfdata/launch-security-sev.xml similarity index 100% rename from tests/qemuxml2argvdata/launch-security-sev.xml rename to tests/qemuxmlconfdata/launch-security-sev.xml diff --git a/tests/qemuxml2argvdata/lease.x86_64-latest.args b/tests/qemuxmlconfdata/lease.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/lease.x86_64-latest.args rename to tests/qemuxmlconfdata/lease.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/lease.xml b/tests/qemuxmlconfdata/lease.xml similarity index 100% rename from tests/qemuxml2argvdata/lease.xml rename to tests/qemuxmlconfdata/lease.xml diff --git a/tests/qemuxml2argvdata/luks-disk-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/luks-disk-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/luks-disk-invalid.x86_64-latest.err rename to tests/qemuxmlconfdata/luks-disk-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/luks-disk-invalid.xml b/tests/qemuxmlconfdata/luks-disk-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/luks-disk-invalid.xml rename to tests/qemuxmlconfdata/luks-disk-invalid.xml diff --git a/tests/qemuxml2argvdata/luks-disks-source-both.x86_64-latest.err b/tests/qemuxmlconfdata/luks-disks-source-both.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/luks-disks-source-both.x86_64-latest.err rename to tests/qemuxmlconfdata/luks-disks-source-both.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/luks-disks-source-both.xml b/tests/qemuxmlconfdata/luks-disks-source-both.xml similarity index 100% rename from tests/qemuxml2argvdata/luks-disks-source-both.xml rename to tests/qemuxmlconfdata/luks-disks-source-both.xml diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-5.2.0.args b/tests/qemuxmlconfdata/luks-disks-source-qcow2.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/luks-disks-source-qcow2.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args b/tests/qemuxmlconfdata/luks-disks-source-qcow2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args rename to tests/qemuxmlconfdata/luks-disks-source-qcow2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.xml b/tests/qemuxmlconfdata/luks-disks-source-qcow2.xml similarity index 100% rename from tests/qemuxml2argvdata/luks-disks-source-qcow2.xml rename to tests/qemuxmlconfdata/luks-disks-source-qcow2.xml diff --git a/tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args b/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args rename to tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/luks-disks-source.xml b/tests/qemuxmlconfdata/luks-disks-source.xml similarity index 100% rename from tests/qemuxml2argvdata/luks-disks-source.xml rename to tests/qemuxmlconfdata/luks-disks-source.xml diff --git a/tests/qemuxml2argvdata/luks-disks.x86_64-latest.args b/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/luks-disks.x86_64-latest.args rename to tests/qemuxmlconfdata/luks-disks.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/luks-disks.xml b/tests/qemuxmlconfdata/luks-disks.xml similarity index 100% rename from tests/qemuxml2argvdata/luks-disks.xml rename to tests/qemuxmlconfdata/luks-disks.xml diff --git a/tests/qemuxml2argvdata/mach-virt-console-native.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/mach-virt-console-native.aarch64-latest.args rename to tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/mach-virt-console-native.xml b/tests/qemuxmlconfdata/mach-virt-console-native.xml similarity index 100% rename from tests/qemuxml2argvdata/mach-virt-console-native.xml rename to tests/qemuxmlconfdata/mach-virt-console-native.xml diff --git a/tests/qemuxml2argvdata/mach-virt-console-virtio.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/mach-virt-console-virtio.aarch64-latest.args rename to tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/mach-virt-console-virtio.xml b/tests/qemuxmlconfdata/mach-virt-console-virtio.xml similarity index 100% rename from tests/qemuxml2argvdata/mach-virt-console-virtio.xml rename to tests/qemuxmlconfdata/mach-virt-console-virtio.xml diff --git a/tests/qemuxml2argvdata/mach-virt-serial+console-native.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/mach-virt-serial+console-native.aarch64-latest.args rename to tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/mach-virt-serial+console-native.xml b/tests/qemuxmlconfdata/mach-virt-serial+console-native.xml similarity index 100% rename from tests/qemuxml2argvdata/mach-virt-serial+console-native.xml rename to tests/qemuxmlconfdata/mach-virt-serial+console-native.xml diff --git a/tests/qemuxml2argvdata/mach-virt-serial-compat.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/mach-virt-serial-compat.aarch64-latest.args rename to tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/mach-virt-serial-compat.xml b/tests/qemuxmlconfdata/mach-virt-serial-compat.xml similarity index 100% rename from tests/qemuxml2argvdata/mach-virt-serial-compat.xml rename to tests/qemuxmlconfdata/mach-virt-serial-compat.xml diff --git a/tests/qemuxml2argvdata/mach-virt-serial-invalid-machine.x86_64-latest.err b/tests/qemuxmlconfdata/mach-virt-serial-invalid-machine.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/mach-virt-serial-invalid-machine.x86_64-latest.err rename to tests/qemuxmlconfdata/mach-virt-serial-invalid-machine.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/mach-virt-serial-invalid-machine.xml b/tests/qemuxmlconfdata/mach-virt-serial-invalid-machine.xml similarity index 100% rename from tests/qemuxml2argvdata/mach-virt-serial-invalid-machine.xml rename to tests/qemuxmlconfdata/mach-virt-serial-invalid-machine.xml diff --git a/tests/qemuxml2argvdata/mach-virt-serial-native.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/mach-virt-serial-native.aarch64-latest.args rename to tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/mach-virt-serial-native.xml b/tests/qemuxmlconfdata/mach-virt-serial-native.xml similarity index 100% rename from tests/qemuxml2argvdata/mach-virt-serial-native.xml rename to tests/qemuxmlconfdata/mach-virt-serial-native.xml diff --git a/tests/qemuxml2argvdata/mach-virt-serial-pci.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/mach-virt-serial-pci.aarch64-latest.args rename to tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/mach-virt-serial-pci.xml b/tests/qemuxmlconfdata/mach-virt-serial-pci.xml similarity index 100% rename from tests/qemuxml2argvdata/mach-virt-serial-pci.xml rename to tests/qemuxmlconfdata/mach-virt-serial-pci.xml diff --git a/tests/qemuxml2argvdata/mach-virt-serial-usb.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/mach-virt-serial-usb.aarch64-latest.args rename to tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/mach-virt-serial-usb.xml b/tests/qemuxmlconfdata/mach-virt-serial-usb.xml similarity index 100% rename from tests/qemuxml2argvdata/mach-virt-serial-usb.xml rename to tests/qemuxmlconfdata/mach-virt-serial-usb.xml diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.s390x-latest.args b/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.s390x-latest.args rename to tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.args diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.xml b/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.xml rename to tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.xml diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.s390x-latest.args b/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.s390x-latest.args rename to tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest.args diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.xml b/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.xml rename to tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.xml diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.s390x-latest.args b/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.s390x-latest.args rename to tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.args diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.xml b/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.xml rename to tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.xml diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.s390x-latest.args b/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.s390x-latest.args rename to tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.args diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.xml b/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.xml rename to tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.xml diff --git a/tests/qemuxml2argvdata/machine-aliases1.x86_64-latest.args b/tests/qemuxmlconfdata/machine-aliases1.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-aliases1.x86_64-latest.args rename to tests/qemuxmlconfdata/machine-aliases1.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/machine-aliases1.xml b/tests/qemuxmlconfdata/machine-aliases1.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-aliases1.xml rename to tests/qemuxmlconfdata/machine-aliases1.xml diff --git a/tests/qemuxml2argvdata/machine-aliases2.x86_64-latest.args b/tests/qemuxmlconfdata/machine-aliases2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-aliases2.x86_64-latest.args rename to tests/qemuxmlconfdata/machine-aliases2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/machine-aliases2.xml b/tests/qemuxmlconfdata/machine-aliases2.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-aliases2.xml rename to tests/qemuxmlconfdata/machine-aliases2.xml diff --git a/tests/qemuxml2argvdata/machine-core-off.x86_64-latest.args b/tests/qemuxmlconfdata/machine-core-off.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-core-off.x86_64-latest.args rename to tests/qemuxmlconfdata/machine-core-off.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/machine-core-off.xml b/tests/qemuxmlconfdata/machine-core-off.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-core-off.xml rename to tests/qemuxmlconfdata/machine-core-off.xml diff --git a/tests/qemuxml2argvdata/machine-core-on.x86_64-latest.args b/tests/qemuxmlconfdata/machine-core-on.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-core-on.x86_64-latest.args rename to tests/qemuxmlconfdata/machine-core-on.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/machine-core-on.xml b/tests/qemuxmlconfdata/machine-core-on.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-core-on.xml rename to tests/qemuxmlconfdata/machine-core-on.xml diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.s390x-latest.args b/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-deakeywrap-off-cap.s390x-latest.args rename to tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.args diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.xml b/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-deakeywrap-off-cap.xml rename to tests/qemuxmlconfdata/machine-deakeywrap-off-cap.xml diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.s390x-latest.args b/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-deakeywrap-off-caps.s390x-latest.args rename to tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest.args diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.xml b/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-deakeywrap-off-caps.xml rename to tests/qemuxmlconfdata/machine-deakeywrap-off-caps.xml diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.s390x-latest.args b/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-deakeywrap-on-cap.s390x-latest.args rename to tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.args diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.xml b/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-deakeywrap-on-cap.xml rename to tests/qemuxmlconfdata/machine-deakeywrap-on-cap.xml diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.s390x-latest.args b/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-deakeywrap-on-caps.s390x-latest.args rename to tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.args diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.xml b/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-deakeywrap-on-caps.xml rename to tests/qemuxmlconfdata/machine-deakeywrap-on-caps.xml diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.args b/tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.args rename to tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.args diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.xml b/tests/qemuxmlconfdata/machine-keywrap-none-caps.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-keywrap-none-caps.xml rename to tests/qemuxmlconfdata/machine-keywrap-none-caps.xml diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args b/tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args rename to tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.args diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.xml b/tests/qemuxmlconfdata/machine-keywrap-none.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-keywrap-none.xml rename to tests/qemuxmlconfdata/machine-keywrap-none.xml diff --git a/tests/qemuxml2argvdata/machine-loadparm-hostdev.s390x-latest.args b/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-loadparm-hostdev.s390x-latest.args rename to tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-latest.args diff --git a/tests/qemuxml2argvdata/machine-loadparm-hostdev.xml b/tests/qemuxmlconfdata/machine-loadparm-hostdev.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-loadparm-hostdev.xml rename to tests/qemuxmlconfdata/machine-loadparm-hostdev.xml diff --git a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.args b/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.args rename to tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.args diff --git a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.xml b/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.xml rename to tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.xml diff --git a/tests/qemuxml2argvdata/machine-loadparm-net-s390.s390x-latest.args b/tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-loadparm-net-s390.s390x-latest.args rename to tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-latest.args diff --git a/tests/qemuxml2argvdata/machine-loadparm-net-s390.xml b/tests/qemuxmlconfdata/machine-loadparm-net-s390.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-loadparm-net-s390.xml rename to tests/qemuxmlconfdata/machine-loadparm-net-s390.xml diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390-char-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/machine-loadparm-s390-char-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/machine-loadparm-s390-char-invalid.x86_64-latest.err rename to tests/qemuxmlconfdata/machine-loadparm-s390-char-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390-char-invalid.xml b/tests/qemuxmlconfdata/machine-loadparm-s390-char-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-loadparm-s390-char-invalid.xml rename to tests/qemuxmlconfdata/machine-loadparm-s390-char-invalid.xml diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/machine-loadparm-s390-len-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.x86_64-latest.err rename to tests/qemuxmlconfdata/machine-loadparm-s390-len-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.xml b/tests/qemuxmlconfdata/machine-loadparm-s390-len-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-loadparm-s390-len-invalid.xml rename to tests/qemuxmlconfdata/machine-loadparm-s390-len-invalid.xml diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390.s390x-latest.args b/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-loadparm-s390.s390x-latest.args rename to tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.args diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390.xml b/tests/qemuxmlconfdata/machine-loadparm-s390.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-loadparm-s390.xml rename to tests/qemuxmlconfdata/machine-loadparm-s390.xml diff --git a/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args b/tests/qemuxmlconfdata/machine-smm-off.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args rename to tests/qemuxmlconfdata/machine-smm-off.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/machine-smm-off.xml b/tests/qemuxmlconfdata/machine-smm-off.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-smm-off.xml rename to tests/qemuxmlconfdata/machine-smm-off.xml diff --git a/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args b/tests/qemuxmlconfdata/machine-smm-on.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args rename to tests/qemuxmlconfdata/machine-smm-on.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/machine-smm-on.xml b/tests/qemuxmlconfdata/machine-smm-on.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-smm-on.xml rename to tests/qemuxmlconfdata/machine-smm-on.xml diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.x86_64-latest.args b/tests/qemuxmlconfdata/machine-vmport-opt.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/machine-vmport-opt.x86_64-latest.args rename to tests/qemuxmlconfdata/machine-vmport-opt.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.xml b/tests/qemuxmlconfdata/machine-vmport-opt.xml similarity index 100% rename from tests/qemuxml2argvdata/machine-vmport-opt.xml rename to tests/qemuxmlconfdata/machine-vmport-opt.xml diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args rename to tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.xml similarity index 100% rename from tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml rename to tests/qemuxmlconfdata/memfd-memory-default-hugepage.xml diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args rename to tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.xml b/tests/qemuxmlconfdata/memfd-memory-numa.xml similarity index 100% rename from tests/qemuxml2argvdata/memfd-memory-numa.xml rename to tests/qemuxmlconfdata/memfd-memory-numa.xml diff --git a/tests/qemuxml2argvdata/memory-align-fail.x86_64-latest.err b/tests/qemuxmlconfdata/memory-align-fail.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/memory-align-fail.x86_64-latest.err rename to tests/qemuxmlconfdata/memory-align-fail.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/memory-align-fail.xml b/tests/qemuxmlconfdata/memory-align-fail.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-align-fail.xml rename to tests/qemuxmlconfdata/memory-align-fail.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-dimm-addr.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args rename to tests/qemuxmlconfdata/memory-hotplug-dimm-addr.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml b/tests/qemuxmlconfdata/memory-hotplug-dimm-addr.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml rename to tests/qemuxmlconfdata/memory-hotplug-dimm-addr.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-dimm.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args rename to tests/qemuxmlconfdata/memory-hotplug-dimm.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.xml b/tests/qemuxmlconfdata/memory-hotplug-dimm.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-dimm.xml rename to tests/qemuxmlconfdata/memory-hotplug-dimm.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.x86_64-latest.err b/tests/qemuxmlconfdata/memory-hotplug-invalid-targetnode.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.x86_64-latest.err rename to tests/qemuxmlconfdata/memory-hotplug-invalid-targetnode.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.xml b/tests/qemuxmlconfdata/memory-hotplug-invalid-targetnode.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.xml rename to tests/qemuxmlconfdata/memory-hotplug-invalid-targetnode.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-multiple.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args rename to tests/qemuxmlconfdata/memory-hotplug-multiple.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-multiple.xml b/tests/qemuxmlconfdata/memory-hotplug-multiple.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-multiple.xml rename to tests/qemuxmlconfdata/memory-hotplug-multiple.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-nonuma.x86_64-latest.err b/tests/qemuxmlconfdata/memory-hotplug-nonuma.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nonuma.x86_64-latest.err rename to tests/qemuxmlconfdata/memory-hotplug-nonuma.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/memory-hotplug-nonuma.xml b/tests/qemuxmlconfdata/memory-hotplug-nonuma.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nonuma.xml rename to tests/qemuxmlconfdata/memory-hotplug-nonuma.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-access.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-access.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-access.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-access.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64-abi-update.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.xml rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64-abi-update.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.xml rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml rename to tests/qemuxmlconfdata/memory-hotplug-nvdimm.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.args rename to tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.xml b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma-abi-update.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.xml rename to tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma-abi-update.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.ppc64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.ppc64-latest.args rename to tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.xml b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.xml rename to tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem-overlap-address.x86_64-latest.err b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-overlap-address.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-virtio-mem-overlap-address.x86_64-latest.err rename to tests/qemuxmlconfdata/memory-hotplug-virtio-mem-overlap-address.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem-overlap-address.xml b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-overlap-address.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-virtio-mem-overlap-address.xml rename to tests/qemuxmlconfdata/memory-hotplug-virtio-mem-overlap-address.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args rename to tests/qemuxmlconfdata/memory-hotplug-virtio-mem.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml rename to tests/qemuxmlconfdata/memory-hotplug-virtio-mem.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args b/tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args rename to tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml b/tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml rename to tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args rename to tests/qemuxmlconfdata/memory-hotplug.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memory-hotplug.xml b/tests/qemuxmlconfdata/memory-hotplug.xml similarity index 100% rename from tests/qemuxml2argvdata/memory-hotplug.xml rename to tests/qemuxmlconfdata/memory-hotplug.xml diff --git a/tests/qemuxml2argvdata/memorybacking-set.x86_64-latest.args b/tests/qemuxmlconfdata/memorybacking-set.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memorybacking-set.x86_64-latest.args rename to tests/qemuxmlconfdata/memorybacking-set.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memorybacking-set.xml b/tests/qemuxmlconfdata/memorybacking-set.xml similarity index 100% rename from tests/qemuxml2argvdata/memorybacking-set.xml rename to tests/qemuxmlconfdata/memorybacking-set.xml diff --git a/tests/qemuxml2argvdata/memorybacking-unset.x86_64-latest.args b/tests/qemuxmlconfdata/memorybacking-unset.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memorybacking-unset.x86_64-latest.args rename to tests/qemuxmlconfdata/memorybacking-unset.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memorybacking-unset.xml b/tests/qemuxmlconfdata/memorybacking-unset.xml similarity index 100% rename from tests/qemuxml2argvdata/memorybacking-unset.xml rename to tests/qemuxmlconfdata/memorybacking-unset.xml diff --git a/tests/qemuxml2argvdata/memtune-unlimited.x86_64-latest.args b/tests/qemuxmlconfdata/memtune-unlimited.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memtune-unlimited.x86_64-latest.args rename to tests/qemuxmlconfdata/memtune-unlimited.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memtune-unlimited.xml b/tests/qemuxmlconfdata/memtune-unlimited.xml similarity index 100% rename from tests/qemuxml2argvdata/memtune-unlimited.xml rename to tests/qemuxmlconfdata/memtune-unlimited.xml diff --git a/tests/qemuxml2argvdata/memtune.x86_64-latest.args b/tests/qemuxmlconfdata/memtune.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/memtune.x86_64-latest.args rename to tests/qemuxmlconfdata/memtune.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/memtune.xml b/tests/qemuxmlconfdata/memtune.xml similarity index 100% rename from tests/qemuxml2argvdata/memtune.xml rename to tests/qemuxmlconfdata/memtune.xml diff --git a/tests/qemuxml2argvdata/metadata-duplicate.x86_64-latest.args b/tests/qemuxmlconfdata/metadata-duplicate.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/metadata-duplicate.x86_64-latest.args rename to tests/qemuxmlconfdata/metadata-duplicate.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/metadata-duplicate.xml b/tests/qemuxmlconfdata/metadata-duplicate.xml similarity index 100% rename from tests/qemuxml2argvdata/metadata-duplicate.xml rename to tests/qemuxmlconfdata/metadata-duplicate.xml diff --git a/tests/qemuxml2argvdata/metadata.x86_64-latest.args b/tests/qemuxmlconfdata/metadata.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/metadata.x86_64-latest.args rename to tests/qemuxmlconfdata/metadata.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/metadata.xml b/tests/qemuxmlconfdata/metadata.xml similarity index 100% rename from tests/qemuxml2argvdata/metadata.xml rename to tests/qemuxmlconfdata/metadata.xml diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.x86_64-latest.args b/tests/qemuxmlconfdata/migrate-numa-unaligned.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/migrate-numa-unaligned.x86_64-latest.args rename to tests/qemuxmlconfdata/migrate-numa-unaligned.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.xml b/tests/qemuxmlconfdata/migrate-numa-unaligned.xml similarity index 100% rename from tests/qemuxml2argvdata/migrate-numa-unaligned.xml rename to tests/qemuxmlconfdata/migrate-numa-unaligned.xml diff --git a/tests/qemuxml2argvdata/migrate.x86_64-latest.args b/tests/qemuxmlconfdata/migrate.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/migrate.x86_64-latest.args rename to tests/qemuxmlconfdata/migrate.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/migrate.xml b/tests/qemuxmlconfdata/migrate.xml similarity index 100% rename from tests/qemuxml2argvdata/migrate.xml rename to tests/qemuxmlconfdata/migrate.xml diff --git a/tests/qemuxml2argvdata/minimal-no-memory.x86_64-latest.err b/tests/qemuxmlconfdata/minimal-no-memory.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/minimal-no-memory.x86_64-latest.err rename to tests/qemuxmlconfdata/minimal-no-memory.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/minimal-no-memory.xml b/tests/qemuxmlconfdata/minimal-no-memory.xml similarity index 100% rename from tests/qemuxml2argvdata/minimal-no-memory.xml rename to tests/qemuxmlconfdata/minimal-no-memory.xml diff --git a/tests/qemuxml2argvdata/minimal.x86_64-latest.args b/tests/qemuxmlconfdata/minimal.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/minimal.x86_64-latest.args rename to tests/qemuxmlconfdata/minimal.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/minimal.xml b/tests/qemuxmlconfdata/minimal.xml similarity index 100% rename from tests/qemuxml2argvdata/minimal.xml rename to tests/qemuxmlconfdata/minimal.xml diff --git a/tests/qemuxml2argvdata/misc-acpi.x86_64-latest.args b/tests/qemuxmlconfdata/misc-acpi.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/misc-acpi.x86_64-latest.args rename to tests/qemuxmlconfdata/misc-acpi.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/misc-acpi.xml b/tests/qemuxmlconfdata/misc-acpi.xml similarity index 100% rename from tests/qemuxml2argvdata/misc-acpi.xml rename to tests/qemuxmlconfdata/misc-acpi.xml diff --git a/tests/qemuxml2argvdata/misc-disable-s3.x86_64-latest.args b/tests/qemuxmlconfdata/misc-disable-s3.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/misc-disable-s3.x86_64-latest.args rename to tests/qemuxmlconfdata/misc-disable-s3.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/misc-disable-s3.xml b/tests/qemuxmlconfdata/misc-disable-s3.xml similarity index 100% rename from tests/qemuxml2argvdata/misc-disable-s3.xml rename to tests/qemuxmlconfdata/misc-disable-s3.xml diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.x86_64-latest.args b/tests/qemuxmlconfdata/misc-disable-suspends.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/misc-disable-suspends.x86_64-latest.args rename to tests/qemuxmlconfdata/misc-disable-suspends.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.xml b/tests/qemuxmlconfdata/misc-disable-suspends.xml similarity index 100% rename from tests/qemuxml2argvdata/misc-disable-suspends.xml rename to tests/qemuxmlconfdata/misc-disable-suspends.xml diff --git a/tests/qemuxml2argvdata/misc-enable-s4.x86_64-latest.args b/tests/qemuxmlconfdata/misc-enable-s4.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/misc-enable-s4.x86_64-latest.args rename to tests/qemuxmlconfdata/misc-enable-s4.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/misc-enable-s4.xml b/tests/qemuxmlconfdata/misc-enable-s4.xml similarity index 100% rename from tests/qemuxml2argvdata/misc-enable-s4.xml rename to tests/qemuxmlconfdata/misc-enable-s4.xml diff --git a/tests/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args b/tests/qemuxmlconfdata/misc-no-reboot.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/misc-no-reboot.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args b/tests/qemuxmlconfdata/misc-no-reboot.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args rename to tests/qemuxmlconfdata/misc-no-reboot.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/misc-no-reboot.xml b/tests/qemuxmlconfdata/misc-no-reboot.xml similarity index 100% rename from tests/qemuxml2argvdata/misc-no-reboot.xml rename to tests/qemuxmlconfdata/misc-no-reboot.xml diff --git a/tests/qemuxml2argvdata/misc-uuid.x86_64-latest.args b/tests/qemuxmlconfdata/misc-uuid.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/misc-uuid.x86_64-latest.args rename to tests/qemuxmlconfdata/misc-uuid.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/misc-uuid.xml b/tests/qemuxmlconfdata/misc-uuid.xml similarity index 100% rename from tests/qemuxml2argvdata/misc-uuid.xml rename to tests/qemuxmlconfdata/misc-uuid.xml diff --git a/tests/qemuxml2argvdata/missing-machine.x86_64-latest.err b/tests/qemuxmlconfdata/missing-machine.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/missing-machine.x86_64-latest.err rename to tests/qemuxmlconfdata/missing-machine.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/missing-machine.xml b/tests/qemuxmlconfdata/missing-machine.xml similarity index 100% rename from tests/qemuxml2argvdata/missing-machine.xml rename to tests/qemuxmlconfdata/missing-machine.xml diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args b/tests/qemuxmlconfdata/mlock-off.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/mlock-off.x86_64-latest.args rename to tests/qemuxmlconfdata/mlock-off.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/mlock-off.xml b/tests/qemuxmlconfdata/mlock-off.xml similarity index 100% rename from tests/qemuxml2argvdata/mlock-off.xml rename to tests/qemuxmlconfdata/mlock-off.xml diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args b/tests/qemuxmlconfdata/mlock-on.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/mlock-on.x86_64-latest.args rename to tests/qemuxmlconfdata/mlock-on.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/mlock-on.xml b/tests/qemuxmlconfdata/mlock-on.xml similarity index 100% rename from tests/qemuxml2argvdata/mlock-on.xml rename to tests/qemuxmlconfdata/mlock-on.xml diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.x86_64-latest.args b/tests/qemuxmlconfdata/multifunction-pci-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/multifunction-pci-device.x86_64-latest.args rename to tests/qemuxmlconfdata/multifunction-pci-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.xml b/tests/qemuxmlconfdata/multifunction-pci-device.xml similarity index 100% rename from tests/qemuxml2argvdata/multifunction-pci-device.xml rename to tests/qemuxmlconfdata/multifunction-pci-device.xml diff --git a/tests/qemuxml2argvdata/name-escape.x86_64-latest.args b/tests/qemuxmlconfdata/name-escape.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/name-escape.x86_64-latest.args rename to tests/qemuxmlconfdata/name-escape.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/name-escape.xml b/tests/qemuxmlconfdata/name-escape.xml similarity index 100% rename from tests/qemuxml2argvdata/name-escape.xml rename to tests/qemuxmlconfdata/name-escape.xml diff --git a/tests/qemuxml2argvdata/net-bandwidth.x86_64-latest.args b/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-bandwidth.x86_64-latest.args rename to tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-bandwidth.xml b/tests/qemuxmlconfdata/net-bandwidth.xml similarity index 100% rename from tests/qemuxml2argvdata/net-bandwidth.xml rename to tests/qemuxmlconfdata/net-bandwidth.xml diff --git a/tests/qemuxml2argvdata/net-bandwidth2.x86_64-latest.args b/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-bandwidth2.x86_64-latest.args rename to tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-bandwidth2.xml b/tests/qemuxmlconfdata/net-bandwidth2.xml similarity index 100% rename from tests/qemuxml2argvdata/net-bandwidth2.xml rename to tests/qemuxmlconfdata/net-bandwidth2.xml diff --git a/tests/qemuxml2argvdata/net-client.x86_64-latest.args b/tests/qemuxmlconfdata/net-client.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-client.x86_64-latest.args rename to tests/qemuxmlconfdata/net-client.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-client.xml b/tests/qemuxmlconfdata/net-client.xml similarity index 100% rename from tests/qemuxml2argvdata/net-client.xml rename to tests/qemuxmlconfdata/net-client.xml diff --git a/tests/qemuxml2argvdata/net-coalesce.x86_64-latest.args b/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-coalesce.x86_64-latest.args rename to tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-coalesce.xml b/tests/qemuxmlconfdata/net-coalesce.xml similarity index 100% rename from tests/qemuxml2argvdata/net-coalesce.xml rename to tests/qemuxmlconfdata/net-coalesce.xml diff --git a/tests/qemuxml2argvdata/net-eth-hostip.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-eth-hostip.x86_64-latest.args rename to tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-eth-hostip.xml b/tests/qemuxmlconfdata/net-eth-hostip.xml similarity index 100% rename from tests/qemuxml2argvdata/net-eth-hostip.xml rename to tests/qemuxmlconfdata/net-eth-hostip.xml diff --git a/tests/qemuxml2argvdata/net-eth-ifname.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-eth-ifname.x86_64-latest.args rename to tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-eth-ifname.xml b/tests/qemuxmlconfdata/net-eth-ifname.xml similarity index 100% rename from tests/qemuxml2argvdata/net-eth-ifname.xml rename to tests/qemuxmlconfdata/net-eth-ifname.xml diff --git a/tests/qemuxml2argvdata/net-eth-names.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-eth-names.x86_64-latest.args rename to tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-eth-names.xml b/tests/qemuxmlconfdata/net-eth-names.xml similarity index 100% rename from tests/qemuxml2argvdata/net-eth-names.xml rename to tests/qemuxmlconfdata/net-eth-names.xml diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-eth-unmanaged-tap.x86_64-latest.args rename to tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml b/tests/qemuxmlconfdata/net-eth-unmanaged-tap.xml similarity index 100% rename from tests/qemuxml2argvdata/net-eth-unmanaged-tap.xml rename to tests/qemuxmlconfdata/net-eth-unmanaged-tap.xml diff --git a/tests/qemuxml2argvdata/net-eth.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-eth.x86_64-latest.args rename to tests/qemuxmlconfdata/net-eth.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-eth.xml b/tests/qemuxmlconfdata/net-eth.xml similarity index 100% rename from tests/qemuxml2argvdata/net-eth.xml rename to tests/qemuxmlconfdata/net-eth.xml diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.x86_64-latest.args b/tests/qemuxmlconfdata/net-hostdev-bootorder.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-hostdev-bootorder.x86_64-latest.args rename to tests/qemuxmlconfdata/net-hostdev-bootorder.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.xml b/tests/qemuxmlconfdata/net-hostdev-bootorder.xml similarity index 100% rename from tests/qemuxml2argvdata/net-hostdev-bootorder.xml rename to tests/qemuxmlconfdata/net-hostdev-bootorder.xml diff --git a/tests/qemuxml2argvdata/net-hostdev-fail.x86_64-latest.err b/tests/qemuxmlconfdata/net-hostdev-fail.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/net-hostdev-fail.x86_64-latest.err rename to tests/qemuxmlconfdata/net-hostdev-fail.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/net-hostdev-fail.xml b/tests/qemuxmlconfdata/net-hostdev-fail.xml similarity index 100% rename from tests/qemuxml2argvdata/net-hostdev-fail.xml rename to tests/qemuxmlconfdata/net-hostdev-fail.xml diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.x86_64-latest.args b/tests/qemuxmlconfdata/net-hostdev-multidomain.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-hostdev-multidomain.x86_64-latest.args rename to tests/qemuxmlconfdata/net-hostdev-multidomain.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.xml b/tests/qemuxmlconfdata/net-hostdev-multidomain.xml similarity index 100% rename from tests/qemuxml2argvdata/net-hostdev-multidomain.xml rename to tests/qemuxmlconfdata/net-hostdev-multidomain.xml diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.x86_64-latest.args b/tests/qemuxmlconfdata/net-hostdev-vfio-multidomain.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.x86_64-latest.args rename to tests/qemuxmlconfdata/net-hostdev-vfio-multidomain.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml b/tests/qemuxmlconfdata/net-hostdev-vfio-multidomain.xml similarity index 100% rename from tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.xml rename to tests/qemuxmlconfdata/net-hostdev-vfio-multidomain.xml diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.x86_64-latest.args b/tests/qemuxmlconfdata/net-hostdev-vfio.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-hostdev-vfio.x86_64-latest.args rename to tests/qemuxmlconfdata/net-hostdev-vfio.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.xml b/tests/qemuxmlconfdata/net-hostdev-vfio.xml similarity index 100% rename from tests/qemuxml2argvdata/net-hostdev-vfio.xml rename to tests/qemuxmlconfdata/net-hostdev-vfio.xml diff --git a/tests/qemuxml2argvdata/net-hostdev.x86_64-latest.args b/tests/qemuxmlconfdata/net-hostdev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-hostdev.x86_64-latest.args rename to tests/qemuxmlconfdata/net-hostdev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-hostdev.xml b/tests/qemuxmlconfdata/net-hostdev.xml similarity index 100% rename from tests/qemuxml2argvdata/net-hostdev.xml rename to tests/qemuxmlconfdata/net-hostdev.xml diff --git a/tests/qemuxml2argvdata/net-isolated-port.x86_64-latest.args b/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-isolated-port.x86_64-latest.args rename to tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-isolated-port.xml b/tests/qemuxmlconfdata/net-isolated-port.xml similarity index 100% rename from tests/qemuxml2argvdata/net-isolated-port.xml rename to tests/qemuxmlconfdata/net-isolated-port.xml diff --git a/tests/qemuxml2argvdata/net-linkstate.x86_64-latest.args b/tests/qemuxmlconfdata/net-linkstate.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-linkstate.x86_64-latest.args rename to tests/qemuxmlconfdata/net-linkstate.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-linkstate.xml b/tests/qemuxmlconfdata/net-linkstate.xml similarity index 100% rename from tests/qemuxml2argvdata/net-linkstate.xml rename to tests/qemuxmlconfdata/net-linkstate.xml diff --git a/tests/qemuxml2argvdata/net-many-models.x86_64-latest.args b/tests/qemuxmlconfdata/net-many-models.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-many-models.x86_64-latest.args rename to tests/qemuxmlconfdata/net-many-models.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-many-models.xml b/tests/qemuxmlconfdata/net-many-models.xml similarity index 100% rename from tests/qemuxml2argvdata/net-many-models.xml rename to tests/qemuxmlconfdata/net-many-models.xml diff --git a/tests/qemuxml2argvdata/net-mcast.x86_64-latest.args b/tests/qemuxmlconfdata/net-mcast.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-mcast.x86_64-latest.args rename to tests/qemuxmlconfdata/net-mcast.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-mcast.xml b/tests/qemuxmlconfdata/net-mcast.xml similarity index 100% rename from tests/qemuxml2argvdata/net-mcast.xml rename to tests/qemuxmlconfdata/net-mcast.xml diff --git a/tests/qemuxml2argvdata/net-midonet.x86_64-latest.args b/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-midonet.x86_64-latest.args rename to tests/qemuxmlconfdata/net-midonet.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-midonet.xml b/tests/qemuxmlconfdata/net-midonet.xml similarity index 100% rename from tests/qemuxml2argvdata/net-midonet.xml rename to tests/qemuxmlconfdata/net-midonet.xml diff --git a/tests/qemuxml2argvdata/net-mtu.x86_64-latest.args b/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-mtu.x86_64-latest.args rename to tests/qemuxmlconfdata/net-mtu.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-mtu.xml b/tests/qemuxmlconfdata/net-mtu.xml similarity index 100% rename from tests/qemuxml2argvdata/net-mtu.xml rename to tests/qemuxmlconfdata/net-mtu.xml diff --git a/tests/qemuxml2argvdata/net-openvswitch.x86_64-latest.args b/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-openvswitch.x86_64-latest.args rename to tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-openvswitch.xml b/tests/qemuxmlconfdata/net-openvswitch.xml similarity index 100% rename from tests/qemuxml2argvdata/net-openvswitch.xml rename to tests/qemuxmlconfdata/net-openvswitch.xml diff --git a/tests/qemuxml2argvdata/net-server.x86_64-latest.args b/tests/qemuxmlconfdata/net-server.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-server.x86_64-latest.args rename to tests/qemuxmlconfdata/net-server.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-server.xml b/tests/qemuxmlconfdata/net-server.xml similarity index 100% rename from tests/qemuxml2argvdata/net-server.xml rename to tests/qemuxmlconfdata/net-server.xml diff --git a/tests/qemuxml2argvdata/net-udp.x86_64-latest.args b/tests/qemuxmlconfdata/net-udp.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-udp.x86_64-latest.args rename to tests/qemuxmlconfdata/net-udp.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-udp.xml b/tests/qemuxmlconfdata/net-udp.xml similarity index 100% rename from tests/qemuxml2argvdata/net-udp.xml rename to tests/qemuxmlconfdata/net-udp.xml diff --git a/tests/qemuxml2argvdata/net-user-addr.x86_64-latest.args b/tests/qemuxmlconfdata/net-user-addr.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-user-addr.x86_64-latest.args rename to tests/qemuxmlconfdata/net-user-addr.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-user-addr.xml b/tests/qemuxmlconfdata/net-user-addr.xml similarity index 100% rename from tests/qemuxml2argvdata/net-user-addr.xml rename to tests/qemuxmlconfdata/net-user-addr.xml diff --git a/tests/qemuxml2argvdata/net-user-passt.x86_64-7.2.0.args b/tests/qemuxmlconfdata/net-user-passt.x86_64-7.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/net-user-passt.x86_64-7.2.0.args rename to tests/qemuxmlconfdata/net-user-passt.x86_64-7.2.0.args diff --git a/tests/qemuxml2argvdata/net-user-passt.x86_64-latest.args b/tests/qemuxmlconfdata/net-user-passt.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-user-passt.x86_64-latest.args rename to tests/qemuxmlconfdata/net-user-passt.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-user-passt.xml b/tests/qemuxmlconfdata/net-user-passt.xml similarity index 100% rename from tests/qemuxml2argvdata/net-user-passt.xml rename to tests/qemuxmlconfdata/net-user-passt.xml diff --git a/tests/qemuxml2argvdata/net-user-slirp-portforward.x86_64-latest.err b/tests/qemuxmlconfdata/net-user-slirp-portforward.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/net-user-slirp-portforward.x86_64-latest.err rename to tests/qemuxmlconfdata/net-user-slirp-portforward.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/net-user-slirp-portforward.xml b/tests/qemuxmlconfdata/net-user-slirp-portforward.xml similarity index 100% rename from tests/qemuxml2argvdata/net-user-slirp-portforward.xml rename to tests/qemuxmlconfdata/net-user-slirp-portforward.xml diff --git a/tests/qemuxml2argvdata/net-user.x86_64-latest.args b/tests/qemuxmlconfdata/net-user.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-user.x86_64-latest.args rename to tests/qemuxmlconfdata/net-user.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-user.xml b/tests/qemuxmlconfdata/net-user.xml similarity index 100% rename from tests/qemuxml2argvdata/net-user.xml rename to tests/qemuxmlconfdata/net-user.xml diff --git a/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args b/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args rename to tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-vdpa-multiqueue.xml b/tests/qemuxmlconfdata/net-vdpa-multiqueue.xml similarity index 100% rename from tests/qemuxml2argvdata/net-vdpa-multiqueue.xml rename to tests/qemuxmlconfdata/net-vdpa-multiqueue.xml diff --git a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args b/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args rename to tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-vdpa.xml b/tests/qemuxmlconfdata/net-vdpa.xml similarity index 100% rename from tests/qemuxml2argvdata/net-vdpa.xml rename to tests/qemuxmlconfdata/net-vdpa.xml diff --git a/tests/qemuxml2argvdata/net-vhostuser-fail.x86_64-latest.err b/tests/qemuxmlconfdata/net-vhostuser-fail.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/net-vhostuser-fail.x86_64-latest.err rename to tests/qemuxmlconfdata/net-vhostuser-fail.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/net-vhostuser-fail.xml b/tests/qemuxmlconfdata/net-vhostuser-fail.xml similarity index 100% rename from tests/qemuxml2argvdata/net-vhostuser-fail.xml rename to tests/qemuxmlconfdata/net-vhostuser-fail.xml diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.x86_64-latest.args b/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-vhostuser-multiq.x86_64-latest.args rename to tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.xml b/tests/qemuxmlconfdata/net-vhostuser-multiq.xml similarity index 100% rename from tests/qemuxml2argvdata/net-vhostuser-multiq.xml rename to tests/qemuxmlconfdata/net-vhostuser-multiq.xml diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args b/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args rename to tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-vhostuser.xml b/tests/qemuxmlconfdata/net-vhostuser.xml similarity index 100% rename from tests/qemuxml2argvdata/net-vhostuser.xml rename to tests/qemuxmlconfdata/net-vhostuser.xml diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.s390x-latest.args b/tests/qemuxmlconfdata/net-virtio-ccw.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-ccw.s390x-latest.args rename to tests/qemuxmlconfdata/net-virtio-ccw.s390x-latest.args diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.xml b/tests/qemuxmlconfdata/net-virtio-ccw.xml similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-ccw.xml rename to tests/qemuxmlconfdata/net-virtio-ccw.xml diff --git a/tests/qemuxml2argvdata/net-virtio-device.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-device.x86_64-latest.args rename to tests/qemuxmlconfdata/net-virtio-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-virtio-device.xml b/tests/qemuxmlconfdata/net-virtio-device.xml similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-device.xml rename to tests/qemuxmlconfdata/net-virtio-device.xml diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-disable-offloads.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-disable-offloads.x86_64-latest.args rename to tests/qemuxmlconfdata/net-virtio-disable-offloads.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.xml b/tests/qemuxmlconfdata/net-virtio-disable-offloads.xml similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-disable-offloads.xml rename to tests/qemuxmlconfdata/net-virtio-disable-offloads.xml diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-netdev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-netdev.x86_64-latest.args rename to tests/qemuxmlconfdata/net-virtio-netdev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.xml b/tests/qemuxmlconfdata/net-virtio-netdev.xml similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-netdev.xml rename to tests/qemuxmlconfdata/net-virtio-netdev.xml diff --git a/tests/qemuxml2argvdata/net-virtio-network-portgroup.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-network-portgroup.x86_64-latest.args rename to tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-virtio-network-portgroup.xml b/tests/qemuxmlconfdata/net-virtio-network-portgroup.xml similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-network-portgroup.xml rename to tests/qemuxmlconfdata/net-virtio-network-portgroup.xml diff --git a/tests/qemuxml2argvdata/net-virtio-rss.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-rss.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-rss.x86_64-latest.args rename to tests/qemuxmlconfdata/net-virtio-rss.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-virtio-rss.xml b/tests/qemuxmlconfdata/net-virtio-rss.xml similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-rss.xml rename to tests/qemuxmlconfdata/net-virtio-rss.xml diff --git a/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.x86_64-latest.err b/tests/qemuxmlconfdata/net-virtio-rxqueuesize-invalid-size.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.x86_64-latest.err rename to tests/qemuxmlconfdata/net-virtio-rxqueuesize-invalid-size.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml b/tests/qemuxmlconfdata/net-virtio-rxqueuesize-invalid-size.xml similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-rxqueuesize-invalid-size.xml rename to tests/qemuxmlconfdata/net-virtio-rxqueuesize-invalid-size.xml diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-rxtxqueuesize.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.x86_64-latest.args rename to tests/qemuxmlconfdata/net-virtio-rxtxqueuesize.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml b/tests/qemuxmlconfdata/net-virtio-rxtxqueuesize.xml similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.xml rename to tests/qemuxmlconfdata/net-virtio-rxtxqueuesize.xml diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-teaming-hostdev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-teaming-hostdev.x86_64-latest.args rename to tests/qemuxmlconfdata/net-virtio-teaming-hostdev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml b/tests/qemuxmlconfdata/net-virtio-teaming-hostdev.xml similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml rename to tests/qemuxmlconfdata/net-virtio-teaming-hostdev.xml diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-network.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-teaming-network.x86_64-latest.args rename to tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-network.xml b/tests/qemuxmlconfdata/net-virtio-teaming-network.xml similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-teaming-network.xml rename to tests/qemuxmlconfdata/net-virtio-teaming-network.xml diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-teaming.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-teaming.x86_64-latest.args rename to tests/qemuxmlconfdata/net-virtio-teaming.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.xml b/tests/qemuxmlconfdata/net-virtio-teaming.xml similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-teaming.xml rename to tests/qemuxmlconfdata/net-virtio-teaming.xml diff --git a/tests/qemuxml2argvdata/net-virtio-vhost.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-vhost.x86_64-latest.args rename to tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-virtio-vhost.xml b/tests/qemuxmlconfdata/net-virtio-vhost.xml similarity index 100% rename from tests/qemuxml2argvdata/net-virtio-vhost.xml rename to tests/qemuxmlconfdata/net-virtio-vhost.xml diff --git a/tests/qemuxml2argvdata/net-virtio.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/net-virtio.x86_64-latest.args rename to tests/qemuxmlconfdata/net-virtio.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/net-virtio.xml b/tests/qemuxmlconfdata/net-virtio.xml similarity index 100% rename from tests/qemuxml2argvdata/net-virtio.xml rename to tests/qemuxmlconfdata/net-virtio.xml diff --git a/tests/qemuxml2argvdata/non-x86_64-timer-error.s390x-latest.err b/tests/qemuxmlconfdata/non-x86_64-timer-error.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/non-x86_64-timer-error.s390x-latest.err rename to tests/qemuxmlconfdata/non-x86_64-timer-error.s390x-latest.err diff --git a/tests/qemuxml2argvdata/non-x86_64-timer-error.xml b/tests/qemuxmlconfdata/non-x86_64-timer-error.xml similarity index 100% rename from tests/qemuxml2argvdata/non-x86_64-timer-error.xml rename to tests/qemuxmlconfdata/non-x86_64-timer-error.xml diff --git a/tests/qemuxml2argvdata/nosharepages.x86_64-latest.args b/tests/qemuxmlconfdata/nosharepages.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/nosharepages.x86_64-latest.args rename to tests/qemuxmlconfdata/nosharepages.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/nosharepages.xml b/tests/qemuxmlconfdata/nosharepages.xml similarity index 100% rename from tests/qemuxml2argvdata/nosharepages.xml rename to tests/qemuxmlconfdata/nosharepages.xml diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args b/tests/qemuxmlconfdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args rename to tests/qemuxmlconfdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml b/tests/qemuxmlconfdata/numad-auto-memory-vcpu-cpuset.xml similarity index 100% rename from tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml rename to tests/qemuxmlconfdata/numad-auto-memory-vcpu-cpuset.xml diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args b/tests/qemuxmlconfdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args rename to tests/qemuxmlconfdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml b/tests/qemuxmlconfdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml similarity index 100% rename from tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml rename to tests/qemuxmlconfdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.args b/tests/qemuxmlconfdata/numad-auto-vcpu-no-numatune.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.args rename to tests/qemuxmlconfdata/numad-auto-vcpu-no-numatune.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml b/tests/qemuxmlconfdata/numad-auto-vcpu-no-numatune.xml similarity index 100% rename from tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml rename to tests/qemuxmlconfdata/numad-auto-vcpu-no-numatune.xml diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.x86_64-latest.err b/tests/qemuxmlconfdata/numad-auto-vcpu-static-numatune-no-nodeset.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.x86_64-latest.err rename to tests/qemuxmlconfdata/numad-auto-vcpu-static-numatune-no-nodeset.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml b/tests/qemuxmlconfdata/numad-auto-vcpu-static-numatune-no-nodeset.xml similarity index 100% rename from tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml rename to tests/qemuxmlconfdata/numad-auto-vcpu-static-numatune-no-nodeset.xml diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args b/tests/qemuxmlconfdata/numad-auto-vcpu-static-numatune.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args rename to tests/qemuxmlconfdata/numad-auto-vcpu-static-numatune.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml b/tests/qemuxmlconfdata/numad-auto-vcpu-static-numatune.xml similarity index 100% rename from tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml rename to tests/qemuxmlconfdata/numad-auto-vcpu-static-numatune.xml diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args b/tests/qemuxmlconfdata/numad-static-memory-auto-vcpu.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args rename to tests/qemuxmlconfdata/numad-static-memory-auto-vcpu.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml b/tests/qemuxmlconfdata/numad-static-memory-auto-vcpu.xml similarity index 100% rename from tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml rename to tests/qemuxmlconfdata/numad-static-memory-auto-vcpu.xml diff --git a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-latest.args b/tests/qemuxmlconfdata/numad-static-vcpu-no-numatune.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-latest.args rename to tests/qemuxmlconfdata/numad-static-vcpu-no-numatune.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml b/tests/qemuxmlconfdata/numad-static-vcpu-no-numatune.xml similarity index 100% rename from tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml rename to tests/qemuxmlconfdata/numad-static-vcpu-no-numatune.xml diff --git a/tests/qemuxml2argvdata/numad.x86_64-latest.args b/tests/qemuxmlconfdata/numad.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numad.x86_64-latest.args rename to tests/qemuxmlconfdata/numad.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numad.xml b/tests/qemuxmlconfdata/numad.xml similarity index 100% rename from tests/qemuxml2argvdata/numad.xml rename to tests/qemuxmlconfdata/numad.xml diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-auto-nodeset-invalid.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args rename to tests/qemuxmlconfdata/numatune-auto-nodeset-invalid.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml b/tests/qemuxmlconfdata/numatune-auto-nodeset-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml rename to tests/qemuxmlconfdata/numatune-auto-nodeset-invalid.xml diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-auto-prefer.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numatune-auto-prefer.x86_64-latest.args rename to tests/qemuxmlconfdata/numatune-auto-prefer.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.xml b/tests/qemuxmlconfdata/numatune-auto-prefer.xml similarity index 100% rename from tests/qemuxml2argvdata/numatune-auto-prefer.xml rename to tests/qemuxmlconfdata/numatune-auto-prefer.xml diff --git a/tests/qemuxml2argvdata/numatune-distances.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-distances.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numatune-distances.x86_64-latest.args rename to tests/qemuxmlconfdata/numatune-distances.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numatune-distances.xml b/tests/qemuxmlconfdata/numatune-distances.xml similarity index 100% rename from tests/qemuxml2argvdata/numatune-distances.xml rename to tests/qemuxmlconfdata/numatune-distances.xml diff --git a/tests/qemuxml2argvdata/numatune-hmat-none.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-hmat-none.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numatune-hmat-none.x86_64-latest.args rename to tests/qemuxmlconfdata/numatune-hmat-none.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numatune-hmat-none.xml b/tests/qemuxmlconfdata/numatune-hmat-none.xml similarity index 100% rename from tests/qemuxml2argvdata/numatune-hmat-none.xml rename to tests/qemuxmlconfdata/numatune-hmat-none.xml diff --git a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-hmat.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args rename to tests/qemuxmlconfdata/numatune-hmat.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numatune-hmat.xml b/tests/qemuxmlconfdata/numatune-hmat.xml similarity index 100% rename from tests/qemuxml2argvdata/numatune-hmat.xml rename to tests/qemuxmlconfdata/numatune-hmat.xml diff --git a/tests/qemuxml2argvdata/numatune-memnode-invalid-mode.x86_64-latest.err b/tests/qemuxmlconfdata/numatune-memnode-invalid-mode.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-invalid-mode.x86_64-latest.err rename to tests/qemuxmlconfdata/numatune-memnode-invalid-mode.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numatune-memnode-invalid-mode.xml b/tests/qemuxmlconfdata/numatune-memnode-invalid-mode.xml similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-invalid-mode.xml rename to tests/qemuxmlconfdata/numatune-memnode-invalid-mode.xml diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-memnode-no-memory.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-no-memory.x86_64-latest.args rename to tests/qemuxmlconfdata/numatune-memnode-no-memory.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.xml b/tests/qemuxmlconfdata/numatune-memnode-no-memory.xml similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-no-memory.xml rename to tests/qemuxmlconfdata/numatune-memnode-no-memory.xml diff --git a/tests/qemuxml2argvdata/numatune-memnode-nocpu.x86_64-latest.err b/tests/qemuxmlconfdata/numatune-memnode-nocpu.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-nocpu.x86_64-latest.err rename to tests/qemuxmlconfdata/numatune-memnode-nocpu.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numatune-memnode-nocpu.xml b/tests/qemuxmlconfdata/numatune-memnode-nocpu.xml similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-nocpu.xml rename to tests/qemuxmlconfdata/numatune-memnode-nocpu.xml diff --git a/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode-err-mixed.x86_64-latest.err b/tests/qemuxmlconfdata/numatune-memnode-restrictive-mode-err-mixed.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-restrictive-mode-err-mixed.x86_64-latest.err rename to tests/qemuxmlconfdata/numatune-memnode-restrictive-mode-err-mixed.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode-err-mixed.xml b/tests/qemuxmlconfdata/numatune-memnode-restrictive-mode-err-mixed.xml similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-restrictive-mode-err-mixed.xml rename to tests/qemuxmlconfdata/numatune-memnode-restrictive-mode-err-mixed.xml diff --git a/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-memnode-restrictive-mode.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.x86_64-latest.args rename to tests/qemuxmlconfdata/numatune-memnode-restrictive-mode.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.xml b/tests/qemuxmlconfdata/numatune-memnode-restrictive-mode.xml similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.xml rename to tests/qemuxmlconfdata/numatune-memnode-restrictive-mode.xml diff --git a/tests/qemuxml2argvdata/numatune-memnode-unavailable-restrictive.x86_64-latest.err b/tests/qemuxmlconfdata/numatune-memnode-unavailable-restrictive.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-unavailable-restrictive.x86_64-latest.err rename to tests/qemuxmlconfdata/numatune-memnode-unavailable-restrictive.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numatune-memnode-unavailable-restrictive.xml b/tests/qemuxmlconfdata/numatune-memnode-unavailable-restrictive.xml similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-unavailable-restrictive.xml rename to tests/qemuxmlconfdata/numatune-memnode-unavailable-restrictive.xml diff --git a/tests/qemuxml2argvdata/numatune-memnode-unavailable-strict.x86_64-latest.err b/tests/qemuxmlconfdata/numatune-memnode-unavailable-strict.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-unavailable-strict.x86_64-latest.err rename to tests/qemuxmlconfdata/numatune-memnode-unavailable-strict.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numatune-memnode-unavailable-strict.xml b/tests/qemuxmlconfdata/numatune-memnode-unavailable-strict.xml similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode-unavailable-strict.xml rename to tests/qemuxmlconfdata/numatune-memnode-unavailable-strict.xml diff --git a/tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args b/tests/qemuxmlconfdata/numatune-memnode.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/numatune-memnode.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-memnode.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args rename to tests/qemuxmlconfdata/numatune-memnode.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numatune-memnode.xml b/tests/qemuxmlconfdata/numatune-memnode.xml similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnode.xml rename to tests/qemuxmlconfdata/numatune-memnode.xml diff --git a/tests/qemuxml2argvdata/numatune-memnodes-problematic.x86_64-latest.err b/tests/qemuxmlconfdata/numatune-memnodes-problematic.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnodes-problematic.x86_64-latest.err rename to tests/qemuxmlconfdata/numatune-memnodes-problematic.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numatune-memnodes-problematic.xml b/tests/qemuxmlconfdata/numatune-memnodes-problematic.xml similarity index 100% rename from tests/qemuxml2argvdata/numatune-memnodes-problematic.xml rename to tests/qemuxmlconfdata/numatune-memnodes-problematic.xml diff --git a/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.x86_64-latest.err b/tests/qemuxmlconfdata/numatune-memory-invalid-nodeset.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.x86_64-latest.err rename to tests/qemuxmlconfdata/numatune-memory-invalid-nodeset.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml b/tests/qemuxmlconfdata/numatune-memory-invalid-nodeset.xml similarity index 100% rename from tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml rename to tests/qemuxmlconfdata/numatune-memory-invalid-nodeset.xml diff --git a/tests/qemuxml2argvdata/numatune-no-vcpu.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-no-vcpu.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numatune-no-vcpu.x86_64-latest.args rename to tests/qemuxmlconfdata/numatune-no-vcpu.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numatune-no-vcpu.xml b/tests/qemuxmlconfdata/numatune-no-vcpu.xml similarity index 100% rename from tests/qemuxml2argvdata/numatune-no-vcpu.xml rename to tests/qemuxmlconfdata/numatune-no-vcpu.xml diff --git a/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.x86_64-latest.err b/tests/qemuxmlconfdata/numatune-static-nodeset-exceed-hostnode.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.x86_64-latest.err rename to tests/qemuxmlconfdata/numatune-static-nodeset-exceed-hostnode.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.xml b/tests/qemuxmlconfdata/numatune-static-nodeset-exceed-hostnode.xml similarity index 100% rename from tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.xml rename to tests/qemuxmlconfdata/numatune-static-nodeset-exceed-hostnode.xml diff --git a/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-system-memory.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args rename to tests/qemuxmlconfdata/numatune-system-memory.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numatune-system-memory.xml b/tests/qemuxmlconfdata/numatune-system-memory.xml similarity index 100% rename from tests/qemuxml2argvdata/numatune-system-memory.xml rename to tests/qemuxmlconfdata/numatune-system-memory.xml diff --git a/tests/qemuxml2argvdata/numavcpus-topology-mismatch.x86_64-latest.args b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/numavcpus-topology-mismatch.x86_64-latest.args rename to tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/numavcpus-topology-mismatch.xml b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.xml similarity index 100% rename from tests/qemuxml2argvdata/numavcpus-topology-mismatch.xml rename to tests/qemuxmlconfdata/numavcpus-topology-mismatch.xml diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.x86_64-latest.args b/tests/qemuxmlconfdata/pages-dimm-discard.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pages-dimm-discard.x86_64-latest.args rename to tests/qemuxmlconfdata/pages-dimm-discard.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.xml b/tests/qemuxmlconfdata/pages-dimm-discard.xml similarity index 100% rename from tests/qemuxml2argvdata/pages-dimm-discard.xml rename to tests/qemuxmlconfdata/pages-dimm-discard.xml diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.x86_64-latest.args b/tests/qemuxmlconfdata/pages-discard-hugepages.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pages-discard-hugepages.x86_64-latest.args rename to tests/qemuxmlconfdata/pages-discard-hugepages.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.xml b/tests/qemuxmlconfdata/pages-discard-hugepages.xml similarity index 100% rename from tests/qemuxml2argvdata/pages-discard-hugepages.xml rename to tests/qemuxmlconfdata/pages-discard-hugepages.xml diff --git a/tests/qemuxml2argvdata/pages-discard.x86_64-latest.args b/tests/qemuxmlconfdata/pages-discard.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pages-discard.x86_64-latest.args rename to tests/qemuxmlconfdata/pages-discard.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pages-discard.xml b/tests/qemuxmlconfdata/pages-discard.xml similarity index 100% rename from tests/qemuxml2argvdata/pages-discard.xml rename to tests/qemuxmlconfdata/pages-discard.xml diff --git a/tests/qemuxml2argvdata/panic-double.x86_64-latest.args b/tests/qemuxmlconfdata/panic-double.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/panic-double.x86_64-latest.args rename to tests/qemuxmlconfdata/panic-double.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/panic-double.xml b/tests/qemuxmlconfdata/panic-double.xml similarity index 100% rename from tests/qemuxml2argvdata/panic-double.xml rename to tests/qemuxmlconfdata/panic-double.xml diff --git a/tests/qemuxml2argvdata/panic-no-address.x86_64-latest.args b/tests/qemuxmlconfdata/panic-no-address.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/panic-no-address.x86_64-latest.args rename to tests/qemuxmlconfdata/panic-no-address.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/panic-no-address.xml b/tests/qemuxmlconfdata/panic-no-address.xml similarity index 100% rename from tests/qemuxml2argvdata/panic-no-address.xml rename to tests/qemuxmlconfdata/panic-no-address.xml diff --git a/tests/qemuxml2argvdata/panic-pseries.ppc64-latest.args b/tests/qemuxmlconfdata/panic-pseries.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/panic-pseries.ppc64-latest.args rename to tests/qemuxmlconfdata/panic-pseries.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/panic-pseries.xml b/tests/qemuxmlconfdata/panic-pseries.xml similarity index 100% rename from tests/qemuxml2argvdata/panic-pseries.xml rename to tests/qemuxmlconfdata/panic-pseries.xml diff --git a/tests/qemuxml2argvdata/panic.x86_64-latest.args b/tests/qemuxmlconfdata/panic.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/panic.x86_64-latest.args rename to tests/qemuxmlconfdata/panic.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/panic.xml b/tests/qemuxmlconfdata/panic.xml similarity index 100% rename from tests/qemuxml2argvdata/panic.xml rename to tests/qemuxmlconfdata/panic.xml diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/parallel-parport-chardev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args rename to tests/qemuxmlconfdata/parallel-parport-chardev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.xml b/tests/qemuxmlconfdata/parallel-parport-chardev.xml similarity index 100% rename from tests/qemuxml2argvdata/parallel-parport-chardev.xml rename to tests/qemuxmlconfdata/parallel-parport-chardev.xml diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/parallel-tcp-chardev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/parallel-tcp-chardev.x86_64-latest.args rename to tests/qemuxmlconfdata/parallel-tcp-chardev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.xml b/tests/qemuxmlconfdata/parallel-tcp-chardev.xml similarity index 100% rename from tests/qemuxml2argvdata/parallel-tcp-chardev.xml rename to tests/qemuxmlconfdata/parallel-tcp-chardev.xml diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args rename to tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.xml b/tests/qemuxmlconfdata/parallel-unix-chardev.xml similarity index 100% rename from tests/qemuxml2argvdata/parallel-unix-chardev.xml rename to tests/qemuxmlconfdata/parallel-unix-chardev.xml diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err rename to tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args rename to tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.xml b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.xml similarity index 100% rename from tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.xml rename to tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.xml diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err rename to tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.args b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.args rename to tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.xml b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.xml similarity index 100% rename from tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.xml rename to tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.xml diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.x86_64-latest.args b/tests/qemuxmlconfdata/pci-autoadd-addr.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-autoadd-addr.x86_64-latest.args rename to tests/qemuxmlconfdata/pci-autoadd-addr.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.xml b/tests/qemuxmlconfdata/pci-autoadd-addr.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-autoadd-addr.xml rename to tests/qemuxmlconfdata/pci-autoadd-addr.xml diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.x86_64-latest.args b/tests/qemuxmlconfdata/pci-autoadd-idx.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-autoadd-idx.x86_64-latest.args rename to tests/qemuxmlconfdata/pci-autoadd-idx.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.xml b/tests/qemuxmlconfdata/pci-autoadd-idx.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-autoadd-idx.xml rename to tests/qemuxmlconfdata/pci-autoadd-idx.xml diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.x86_64-latest.args b/tests/qemuxmlconfdata/pci-autofill-addr.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-autofill-addr.x86_64-latest.args rename to tests/qemuxmlconfdata/pci-autofill-addr.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.xml b/tests/qemuxmlconfdata/pci-autofill-addr.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-autofill-addr.xml rename to tests/qemuxmlconfdata/pci-autofill-addr.xml diff --git a/tests/qemuxml2argvdata/pci-bridge-duplicate-index.x86_64-latest.err b/tests/qemuxmlconfdata/pci-bridge-duplicate-index.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-bridge-duplicate-index.x86_64-latest.err rename to tests/qemuxmlconfdata/pci-bridge-duplicate-index.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml b/tests/qemuxmlconfdata/pci-bridge-duplicate-index.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml rename to tests/qemuxmlconfdata/pci-bridge-duplicate-index.xml diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.x86_64-latest.args b/tests/qemuxmlconfdata/pci-bridge-many-disks.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-bridge-many-disks.x86_64-latest.args rename to tests/qemuxmlconfdata/pci-bridge-many-disks.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.xml b/tests/qemuxmlconfdata/pci-bridge-many-disks.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-bridge-many-disks.xml rename to tests/qemuxmlconfdata/pci-bridge-many-disks.xml diff --git a/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/pci-bridge-negative-index-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.x86_64-latest.err rename to tests/qemuxmlconfdata/pci-bridge-negative-index-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml b/tests/qemuxmlconfdata/pci-bridge-negative-index-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml rename to tests/qemuxmlconfdata/pci-bridge-negative-index-invalid.xml diff --git a/tests/qemuxml2argvdata/pci-bridge.x86_64-latest.args b/tests/qemuxmlconfdata/pci-bridge.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-bridge.x86_64-latest.args rename to tests/qemuxmlconfdata/pci-bridge.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-bridge.xml b/tests/qemuxmlconfdata/pci-bridge.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-bridge.xml rename to tests/qemuxmlconfdata/pci-bridge.xml diff --git a/tests/qemuxml2argvdata/pci-bus-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/pci-bus-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-bus-invalid.x86_64-latest.err rename to tests/qemuxmlconfdata/pci-bus-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-bus-invalid.xml b/tests/qemuxmlconfdata/pci-bus-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-bus-invalid.xml rename to tests/qemuxmlconfdata/pci-bus-invalid.xml diff --git a/tests/qemuxml2argvdata/pci-domain-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/pci-domain-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-domain-invalid.x86_64-latest.err rename to tests/qemuxmlconfdata/pci-domain-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-domain-invalid.xml b/tests/qemuxmlconfdata/pci-domain-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-domain-invalid.xml rename to tests/qemuxmlconfdata/pci-domain-invalid.xml diff --git a/tests/qemuxml2argvdata/pci-expander-bus-bad-bus.x86_64-latest.err b/tests/qemuxmlconfdata/pci-expander-bus-bad-bus.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-expander-bus-bad-bus.x86_64-latest.err rename to tests/qemuxmlconfdata/pci-expander-bus-bad-bus.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-expander-bus-bad-bus.xml b/tests/qemuxmlconfdata/pci-expander-bus-bad-bus.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-expander-bus-bad-bus.xml rename to tests/qemuxmlconfdata/pci-expander-bus-bad-bus.xml diff --git a/tests/qemuxml2argvdata/pci-expander-bus-bad-machine.x86_64-latest.err b/tests/qemuxmlconfdata/pci-expander-bus-bad-machine.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-expander-bus-bad-machine.x86_64-latest.err rename to tests/qemuxmlconfdata/pci-expander-bus-bad-machine.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-expander-bus-bad-machine.xml b/tests/qemuxmlconfdata/pci-expander-bus-bad-machine.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-expander-bus-bad-machine.xml rename to tests/qemuxmlconfdata/pci-expander-bus-bad-machine.xml diff --git a/tests/qemuxml2argvdata/pci-expander-bus-bad-node.x86_64-latest.err b/tests/qemuxmlconfdata/pci-expander-bus-bad-node.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-expander-bus-bad-node.x86_64-latest.err rename to tests/qemuxmlconfdata/pci-expander-bus-bad-node.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-expander-bus-bad-node.xml b/tests/qemuxmlconfdata/pci-expander-bus-bad-node.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-expander-bus-bad-node.xml rename to tests/qemuxmlconfdata/pci-expander-bus-bad-node.xml diff --git a/tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args b/tests/qemuxmlconfdata/pci-expander-bus.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args rename to tests/qemuxmlconfdata/pci-expander-bus.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-expander-bus.xml b/tests/qemuxmlconfdata/pci-expander-bus.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-expander-bus.xml rename to tests/qemuxmlconfdata/pci-expander-bus.xml diff --git a/tests/qemuxml2argvdata/pci-function-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/pci-function-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-function-invalid.x86_64-latest.err rename to tests/qemuxmlconfdata/pci-function-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-function-invalid.xml b/tests/qemuxmlconfdata/pci-function-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-function-invalid.xml rename to tests/qemuxmlconfdata/pci-function-invalid.xml diff --git a/tests/qemuxml2argvdata/pci-many.x86_64-latest.args b/tests/qemuxmlconfdata/pci-many.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-many.x86_64-latest.args rename to tests/qemuxmlconfdata/pci-many.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-many.xml b/tests/qemuxmlconfdata/pci-many.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-many.xml rename to tests/qemuxmlconfdata/pci-many.xml diff --git a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.x86_64-latest.args b/tests/qemuxmlconfdata/pci-rom-disabled-invalid.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-rom-disabled-invalid.x86_64-latest.args rename to tests/qemuxmlconfdata/pci-rom-disabled-invalid.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.xml b/tests/qemuxmlconfdata/pci-rom-disabled-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-rom-disabled-invalid.xml rename to tests/qemuxmlconfdata/pci-rom-disabled-invalid.xml diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.x86_64-latest.args b/tests/qemuxmlconfdata/pci-rom-disabled.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-rom-disabled.x86_64-latest.args rename to tests/qemuxmlconfdata/pci-rom-disabled.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.xml b/tests/qemuxmlconfdata/pci-rom-disabled.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-rom-disabled.xml rename to tests/qemuxmlconfdata/pci-rom-disabled.xml diff --git a/tests/qemuxml2argvdata/pci-rom.x86_64-latest.args b/tests/qemuxmlconfdata/pci-rom.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-rom.x86_64-latest.args rename to tests/qemuxmlconfdata/pci-rom.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-rom.xml b/tests/qemuxmlconfdata/pci-rom.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-rom.xml rename to tests/qemuxmlconfdata/pci-rom.xml diff --git a/tests/qemuxml2argvdata/pci-root-address.x86_64-latest.err b/tests/qemuxmlconfdata/pci-root-address.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-root-address.x86_64-latest.err rename to tests/qemuxmlconfdata/pci-root-address.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-root-address.xml b/tests/qemuxmlconfdata/pci-root-address.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-root-address.xml rename to tests/qemuxmlconfdata/pci-root-address.xml diff --git a/tests/qemuxml2argvdata/pci-root-nonzero-index.x86_64-latest.err b/tests/qemuxmlconfdata/pci-root-nonzero-index.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-root-nonzero-index.x86_64-latest.err rename to tests/qemuxmlconfdata/pci-root-nonzero-index.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-root-nonzero-index.xml b/tests/qemuxmlconfdata/pci-root-nonzero-index.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-root-nonzero-index.xml rename to tests/qemuxmlconfdata/pci-root-nonzero-index.xml diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/pci-serial-dev-chardev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.args rename to tests/qemuxmlconfdata/pci-serial-dev-chardev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.xml b/tests/qemuxmlconfdata/pci-serial-dev-chardev.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-serial-dev-chardev.xml rename to tests/qemuxmlconfdata/pci-serial-dev-chardev.xml diff --git a/tests/qemuxml2argvdata/pci-slot-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/pci-slot-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pci-slot-invalid.x86_64-latest.err rename to tests/qemuxmlconfdata/pci-slot-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pci-slot-invalid.xml b/tests/qemuxmlconfdata/pci-slot-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/pci-slot-invalid.xml rename to tests/qemuxmlconfdata/pci-slot-invalid.xml diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args rename to tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.xml b/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.xml similarity index 100% rename from tests/qemuxml2argvdata/pcie-expander-bus-aarch64.xml rename to tests/qemuxmlconfdata/pcie-expander-bus-aarch64.xml diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.x86_64-latest.err b/tests/qemuxmlconfdata/pcie-expander-bus-bad-bus.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.x86_64-latest.err rename to tests/qemuxmlconfdata/pcie-expander-bus-bad-bus.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.xml b/tests/qemuxmlconfdata/pcie-expander-bus-bad-bus.xml similarity index 100% rename from tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.xml rename to tests/qemuxmlconfdata/pcie-expander-bus-bad-bus.xml diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.x86_64-latest.err b/tests/qemuxmlconfdata/pcie-expander-bus-bad-machine.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.x86_64-latest.err rename to tests/qemuxmlconfdata/pcie-expander-bus-bad-machine.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml b/tests/qemuxmlconfdata/pcie-expander-bus-bad-machine.xml similarity index 100% rename from tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml rename to tests/qemuxmlconfdata/pcie-expander-bus-bad-machine.xml diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-expander-bus.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args rename to tests/qemuxmlconfdata/pcie-expander-bus.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.xml b/tests/qemuxmlconfdata/pcie-expander-bus.xml similarity index 100% rename from tests/qemuxml2argvdata/pcie-expander-bus.xml rename to tests/qemuxmlconfdata/pcie-expander-bus.xml diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-root-port-model-generic.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcie-root-port-model-generic.x86_64-latest.args rename to tests/qemuxmlconfdata/pcie-root-port-model-generic.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.xml b/tests/qemuxmlconfdata/pcie-root-port-model-generic.xml similarity index 100% rename from tests/qemuxml2argvdata/pcie-root-port-model-generic.xml rename to tests/qemuxmlconfdata/pcie-root-port-model-generic.xml diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-root-port-model-ioh3420.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.x86_64-latest.args rename to tests/qemuxmlconfdata/pcie-root-port-model-ioh3420.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.xml b/tests/qemuxmlconfdata/pcie-root-port-model-ioh3420.xml similarity index 100% rename from tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.xml rename to tests/qemuxmlconfdata/pcie-root-port-model-ioh3420.xml diff --git a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-root-port-nohotplug.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args rename to tests/qemuxmlconfdata/pcie-root-port-nohotplug.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.xml b/tests/qemuxmlconfdata/pcie-root-port-nohotplug.xml similarity index 100% rename from tests/qemuxml2argvdata/pcie-root-port-nohotplug.xml rename to tests/qemuxmlconfdata/pcie-root-port-nohotplug.xml diff --git a/tests/qemuxml2argvdata/pcie-root-port-too-many.x86_64-latest.err b/tests/qemuxmlconfdata/pcie-root-port-too-many.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pcie-root-port-too-many.x86_64-latest.err rename to tests/qemuxmlconfdata/pcie-root-port-too-many.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pcie-root-port-too-many.xml b/tests/qemuxmlconfdata/pcie-root-port-too-many.xml similarity index 100% rename from tests/qemuxml2argvdata/pcie-root-port-too-many.xml rename to tests/qemuxmlconfdata/pcie-root-port-too-many.xml diff --git a/tests/qemuxml2argvdata/pcie-root-port.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-root-port.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcie-root-port.x86_64-latest.args rename to tests/qemuxmlconfdata/pcie-root-port.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcie-root-port.xml b/tests/qemuxmlconfdata/pcie-root-port.xml similarity index 100% rename from tests/qemuxml2argvdata/pcie-root-port.xml rename to tests/qemuxmlconfdata/pcie-root-port.xml diff --git a/tests/qemuxml2argvdata/pcie-root.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-root.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcie-root.x86_64-latest.args rename to tests/qemuxmlconfdata/pcie-root.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcie-root.xml b/tests/qemuxmlconfdata/pcie-root.xml similarity index 100% rename from tests/qemuxml2argvdata/pcie-root.xml rename to tests/qemuxmlconfdata/pcie-root.xml diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-switch-downstream-port.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcie-switch-downstream-port.x86_64-latest.args rename to tests/qemuxmlconfdata/pcie-switch-downstream-port.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.xml b/tests/qemuxmlconfdata/pcie-switch-downstream-port.xml similarity index 100% rename from tests/qemuxml2argvdata/pcie-switch-downstream-port.xml rename to tests/qemuxmlconfdata/pcie-switch-downstream-port.xml diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-switch-upstream-port.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcie-switch-upstream-port.x86_64-latest.args rename to tests/qemuxmlconfdata/pcie-switch-upstream-port.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.xml b/tests/qemuxmlconfdata/pcie-switch-upstream-port.xml similarity index 100% rename from tests/qemuxml2argvdata/pcie-switch-upstream-port.xml rename to tests/qemuxmlconfdata/pcie-switch-upstream-port.xml diff --git a/tests/qemuxml2argvdata/pcihole64-gib.x86_64-latest.args b/tests/qemuxmlconfdata/pcihole64-gib.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcihole64-gib.x86_64-latest.args rename to tests/qemuxmlconfdata/pcihole64-gib.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcihole64-gib.xml b/tests/qemuxmlconfdata/pcihole64-gib.xml similarity index 100% rename from tests/qemuxml2argvdata/pcihole64-gib.xml rename to tests/qemuxmlconfdata/pcihole64-gib.xml diff --git a/tests/qemuxml2argvdata/pcihole64-q35.x86_64-latest.args b/tests/qemuxmlconfdata/pcihole64-q35.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcihole64-q35.x86_64-latest.args rename to tests/qemuxmlconfdata/pcihole64-q35.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcihole64-q35.xml b/tests/qemuxmlconfdata/pcihole64-q35.xml similarity index 100% rename from tests/qemuxml2argvdata/pcihole64-q35.xml rename to tests/qemuxmlconfdata/pcihole64-q35.xml diff --git a/tests/qemuxml2argvdata/pcihole64.x86_64-latest.args b/tests/qemuxmlconfdata/pcihole64.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pcihole64.x86_64-latest.args rename to tests/qemuxmlconfdata/pcihole64.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pcihole64.xml b/tests/qemuxmlconfdata/pcihole64.xml similarity index 100% rename from tests/qemuxml2argvdata/pcihole64.xml rename to tests/qemuxmlconfdata/pcihole64.xml diff --git a/tests/qemuxml2argvdata/pmu-feature-off.x86_64-latest.args b/tests/qemuxmlconfdata/pmu-feature-off.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pmu-feature-off.x86_64-latest.args rename to tests/qemuxmlconfdata/pmu-feature-off.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pmu-feature-off.xml b/tests/qemuxmlconfdata/pmu-feature-off.xml similarity index 100% rename from tests/qemuxml2argvdata/pmu-feature-off.xml rename to tests/qemuxmlconfdata/pmu-feature-off.xml diff --git a/tests/qemuxml2argvdata/pmu-feature.x86_64-latest.args b/tests/qemuxmlconfdata/pmu-feature.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pmu-feature.x86_64-latest.args rename to tests/qemuxmlconfdata/pmu-feature.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pmu-feature.xml b/tests/qemuxmlconfdata/pmu-feature.xml similarity index 100% rename from tests/qemuxml2argvdata/pmu-feature.xml rename to tests/qemuxmlconfdata/pmu-feature.xml diff --git a/tests/qemuxml2argvdata/ppc-dtb.ppc-latest.args b/tests/qemuxmlconfdata/ppc-dtb.ppc-latest.args similarity index 100% rename from tests/qemuxml2argvdata/ppc-dtb.ppc-latest.args rename to tests/qemuxmlconfdata/ppc-dtb.ppc-latest.args diff --git a/tests/qemuxml2argvdata/ppc-dtb.xml b/tests/qemuxmlconfdata/ppc-dtb.xml similarity index 100% rename from tests/qemuxml2argvdata/ppc-dtb.xml rename to tests/qemuxmlconfdata/ppc-dtb.xml diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args rename to tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.xml b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-2.7.xml similarity index 100% rename from tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.xml rename to tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-2.7.xml diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args rename to tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.xml b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.xml similarity index 100% rename from tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.xml rename to tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.xml diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args rename to tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.xml b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.xml similarity index 100% rename from tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.xml rename to tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.xml diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args rename to tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.xml b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-2.7.xml similarity index 100% rename from tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.xml rename to tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-2.7.xml diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args rename to tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.xml b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-3.1.xml similarity index 100% rename from tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.xml rename to tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-3.1.xml diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args rename to tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.xml b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-4.2.xml similarity index 100% rename from tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.xml rename to tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-4.2.xml diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args rename to tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.xml b/tests/qemuxmlconfdata/ppc64-pseries-graphics.xml similarity index 100% rename from tests/qemuxml2argvdata/ppc64-pseries-graphics.xml rename to tests/qemuxmlconfdata/ppc64-pseries-graphics.xml diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-pseries-headless.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args rename to tests/qemuxmlconfdata/ppc64-pseries-headless.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.xml b/tests/qemuxmlconfdata/ppc64-pseries-headless.xml similarity index 100% rename from tests/qemuxml2argvdata/ppc64-pseries-headless.xml rename to tests/qemuxmlconfdata/ppc64-pseries-headless.xml diff --git a/tests/qemuxml2argvdata/ppc64-tpm-double.ppc64-latest.err b/tests/qemuxmlconfdata/ppc64-tpm-double.ppc64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/ppc64-tpm-double.ppc64-latest.err rename to tests/qemuxmlconfdata/ppc64-tpm-double.ppc64-latest.err diff --git a/tests/qemuxml2argvdata/ppc64-tpm-double.xml b/tests/qemuxmlconfdata/ppc64-tpm-double.xml similarity index 100% rename from tests/qemuxml2argvdata/ppc64-tpm-double.xml rename to tests/qemuxmlconfdata/ppc64-tpm-double.xml diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-double.ppc64-latest.err b/tests/qemuxmlconfdata/ppc64-tpmproxy-double.ppc64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/ppc64-tpmproxy-double.ppc64-latest.err rename to tests/qemuxmlconfdata/ppc64-tpmproxy-double.ppc64-latest.err diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-double.xml b/tests/qemuxmlconfdata/ppc64-tpmproxy-double.xml similarity index 100% rename from tests/qemuxml2argvdata/ppc64-tpmproxy-double.xml rename to tests/qemuxmlconfdata/ppc64-tpmproxy-double.xml diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-tpmproxy-single.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args rename to tests/qemuxmlconfdata/ppc64-tpmproxy-single.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.xml b/tests/qemuxmlconfdata/ppc64-tpmproxy-single.xml similarity index 100% rename from tests/qemuxml2argvdata/ppc64-tpmproxy-single.xml rename to tests/qemuxmlconfdata/ppc64-tpmproxy-single.xml diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args rename to tests/qemuxmlconfdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.xml b/tests/qemuxmlconfdata/ppc64-tpmproxy-with-tpm.xml similarity index 100% rename from tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.xml rename to tests/qemuxmlconfdata/ppc64-tpmproxy-with-tpm.xml diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/ppc64-usb-controller-legacy.ppc64-latest.args rename to tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.xml b/tests/qemuxmlconfdata/ppc64-usb-controller-legacy.xml similarity index 100% rename from tests/qemuxml2argvdata/ppc64-usb-controller-legacy.xml rename to tests/qemuxmlconfdata/ppc64-usb-controller-legacy.xml diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-usb-controller-qemu-xhci.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.ppc64-latest.args rename to tests/qemuxmlconfdata/ppc64-usb-controller-qemu-xhci.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.xml b/tests/qemuxmlconfdata/ppc64-usb-controller-qemu-xhci.xml similarity index 100% rename from tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.xml rename to tests/qemuxmlconfdata/ppc64-usb-controller-qemu-xhci.xml diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-usb-controller.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/ppc64-usb-controller.ppc64-latest.args rename to tests/qemuxmlconfdata/ppc64-usb-controller.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller.xml b/tests/qemuxmlconfdata/ppc64-usb-controller.xml similarity index 100% rename from tests/qemuxml2argvdata/ppc64-usb-controller.xml rename to tests/qemuxmlconfdata/ppc64-usb-controller.xml diff --git a/tests/qemuxml2argvdata/ppce500-serial.ppc-latest.args b/tests/qemuxmlconfdata/ppce500-serial.ppc-latest.args similarity index 100% rename from tests/qemuxml2argvdata/ppce500-serial.ppc-latest.args rename to tests/qemuxmlconfdata/ppce500-serial.ppc-latest.args diff --git a/tests/qemuxml2argvdata/ppce500-serial.xml b/tests/qemuxmlconfdata/ppce500-serial.xml similarity index 100% rename from tests/qemuxml2argvdata/ppce500-serial.xml rename to tests/qemuxmlconfdata/ppce500-serial.xml diff --git a/tests/qemuxml2argvdata/pseries-basic.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-basic.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-basic.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-basic.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-basic.xml b/tests/qemuxmlconfdata/pseries-basic.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-basic.xml rename to tests/qemuxmlconfdata/pseries-basic.xml diff --git a/tests/qemuxml2argvdata/pseries-console-native.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-console-native.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-console-native.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-console-native.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-console-native.xml b/tests/qemuxmlconfdata/pseries-console-native.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-console-native.xml rename to tests/qemuxmlconfdata/pseries-console-native.xml diff --git a/tests/qemuxml2argvdata/pseries-console-virtio.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-console-virtio.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-console-virtio.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-console-virtio.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-console-virtio.xml b/tests/qemuxmlconfdata/pseries-console-virtio.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-console-virtio.xml rename to tests/qemuxmlconfdata/pseries-console-virtio.xml diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power10.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-cpu-compat-power10.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-cpu-compat-power10.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-cpu-compat-power10.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power10.ppc64-latest.err b/tests/qemuxmlconfdata/pseries-cpu-compat-power10.ppc64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pseries-cpu-compat-power10.ppc64-latest.err rename to tests/qemuxmlconfdata/pseries-cpu-compat-power10.ppc64-latest.err diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power10.xml b/tests/qemuxmlconfdata/pseries-cpu-compat-power10.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-cpu-compat-power10.xml rename to tests/qemuxmlconfdata/pseries-cpu-compat-power10.xml diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-cpu-compat-power9.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-cpu-compat-power9.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-cpu-compat-power9.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.ppc64-latest.err b/tests/qemuxmlconfdata/pseries-cpu-compat-power9.ppc64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pseries-cpu-compat-power9.ppc64-latest.err rename to tests/qemuxmlconfdata/pseries-cpu-compat-power9.ppc64-latest.err diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.xml b/tests/qemuxmlconfdata/pseries-cpu-compat-power9.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-cpu-compat-power9.xml rename to tests/qemuxmlconfdata/pseries-cpu-compat-power9.xml diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-cpu-compat.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-cpu-compat.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-cpu-compat.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat.xml b/tests/qemuxmlconfdata/pseries-cpu-compat.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-cpu-compat.xml rename to tests/qemuxmlconfdata/pseries-cpu-compat.xml diff --git a/tests/qemuxml2argvdata/pseries-cpu-exact.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-cpu-exact.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-cpu-exact.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-cpu-exact.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-cpu-exact.xml b/tests/qemuxmlconfdata/pseries-cpu-exact.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-cpu-exact.xml rename to tests/qemuxmlconfdata/pseries-cpu-exact.xml diff --git a/tests/qemuxml2argvdata/pseries-cpu-le.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-cpu-le.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-cpu-le.xml b/tests/qemuxmlconfdata/pseries-cpu-le.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-cpu-le.xml rename to tests/qemuxmlconfdata/pseries-cpu-le.xml diff --git a/tests/qemuxml2argvdata/pseries-default-phb-numa-node.ppc64-latest.err b/tests/qemuxmlconfdata/pseries-default-phb-numa-node.ppc64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pseries-default-phb-numa-node.ppc64-latest.err rename to tests/qemuxmlconfdata/pseries-default-phb-numa-node.ppc64-latest.err diff --git a/tests/qemuxml2argvdata/pseries-default-phb-numa-node.xml b/tests/qemuxmlconfdata/pseries-default-phb-numa-node.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-default-phb-numa-node.xml rename to tests/qemuxmlconfdata/pseries-default-phb-numa-node.xml diff --git a/tests/qemuxml2argvdata/pseries-features-invalid-machine.x86_64-latest.err b/tests/qemuxmlconfdata/pseries-features-invalid-machine.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pseries-features-invalid-machine.x86_64-latest.err rename to tests/qemuxmlconfdata/pseries-features-invalid-machine.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pseries-features-invalid-machine.xml b/tests/qemuxmlconfdata/pseries-features-invalid-machine.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-features-invalid-machine.xml rename to tests/qemuxmlconfdata/pseries-features-invalid-machine.xml diff --git a/tests/qemuxml2argvdata/pseries-features.ppc64-4.2.0.args b/tests/qemuxmlconfdata/pseries-features.ppc64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-features.ppc64-4.2.0.args rename to tests/qemuxmlconfdata/pseries-features.ppc64-4.2.0.args diff --git a/tests/qemuxml2argvdata/pseries-features.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-features.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-features.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-features.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-features.xml b/tests/qemuxmlconfdata/pseries-features.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-features.xml rename to tests/qemuxmlconfdata/pseries-features.xml diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-1.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-hostdevs-1.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-hostdevs-1.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-hostdevs-1.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-1.xml b/tests/qemuxmlconfdata/pseries-hostdevs-1.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-hostdevs-1.xml rename to tests/qemuxmlconfdata/pseries-hostdevs-1.xml diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-2.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-hostdevs-2.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-hostdevs-2.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-hostdevs-2.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-2.xml b/tests/qemuxmlconfdata/pseries-hostdevs-2.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-hostdevs-2.xml rename to tests/qemuxmlconfdata/pseries-hostdevs-2.xml diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-3.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-hostdevs-3.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-hostdevs-3.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-hostdevs-3.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-3.xml b/tests/qemuxmlconfdata/pseries-hostdevs-3.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-hostdevs-3.xml rename to tests/qemuxmlconfdata/pseries-hostdevs-3.xml diff --git a/tests/qemuxml2argvdata/pseries-many-buses-1.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-many-buses-1.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-many-buses-1.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-many-buses-1.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-many-buses-1.xml b/tests/qemuxmlconfdata/pseries-many-buses-1.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-many-buses-1.xml rename to tests/qemuxmlconfdata/pseries-many-buses-1.xml diff --git a/tests/qemuxml2argvdata/pseries-many-buses-2.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-many-buses-2.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-many-buses-2.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-many-buses-2.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-many-buses-2.xml b/tests/qemuxmlconfdata/pseries-many-buses-2.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-many-buses-2.xml rename to tests/qemuxmlconfdata/pseries-many-buses-2.xml diff --git a/tests/qemuxml2argvdata/pseries-many-devices.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-many-devices.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-many-devices.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-many-devices.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-many-devices.xml b/tests/qemuxmlconfdata/pseries-many-devices.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-many-devices.xml rename to tests/qemuxmlconfdata/pseries-many-devices.xml diff --git a/tests/qemuxml2argvdata/pseries-no-parallel.ppc64-latest.err b/tests/qemuxmlconfdata/pseries-no-parallel.ppc64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pseries-no-parallel.ppc64-latest.err rename to tests/qemuxmlconfdata/pseries-no-parallel.ppc64-latest.err diff --git a/tests/qemuxml2argvdata/pseries-no-parallel.xml b/tests/qemuxmlconfdata/pseries-no-parallel.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-no-parallel.xml rename to tests/qemuxmlconfdata/pseries-no-parallel.xml diff --git a/tests/qemuxml2argvdata/pseries-nvram.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-nvram.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-nvram.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-nvram.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-nvram.xml b/tests/qemuxmlconfdata/pseries-nvram.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-nvram.xml rename to tests/qemuxmlconfdata/pseries-nvram.xml diff --git a/tests/qemuxml2argvdata/pseries-panic-address.ppc64-latest.err b/tests/qemuxmlconfdata/pseries-panic-address.ppc64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pseries-panic-address.ppc64-latest.err rename to tests/qemuxmlconfdata/pseries-panic-address.ppc64-latest.err diff --git a/tests/qemuxml2argvdata/pseries-panic-address.xml b/tests/qemuxmlconfdata/pseries-panic-address.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-panic-address.xml rename to tests/qemuxmlconfdata/pseries-panic-address.xml diff --git a/tests/qemuxml2argvdata/pseries-panic-missing.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-panic-missing.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-panic-missing.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-panic-missing.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-panic-missing.xml b/tests/qemuxmlconfdata/pseries-panic-missing.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-panic-missing.xml rename to tests/qemuxmlconfdata/pseries-panic-missing.xml diff --git a/tests/qemuxml2argvdata/pseries-panic-no-address.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-panic-no-address.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-panic-no-address.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-panic-no-address.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-panic-no-address.xml b/tests/qemuxmlconfdata/pseries-panic-no-address.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-panic-no-address.xml rename to tests/qemuxmlconfdata/pseries-panic-no-address.xml diff --git a/tests/qemuxml2argvdata/pseries-phb-default-missing.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-phb-default-missing.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-phb-default-missing.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-phb-default-missing.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-phb-default-missing.xml b/tests/qemuxmlconfdata/pseries-phb-default-missing.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-phb-default-missing.xml rename to tests/qemuxmlconfdata/pseries-phb-default-missing.xml diff --git a/tests/qemuxml2argvdata/pseries-phb-invalid-target-index-1.ppc64-latest.err b/tests/qemuxmlconfdata/pseries-phb-invalid-target-index-1.ppc64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pseries-phb-invalid-target-index-1.ppc64-latest.err rename to tests/qemuxmlconfdata/pseries-phb-invalid-target-index-1.ppc64-latest.err diff --git a/tests/qemuxml2argvdata/pseries-phb-invalid-target-index-1.xml b/tests/qemuxmlconfdata/pseries-phb-invalid-target-index-1.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-phb-invalid-target-index-1.xml rename to tests/qemuxmlconfdata/pseries-phb-invalid-target-index-1.xml diff --git a/tests/qemuxml2argvdata/pseries-phb-invalid-target-index-2.ppc64-latest.err b/tests/qemuxmlconfdata/pseries-phb-invalid-target-index-2.ppc64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pseries-phb-invalid-target-index-2.ppc64-latest.err rename to tests/qemuxmlconfdata/pseries-phb-invalid-target-index-2.ppc64-latest.err diff --git a/tests/qemuxml2argvdata/pseries-phb-invalid-target-index-2.xml b/tests/qemuxmlconfdata/pseries-phb-invalid-target-index-2.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-phb-invalid-target-index-2.xml rename to tests/qemuxmlconfdata/pseries-phb-invalid-target-index-2.xml diff --git a/tests/qemuxml2argvdata/pseries-phb-invalid-target-index-3.ppc64-latest.err b/tests/qemuxmlconfdata/pseries-phb-invalid-target-index-3.ppc64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pseries-phb-invalid-target-index-3.ppc64-latest.err rename to tests/qemuxmlconfdata/pseries-phb-invalid-target-index-3.ppc64-latest.err diff --git a/tests/qemuxml2argvdata/pseries-phb-invalid-target-index-3.xml b/tests/qemuxmlconfdata/pseries-phb-invalid-target-index-3.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-phb-invalid-target-index-3.xml rename to tests/qemuxmlconfdata/pseries-phb-invalid-target-index-3.xml diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-phb-numa-node.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-phb-numa-node.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.xml b/tests/qemuxmlconfdata/pseries-phb-numa-node.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-phb-numa-node.xml rename to tests/qemuxmlconfdata/pseries-phb-numa-node.xml diff --git a/tests/qemuxml2argvdata/pseries-phb-simple.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-phb-simple.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-phb-simple.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-phb-simple.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-phb-simple.xml b/tests/qemuxmlconfdata/pseries-phb-simple.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-phb-simple.xml rename to tests/qemuxmlconfdata/pseries-phb-simple.xml diff --git a/tests/qemuxml2argvdata/pseries-phb-user-alias.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-phb-user-alias.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-phb-user-alias.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-phb-user-alias.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-phb-user-alias.xml b/tests/qemuxmlconfdata/pseries-phb-user-alias.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-phb-user-alias.xml rename to tests/qemuxmlconfdata/pseries-phb-user-alias.xml diff --git a/tests/qemuxml2argvdata/pseries-serial+console-native.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-serial+console-native.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-serial+console-native.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-serial+console-native.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-serial+console-native.xml b/tests/qemuxmlconfdata/pseries-serial+console-native.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-serial+console-native.xml rename to tests/qemuxmlconfdata/pseries-serial+console-native.xml diff --git a/tests/qemuxml2argvdata/pseries-serial-compat.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-serial-compat.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-serial-compat.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-serial-compat.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-serial-compat.xml b/tests/qemuxmlconfdata/pseries-serial-compat.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-serial-compat.xml rename to tests/qemuxmlconfdata/pseries-serial-compat.xml diff --git a/tests/qemuxml2argvdata/pseries-serial-invalid-machine.x86_64-latest.err b/tests/qemuxmlconfdata/pseries-serial-invalid-machine.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pseries-serial-invalid-machine.x86_64-latest.err rename to tests/qemuxmlconfdata/pseries-serial-invalid-machine.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/pseries-serial-invalid-machine.xml b/tests/qemuxmlconfdata/pseries-serial-invalid-machine.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-serial-invalid-machine.xml rename to tests/qemuxmlconfdata/pseries-serial-invalid-machine.xml diff --git a/tests/qemuxml2argvdata/pseries-serial-native.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-serial-native.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-serial-native.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-serial-native.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-serial-native.xml b/tests/qemuxmlconfdata/pseries-serial-native.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-serial-native.xml rename to tests/qemuxmlconfdata/pseries-serial-native.xml diff --git a/tests/qemuxml2argvdata/pseries-serial-pci.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-serial-pci.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-serial-pci.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-serial-pci.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-serial-pci.xml b/tests/qemuxmlconfdata/pseries-serial-pci.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-serial-pci.xml rename to tests/qemuxmlconfdata/pseries-serial-pci.xml diff --git a/tests/qemuxml2argvdata/pseries-serial-usb.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-serial-usb.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-serial-usb.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-serial-usb.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-serial-usb.xml b/tests/qemuxmlconfdata/pseries-serial-usb.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-serial-usb.xml rename to tests/qemuxmlconfdata/pseries-serial-usb.xml diff --git a/tests/qemuxml2argvdata/pseries-spaprvio-invalid.ppc64-latest.err b/tests/qemuxmlconfdata/pseries-spaprvio-invalid.ppc64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pseries-spaprvio-invalid.ppc64-latest.err rename to tests/qemuxmlconfdata/pseries-spaprvio-invalid.ppc64-latest.err diff --git a/tests/qemuxml2argvdata/pseries-spaprvio-invalid.xml b/tests/qemuxmlconfdata/pseries-spaprvio-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-spaprvio-invalid.xml rename to tests/qemuxmlconfdata/pseries-spaprvio-invalid.xml diff --git a/tests/qemuxml2argvdata/pseries-usb-default.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-usb-default.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-usb-default.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-usb-default.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-usb-default.xml b/tests/qemuxmlconfdata/pseries-usb-default.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-usb-default.xml rename to tests/qemuxmlconfdata/pseries-usb-default.xml diff --git a/tests/qemuxml2argvdata/pseries-usb-kbd.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-usb-kbd.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-usb-kbd.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-usb-kbd.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-usb-kbd.xml b/tests/qemuxmlconfdata/pseries-usb-kbd.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-usb-kbd.xml rename to tests/qemuxmlconfdata/pseries-usb-kbd.xml diff --git a/tests/qemuxml2argvdata/pseries-usb-multi.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-usb-multi.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-usb-multi.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-usb-multi.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-usb-multi.xml b/tests/qemuxmlconfdata/pseries-usb-multi.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-usb-multi.xml rename to tests/qemuxmlconfdata/pseries-usb-multi.xml diff --git a/tests/qemuxml2argvdata/pseries-vio-address-clash.ppc64-latest.err b/tests/qemuxmlconfdata/pseries-vio-address-clash.ppc64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pseries-vio-address-clash.ppc64-latest.err rename to tests/qemuxmlconfdata/pseries-vio-address-clash.ppc64-latest.err diff --git a/tests/qemuxml2argvdata/pseries-vio-address-clash.xml b/tests/qemuxmlconfdata/pseries-vio-address-clash.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-vio-address-clash.xml rename to tests/qemuxmlconfdata/pseries-vio-address-clash.xml diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-vio-user-assigned.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-vio-user-assigned.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-vio-user-assigned.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.xml b/tests/qemuxmlconfdata/pseries-vio-user-assigned.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-vio-user-assigned.xml rename to tests/qemuxmlconfdata/pseries-vio-user-assigned.xml diff --git a/tests/qemuxml2argvdata/pseries-vio.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-vio.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pseries-vio.ppc64-latest.args rename to tests/qemuxmlconfdata/pseries-vio.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/pseries-vio.xml b/tests/qemuxmlconfdata/pseries-vio.xml similarity index 100% rename from tests/qemuxml2argvdata/pseries-vio.xml rename to tests/qemuxmlconfdata/pseries-vio.xml diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args b/tests/qemuxmlconfdata/pv-spinlock-disabled.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args rename to tests/qemuxmlconfdata/pv-spinlock-disabled.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.xml b/tests/qemuxmlconfdata/pv-spinlock-disabled.xml similarity index 100% rename from tests/qemuxml2argvdata/pv-spinlock-disabled.xml rename to tests/qemuxmlconfdata/pv-spinlock-disabled.xml diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args b/tests/qemuxmlconfdata/pv-spinlock-enabled.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args rename to tests/qemuxmlconfdata/pv-spinlock-enabled.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.xml b/tests/qemuxmlconfdata/pv-spinlock-enabled.xml similarity index 100% rename from tests/qemuxml2argvdata/pv-spinlock-enabled.xml rename to tests/qemuxmlconfdata/pv-spinlock-enabled.xml diff --git a/tests/qemuxml2argvdata/pvpanic-pci-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pvpanic-pci-aarch64.aarch64-latest.args rename to tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/pvpanic-pci-aarch64.xml b/tests/qemuxmlconfdata/pvpanic-pci-aarch64.xml similarity index 100% rename from tests/qemuxml2argvdata/pvpanic-pci-aarch64.xml rename to tests/qemuxmlconfdata/pvpanic-pci-aarch64.xml diff --git a/tests/qemuxml2argvdata/pvpanic-pci-invalid-address-aarch64.aarch64-latest.err b/tests/qemuxmlconfdata/pvpanic-pci-invalid-address-aarch64.aarch64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pvpanic-pci-invalid-address-aarch64.aarch64-latest.err rename to tests/qemuxmlconfdata/pvpanic-pci-invalid-address-aarch64.aarch64-latest.err diff --git a/tests/qemuxml2argvdata/pvpanic-pci-invalid-address-aarch64.xml b/tests/qemuxmlconfdata/pvpanic-pci-invalid-address-aarch64.xml similarity index 100% rename from tests/qemuxml2argvdata/pvpanic-pci-invalid-address-aarch64.xml rename to tests/qemuxmlconfdata/pvpanic-pci-invalid-address-aarch64.xml diff --git a/tests/qemuxml2argvdata/pvpanic-pci-no-address-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pvpanic-pci-no-address-aarch64.aarch64-latest.args rename to tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/pvpanic-pci-no-address-aarch64.xml b/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.xml similarity index 100% rename from tests/qemuxml2argvdata/pvpanic-pci-no-address-aarch64.xml rename to tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.xml diff --git a/tests/qemuxml2argvdata/pvpanic-pci-x86_64.x86_64-latest.args b/tests/qemuxmlconfdata/pvpanic-pci-x86_64.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/pvpanic-pci-x86_64.x86_64-latest.args rename to tests/qemuxmlconfdata/pvpanic-pci-x86_64.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/pvpanic-pci-x86_64.xml b/tests/qemuxmlconfdata/pvpanic-pci-x86_64.xml similarity index 100% rename from tests/qemuxml2argvdata/pvpanic-pci-x86_64.xml rename to tests/qemuxmlconfdata/pvpanic-pci-x86_64.xml diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.args b/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.args rename to tests/qemuxmlconfdata/q35-default-devices-only.x86_64-4.2.0.args diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-latest.args b/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/q35-default-devices-only.x86_64-latest.args rename to tests/qemuxmlconfdata/q35-default-devices-only.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.xml b/tests/qemuxmlconfdata/q35-default-devices-only.xml similarity index 100% rename from tests/qemuxml2argvdata/q35-default-devices-only.xml rename to tests/qemuxmlconfdata/q35-default-devices-only.xml diff --git a/tests/qemuxml2argvdata/q35-dmi-bad-address1.x86_64-latest.err b/tests/qemuxmlconfdata/q35-dmi-bad-address1.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/q35-dmi-bad-address1.x86_64-latest.err rename to tests/qemuxmlconfdata/q35-dmi-bad-address1.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/q35-dmi-bad-address1.xml b/tests/qemuxmlconfdata/q35-dmi-bad-address1.xml similarity index 100% rename from tests/qemuxml2argvdata/q35-dmi-bad-address1.xml rename to tests/qemuxmlconfdata/q35-dmi-bad-address1.xml diff --git a/tests/qemuxml2argvdata/q35-dmi-bad-address2.x86_64-latest.err b/tests/qemuxmlconfdata/q35-dmi-bad-address2.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/q35-dmi-bad-address2.x86_64-latest.err rename to tests/qemuxmlconfdata/q35-dmi-bad-address2.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/q35-dmi-bad-address2.xml b/tests/qemuxmlconfdata/q35-dmi-bad-address2.xml similarity index 100% rename from tests/qemuxml2argvdata/q35-dmi-bad-address2.xml rename to tests/qemuxmlconfdata/q35-dmi-bad-address2.xml diff --git a/tests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args b/tests/qemuxmlconfdata/q35-multifunction.x86_64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args rename to tests/qemuxmlconfdata/q35-multifunction.x86_64-4.2.0.args diff --git a/tests/qemuxml2argvdata/q35-multifunction.x86_64-latest.args b/tests/qemuxmlconfdata/q35-multifunction.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/q35-multifunction.x86_64-latest.args rename to tests/qemuxmlconfdata/q35-multifunction.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/q35-multifunction.xml b/tests/qemuxmlconfdata/q35-multifunction.xml similarity index 100% rename from tests/qemuxml2argvdata/q35-multifunction.xml rename to tests/qemuxmlconfdata/q35-multifunction.xml diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.x86_64-latest.args b/tests/qemuxmlconfdata/q35-pci-force-address.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/q35-pci-force-address.x86_64-latest.args rename to tests/qemuxmlconfdata/q35-pci-force-address.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.xml b/tests/qemuxmlconfdata/q35-pci-force-address.xml similarity index 100% rename from tests/qemuxml2argvdata/q35-pci-force-address.xml rename to tests/qemuxmlconfdata/q35-pci-force-address.xml diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args b/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args rename to tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-4.2.0.args diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args b/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args rename to tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.xml b/tests/qemuxmlconfdata/q35-pcie-autoadd.xml similarity index 100% rename from tests/qemuxml2argvdata/q35-pcie-autoadd.xml rename to tests/qemuxmlconfdata/q35-pcie-autoadd.xml diff --git a/tests/qemuxml2argvdata/q35-pcie.x86_64-4.2.0.args b/tests/qemuxmlconfdata/q35-pcie.x86_64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/q35-pcie.x86_64-4.2.0.args rename to tests/qemuxmlconfdata/q35-pcie.x86_64-4.2.0.args diff --git a/tests/qemuxml2argvdata/q35-pcie.x86_64-latest.args b/tests/qemuxmlconfdata/q35-pcie.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/q35-pcie.x86_64-latest.args rename to tests/qemuxmlconfdata/q35-pcie.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/q35-pcie.xml b/tests/qemuxmlconfdata/q35-pcie.xml similarity index 100% rename from tests/qemuxml2argvdata/q35-pcie.xml rename to tests/qemuxmlconfdata/q35-pcie.xml diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.x86_64-latest.args b/tests/qemuxmlconfdata/q35-usb2-multi.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/q35-usb2-multi.x86_64-latest.args rename to tests/qemuxmlconfdata/q35-usb2-multi.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.xml b/tests/qemuxmlconfdata/q35-usb2-multi.xml similarity index 100% rename from tests/qemuxml2argvdata/q35-usb2-multi.xml rename to tests/qemuxmlconfdata/q35-usb2-multi.xml diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.x86_64-latest.args b/tests/qemuxmlconfdata/q35-usb2-reorder.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/q35-usb2-reorder.x86_64-latest.args rename to tests/qemuxmlconfdata/q35-usb2-reorder.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.xml b/tests/qemuxmlconfdata/q35-usb2-reorder.xml similarity index 100% rename from tests/qemuxml2argvdata/q35-usb2-reorder.xml rename to tests/qemuxmlconfdata/q35-usb2-reorder.xml diff --git a/tests/qemuxml2argvdata/q35-usb2.x86_64-latest.args b/tests/qemuxmlconfdata/q35-usb2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/q35-usb2.x86_64-latest.args rename to tests/qemuxmlconfdata/q35-usb2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/q35-usb2.xml b/tests/qemuxmlconfdata/q35-usb2.xml similarity index 100% rename from tests/qemuxml2argvdata/q35-usb2.xml rename to tests/qemuxmlconfdata/q35-usb2.xml diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.args b/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.args rename to tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-4.2.0.args diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.args b/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.args rename to tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.xml b/tests/qemuxmlconfdata/q35-virt-manager-basic.xml similarity index 100% rename from tests/qemuxml2argvdata/q35-virt-manager-basic.xml rename to tests/qemuxmlconfdata/q35-virt-manager-basic.xml diff --git a/tests/qemuxml2argvdata/q35-wrong-root.x86_64-latest.err b/tests/qemuxmlconfdata/q35-wrong-root.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/q35-wrong-root.x86_64-latest.err rename to tests/qemuxmlconfdata/q35-wrong-root.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/q35-wrong-root.xml b/tests/qemuxmlconfdata/q35-wrong-root.xml similarity index 100% rename from tests/qemuxml2argvdata/q35-wrong-root.xml rename to tests/qemuxmlconfdata/q35-wrong-root.xml diff --git a/tests/qemuxml2argvdata/q35.x86_64-latest.args b/tests/qemuxmlconfdata/q35.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/q35.x86_64-latest.args rename to tests/qemuxmlconfdata/q35.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/q35.xml b/tests/qemuxmlconfdata/q35.xml similarity index 100% rename from tests/qemuxml2argvdata/q35.xml rename to tests/qemuxmlconfdata/q35.xml diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns-alt.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-alt.x86_64-latest.args rename to tests/qemuxmlconfdata/qemu-ns-alt.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.xml b/tests/qemuxmlconfdata/qemu-ns-alt.xml similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-alt.xml rename to tests/qemuxmlconfdata/qemu-ns-alt.xml diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns-commandline-ns0.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-commandline-ns0.x86_64-latest.args rename to tests/qemuxmlconfdata/qemu-ns-commandline-ns0.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml b/tests/qemuxmlconfdata/qemu-ns-commandline-ns0.xml similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-commandline-ns0.xml rename to tests/qemuxmlconfdata/qemu-ns-commandline-ns0.xml diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns-commandline-ns1.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-commandline-ns1.x86_64-latest.args rename to tests/qemuxmlconfdata/qemu-ns-commandline-ns1.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml b/tests/qemuxmlconfdata/qemu-ns-commandline-ns1.xml similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-commandline-ns1.xml rename to tests/qemuxmlconfdata/qemu-ns-commandline-ns1.xml diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns-commandline.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-commandline.x86_64-latest.args rename to tests/qemuxmlconfdata/qemu-ns-commandline.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.xml b/tests/qemuxmlconfdata/qemu-ns-commandline.xml similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-commandline.xml rename to tests/qemuxmlconfdata/qemu-ns-commandline.xml diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns-domain-commandline-ns0.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.x86_64-latest.args rename to tests/qemuxmlconfdata/qemu-ns-domain-commandline-ns0.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml b/tests/qemuxmlconfdata/qemu-ns-domain-commandline-ns0.xml similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.xml rename to tests/qemuxmlconfdata/qemu-ns-domain-commandline-ns0.xml diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns-domain-commandline.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-domain-commandline.x86_64-latest.args rename to tests/qemuxmlconfdata/qemu-ns-domain-commandline.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml b/tests/qemuxmlconfdata/qemu-ns-domain-commandline.xml similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-domain-commandline.xml rename to tests/qemuxmlconfdata/qemu-ns-domain-commandline.xml diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns-domain-ns0.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-domain-ns0.x86_64-latest.args rename to tests/qemuxmlconfdata/qemu-ns-domain-ns0.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml b/tests/qemuxmlconfdata/qemu-ns-domain-ns0.xml similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml rename to tests/qemuxmlconfdata/qemu-ns-domain-ns0.xml diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns-no-env.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-no-env.x86_64-latest.args rename to tests/qemuxmlconfdata/qemu-ns-no-env.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.xml b/tests/qemuxmlconfdata/qemu-ns-no-env.xml similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns-no-env.xml rename to tests/qemuxmlconfdata/qemu-ns-no-env.xml diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args rename to tests/qemuxmlconfdata/qemu-ns.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/qemu-ns.xml b/tests/qemuxmlconfdata/qemu-ns.xml similarity index 100% rename from tests/qemuxml2argvdata/qemu-ns.xml rename to tests/qemuxmlconfdata/qemu-ns.xml diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.x86_64-latest.args b/tests/qemuxmlconfdata/reboot-timeout-disabled.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/reboot-timeout-disabled.x86_64-latest.args rename to tests/qemuxmlconfdata/reboot-timeout-disabled.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.xml b/tests/qemuxmlconfdata/reboot-timeout-disabled.xml similarity index 100% rename from tests/qemuxml2argvdata/reboot-timeout-disabled.xml rename to tests/qemuxmlconfdata/reboot-timeout-disabled.xml diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.x86_64-latest.args b/tests/qemuxmlconfdata/reboot-timeout-enabled.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/reboot-timeout-enabled.x86_64-latest.args rename to tests/qemuxmlconfdata/reboot-timeout-enabled.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.xml b/tests/qemuxmlconfdata/reboot-timeout-enabled.xml similarity index 100% rename from tests/qemuxml2argvdata/reboot-timeout-enabled.xml rename to tests/qemuxmlconfdata/reboot-timeout-enabled.xml diff --git a/tests/qemuxml2argvdata/restore-v2-fd.x86_64-latest.args b/tests/qemuxmlconfdata/restore-v2-fd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/restore-v2-fd.x86_64-latest.args rename to tests/qemuxmlconfdata/restore-v2-fd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/restore-v2-fd.xml b/tests/qemuxmlconfdata/restore-v2-fd.xml similarity index 100% rename from tests/qemuxml2argvdata/restore-v2-fd.xml rename to tests/qemuxmlconfdata/restore-v2-fd.xml diff --git a/tests/qemuxml2argvdata/restore-v2.x86_64-latest.args b/tests/qemuxmlconfdata/restore-v2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/restore-v2.x86_64-latest.args rename to tests/qemuxmlconfdata/restore-v2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/restore-v2.xml b/tests/qemuxmlconfdata/restore-v2.xml similarity index 100% rename from tests/qemuxml2argvdata/restore-v2.xml rename to tests/qemuxmlconfdata/restore-v2.xml diff --git a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args b/tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args rename to tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.args diff --git a/tests/qemuxml2argvdata/riscv64-virt-graphics.xml b/tests/qemuxmlconfdata/riscv64-virt-graphics.xml similarity index 100% rename from tests/qemuxml2argvdata/riscv64-virt-graphics.xml rename to tests/qemuxmlconfdata/riscv64-virt-graphics.xml diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless-mmio.riscv64-latest.args b/tests/qemuxmlconfdata/riscv64-virt-headless-mmio.riscv64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/riscv64-virt-headless-mmio.riscv64-latest.args rename to tests/qemuxmlconfdata/riscv64-virt-headless-mmio.riscv64-latest.args diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless-mmio.xml b/tests/qemuxmlconfdata/riscv64-virt-headless-mmio.xml similarity index 100% rename from tests/qemuxml2argvdata/riscv64-virt-headless-mmio.xml rename to tests/qemuxmlconfdata/riscv64-virt-headless-mmio.xml diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args b/tests/qemuxmlconfdata/riscv64-virt-headless.riscv64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args rename to tests/qemuxmlconfdata/riscv64-virt-headless.riscv64-latest.args diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless.xml b/tests/qemuxmlconfdata/riscv64-virt-headless.xml similarity index 100% rename from tests/qemuxml2argvdata/riscv64-virt-headless.xml rename to tests/qemuxmlconfdata/riscv64-virt-headless.xml diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-latest.args b/tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-latest.args rename to tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.xml b/tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.xml similarity index 100% rename from tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.xml rename to tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.xml diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args b/tests/qemuxmlconfdata/s390-allow-bogus-usb-none.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args rename to tests/qemuxmlconfdata/s390-allow-bogus-usb-none.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.xml b/tests/qemuxmlconfdata/s390-allow-bogus-usb-none.xml similarity index 100% rename from tests/qemuxml2argvdata/s390-allow-bogus-usb-none.xml rename to tests/qemuxmlconfdata/s390-allow-bogus-usb-none.xml diff --git a/tests/qemuxml2argvdata/s390-async-teardown-disabled.s390x-6.0.0.args b/tests/qemuxmlconfdata/s390-async-teardown-disabled.s390x-6.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/s390-async-teardown-disabled.s390x-6.0.0.args rename to tests/qemuxmlconfdata/s390-async-teardown-disabled.s390x-6.0.0.args diff --git a/tests/qemuxml2argvdata/s390-async-teardown-disabled.s390x-latest.args b/tests/qemuxmlconfdata/s390-async-teardown-disabled.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/s390-async-teardown-disabled.s390x-latest.args rename to tests/qemuxmlconfdata/s390-async-teardown-disabled.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-async-teardown-disabled.xml b/tests/qemuxmlconfdata/s390-async-teardown-disabled.xml similarity index 100% rename from tests/qemuxml2argvdata/s390-async-teardown-disabled.xml rename to tests/qemuxmlconfdata/s390-async-teardown-disabled.xml diff --git a/tests/qemuxml2argvdata/s390-async-teardown-no-attrib.s390x-latest.args b/tests/qemuxmlconfdata/s390-async-teardown-no-attrib.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/s390-async-teardown-no-attrib.s390x-latest.args rename to tests/qemuxmlconfdata/s390-async-teardown-no-attrib.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-async-teardown-no-attrib.xml b/tests/qemuxmlconfdata/s390-async-teardown-no-attrib.xml similarity index 100% rename from tests/qemuxml2argvdata/s390-async-teardown-no-attrib.xml rename to tests/qemuxmlconfdata/s390-async-teardown-no-attrib.xml diff --git a/tests/qemuxml2argvdata/s390-async-teardown.s390x-6.0.0.err b/tests/qemuxmlconfdata/s390-async-teardown.s390x-6.0.0.err similarity index 100% rename from tests/qemuxml2argvdata/s390-async-teardown.s390x-6.0.0.err rename to tests/qemuxmlconfdata/s390-async-teardown.s390x-6.0.0.err diff --git a/tests/qemuxml2argvdata/s390-async-teardown.s390x-latest.args b/tests/qemuxmlconfdata/s390-async-teardown.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/s390-async-teardown.s390x-latest.args rename to tests/qemuxmlconfdata/s390-async-teardown.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-async-teardown.xml b/tests/qemuxmlconfdata/s390-async-teardown.xml similarity index 100% rename from tests/qemuxml2argvdata/s390-async-teardown.xml rename to tests/qemuxmlconfdata/s390-async-teardown.xml diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args rename to tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.xml b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.xml similarity index 100% rename from tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.xml rename to tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-2.7.xml diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args rename to tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.xml b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.xml similarity index 100% rename from tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.xml rename to tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.xml diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args rename to tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.xml b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.xml similarity index 100% rename from tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.xml rename to tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-2.7.xml diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args rename to tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.xml b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.xml similarity index 100% rename from tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.xml rename to tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.xml diff --git a/tests/qemuxml2argvdata/s390-defaultconsole.s390x-latest.args b/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/s390-defaultconsole.s390x-latest.args rename to tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-defaultconsole.xml b/tests/qemuxmlconfdata/s390-defaultconsole.xml similarity index 100% rename from tests/qemuxml2argvdata/s390-defaultconsole.xml rename to tests/qemuxmlconfdata/s390-defaultconsole.xml diff --git a/tests/qemuxml2argvdata/s390-no-parallel.s390x-latest.err b/tests/qemuxmlconfdata/s390-no-parallel.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/s390-no-parallel.s390x-latest.err rename to tests/qemuxmlconfdata/s390-no-parallel.s390x-latest.err diff --git a/tests/qemuxml2argvdata/s390-no-parallel.xml b/tests/qemuxmlconfdata/s390-no-parallel.xml similarity index 100% rename from tests/qemuxml2argvdata/s390-no-parallel.xml rename to tests/qemuxmlconfdata/s390-no-parallel.xml diff --git a/tests/qemuxml2argvdata/s390-panic-address.s390x-latest.err b/tests/qemuxmlconfdata/s390-panic-address.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/s390-panic-address.s390x-latest.err rename to tests/qemuxmlconfdata/s390-panic-address.s390x-latest.err diff --git a/tests/qemuxml2argvdata/s390-panic-address.xml b/tests/qemuxmlconfdata/s390-panic-address.xml similarity index 100% rename from tests/qemuxml2argvdata/s390-panic-address.xml rename to tests/qemuxmlconfdata/s390-panic-address.xml diff --git a/tests/qemuxml2argvdata/s390-panic-missing.s390x-latest.args b/tests/qemuxmlconfdata/s390-panic-missing.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/s390-panic-missing.s390x-latest.args rename to tests/qemuxmlconfdata/s390-panic-missing.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-panic-missing.xml b/tests/qemuxmlconfdata/s390-panic-missing.xml similarity index 100% rename from tests/qemuxml2argvdata/s390-panic-missing.xml rename to tests/qemuxmlconfdata/s390-panic-missing.xml diff --git a/tests/qemuxml2argvdata/s390-panic-no-address.s390x-latest.args b/tests/qemuxmlconfdata/s390-panic-no-address.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/s390-panic-no-address.s390x-latest.args rename to tests/qemuxmlconfdata/s390-panic-no-address.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-panic-no-address.xml b/tests/qemuxmlconfdata/s390-panic-no-address.xml similarity index 100% rename from tests/qemuxml2argvdata/s390-panic-no-address.xml rename to tests/qemuxmlconfdata/s390-panic-no-address.xml diff --git a/tests/qemuxml2argvdata/s390-panic.s390x-latest.args b/tests/qemuxmlconfdata/s390-panic.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/s390-panic.s390x-latest.args rename to tests/qemuxmlconfdata/s390-panic.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-panic.xml b/tests/qemuxmlconfdata/s390-panic.xml similarity index 100% rename from tests/qemuxml2argvdata/s390-panic.xml rename to tests/qemuxmlconfdata/s390-panic.xml diff --git a/tests/qemuxml2argvdata/s390-serial-2.s390x-latest.args b/tests/qemuxmlconfdata/s390-serial-2.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/s390-serial-2.s390x-latest.args rename to tests/qemuxmlconfdata/s390-serial-2.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-serial-2.xml b/tests/qemuxmlconfdata/s390-serial-2.xml similarity index 100% rename from tests/qemuxml2argvdata/s390-serial-2.xml rename to tests/qemuxmlconfdata/s390-serial-2.xml diff --git a/tests/qemuxml2argvdata/s390-serial-console.s390x-latest.args b/tests/qemuxmlconfdata/s390-serial-console.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/s390-serial-console.s390x-latest.args rename to tests/qemuxmlconfdata/s390-serial-console.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-serial-console.xml b/tests/qemuxmlconfdata/s390-serial-console.xml similarity index 100% rename from tests/qemuxml2argvdata/s390-serial-console.xml rename to tests/qemuxmlconfdata/s390-serial-console.xml diff --git a/tests/qemuxml2argvdata/s390-serial.s390x-latest.args b/tests/qemuxmlconfdata/s390-serial.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/s390-serial.s390x-latest.args rename to tests/qemuxmlconfdata/s390-serial.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-serial.xml b/tests/qemuxmlconfdata/s390-serial.xml similarity index 100% rename from tests/qemuxml2argvdata/s390-serial.xml rename to tests/qemuxmlconfdata/s390-serial.xml diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/tests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args rename to tests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.xml b/tests/qemuxmlconfdata/s390x-ccw-graphics.xml similarity index 100% rename from tests/qemuxml2argvdata/s390x-ccw-graphics.xml rename to tests/qemuxmlconfdata/s390x-ccw-graphics.xml diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args b/tests/qemuxmlconfdata/s390x-ccw-headless.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args rename to tests/qemuxmlconfdata/s390x-ccw-headless.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.xml b/tests/qemuxmlconfdata/s390x-ccw-headless.xml similarity index 100% rename from tests/qemuxml2argvdata/s390x-ccw-headless.xml rename to tests/qemuxmlconfdata/s390x-ccw-headless.xml diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dac-none.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dac-none.x86_64-latest.args rename to tests/qemuxmlconfdata/seclabel-dac-none.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.xml b/tests/qemuxmlconfdata/seclabel-dac-none.xml similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dac-none.xml rename to tests/qemuxmlconfdata/seclabel-dac-none.xml diff --git a/tests/qemuxml2argvdata/seclabel-device-duplicates.x86_64-latest.err b/tests/qemuxmlconfdata/seclabel-device-duplicates.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/seclabel-device-duplicates.x86_64-latest.err rename to tests/qemuxmlconfdata/seclabel-device-duplicates.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/seclabel-device-duplicates.xml b/tests/qemuxmlconfdata/seclabel-device-duplicates.xml similarity index 100% rename from tests/qemuxml2argvdata/seclabel-device-duplicates.xml rename to tests/qemuxmlconfdata/seclabel-device-duplicates.xml diff --git a/tests/qemuxml2argvdata/seclabel-device-multiple.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-device-multiple.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-device-multiple.x86_64-latest.args rename to tests/qemuxmlconfdata/seclabel-device-multiple.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-device-multiple.xml b/tests/qemuxmlconfdata/seclabel-device-multiple.xml similarity index 100% rename from tests/qemuxml2argvdata/seclabel-device-multiple.xml rename to tests/qemuxmlconfdata/seclabel-device-multiple.xml diff --git a/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/seclabel-device-relabel-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/seclabel-device-relabel-invalid.x86_64-latest.err rename to tests/qemuxmlconfdata/seclabel-device-relabel-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml b/tests/qemuxmlconfdata/seclabel-device-relabel-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml rename to tests/qemuxmlconfdata/seclabel-device-relabel-invalid.xml diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic-baselabel.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic-baselabel.x86_64-latest.args rename to tests/qemuxmlconfdata/seclabel-dynamic-baselabel.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml b/tests/qemuxmlconfdata/seclabel-dynamic-baselabel.xml similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic-baselabel.xml rename to tests/qemuxmlconfdata/seclabel-dynamic-baselabel.xml diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic-labelskip.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic-labelskip.x86_64-latest.args rename to tests/qemuxmlconfdata/seclabel-dynamic-labelskip.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml b/tests/qemuxmlconfdata/seclabel-dynamic-labelskip.xml similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic-labelskip.xml rename to tests/qemuxmlconfdata/seclabel-dynamic-labelskip.xml diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic-none-relabel.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.x86_64-latest.args rename to tests/qemuxmlconfdata/seclabel-dynamic-none-relabel.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.xml b/tests/qemuxmlconfdata/seclabel-dynamic-none-relabel.xml similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic-none-relabel.xml rename to tests/qemuxmlconfdata/seclabel-dynamic-none-relabel.xml diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-none.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic-none.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic-none.x86_64-latest.args rename to tests/qemuxmlconfdata/seclabel-dynamic-none.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-none.xml b/tests/qemuxmlconfdata/seclabel-dynamic-none.xml similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic-none.xml rename to tests/qemuxmlconfdata/seclabel-dynamic-none.xml diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic-override.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic-override.x86_64-latest.args rename to tests/qemuxmlconfdata/seclabel-dynamic-override.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.xml b/tests/qemuxmlconfdata/seclabel-dynamic-override.xml similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic-override.xml rename to tests/qemuxmlconfdata/seclabel-dynamic-override.xml diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic-relabel.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic-relabel.x86_64-latest.args rename to tests/qemuxmlconfdata/seclabel-dynamic-relabel.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml b/tests/qemuxmlconfdata/seclabel-dynamic-relabel.xml similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic-relabel.xml rename to tests/qemuxmlconfdata/seclabel-dynamic-relabel.xml diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic.x86_64-latest.args rename to tests/qemuxmlconfdata/seclabel-dynamic.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.xml b/tests/qemuxmlconfdata/seclabel-dynamic.xml similarity index 100% rename from tests/qemuxml2argvdata/seclabel-dynamic.xml rename to tests/qemuxmlconfdata/seclabel-dynamic.xml diff --git a/tests/qemuxml2argvdata/seclabel-multiple.x86_64-latest.err b/tests/qemuxmlconfdata/seclabel-multiple.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/seclabel-multiple.x86_64-latest.err rename to tests/qemuxmlconfdata/seclabel-multiple.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/seclabel-multiple.xml b/tests/qemuxmlconfdata/seclabel-multiple.xml similarity index 100% rename from tests/qemuxml2argvdata/seclabel-multiple.xml rename to tests/qemuxmlconfdata/seclabel-multiple.xml diff --git a/tests/qemuxml2argvdata/seclabel-none.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-none.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-none.x86_64-latest.args rename to tests/qemuxmlconfdata/seclabel-none.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-none.xml b/tests/qemuxmlconfdata/seclabel-none.xml similarity index 100% rename from tests/qemuxml2argvdata/seclabel-none.xml rename to tests/qemuxmlconfdata/seclabel-none.xml diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-static-labelskip.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-static-labelskip.x86_64-latest.args rename to tests/qemuxmlconfdata/seclabel-static-labelskip.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.xml b/tests/qemuxmlconfdata/seclabel-static-labelskip.xml similarity index 100% rename from tests/qemuxml2argvdata/seclabel-static-labelskip.xml rename to tests/qemuxmlconfdata/seclabel-static-labelskip.xml diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-static-relabel.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-static-relabel.x86_64-latest.args rename to tests/qemuxmlconfdata/seclabel-static-relabel.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.xml b/tests/qemuxmlconfdata/seclabel-static-relabel.xml similarity index 100% rename from tests/qemuxml2argvdata/seclabel-static-relabel.xml rename to tests/qemuxmlconfdata/seclabel-static-relabel.xml diff --git a/tests/qemuxml2argvdata/seclabel-static.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-static.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/seclabel-static.x86_64-latest.args rename to tests/qemuxmlconfdata/seclabel-static.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/seclabel-static.xml b/tests/qemuxmlconfdata/seclabel-static.xml similarity index 100% rename from tests/qemuxml2argvdata/seclabel-static.xml rename to tests/qemuxmlconfdata/seclabel-static.xml diff --git a/tests/qemuxml2argvdata/serial-debugcon.x86_64-latest.args b/tests/qemuxmlconfdata/serial-debugcon.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/serial-debugcon.x86_64-latest.args rename to tests/qemuxmlconfdata/serial-debugcon.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/serial-debugcon.xml b/tests/qemuxmlconfdata/serial-debugcon.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-debugcon.xml rename to tests/qemuxmlconfdata/serial-debugcon.xml diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args b/tests/qemuxmlconfdata/serial-dev-chardev-iobase.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args rename to tests/qemuxmlconfdata/serial-dev-chardev-iobase.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.xml b/tests/qemuxmlconfdata/serial-dev-chardev-iobase.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-dev-chardev-iobase.xml rename to tests/qemuxmlconfdata/serial-dev-chardev-iobase.xml diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-dev-chardev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args rename to tests/qemuxmlconfdata/serial-dev-chardev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.xml b/tests/qemuxmlconfdata/serial-dev-chardev.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-dev-chardev.xml rename to tests/qemuxmlconfdata/serial-dev-chardev.xml diff --git a/tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args rename to tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/serial-file-chardev.xml b/tests/qemuxmlconfdata/serial-file-chardev.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-file-chardev.xml rename to tests/qemuxmlconfdata/serial-file-chardev.xml diff --git a/tests/qemuxml2argvdata/serial-file-log.x86_64-latest.args b/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/serial-file-log.x86_64-latest.args rename to tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/serial-file-log.xml b/tests/qemuxmlconfdata/serial-file-log.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-file-log.xml rename to tests/qemuxmlconfdata/serial-file-log.xml diff --git a/tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args rename to tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/serial-many-chardev.xml b/tests/qemuxmlconfdata/serial-many-chardev.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-many-chardev.xml rename to tests/qemuxmlconfdata/serial-many-chardev.xml diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-pty-chardev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args rename to tests/qemuxmlconfdata/serial-pty-chardev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.xml b/tests/qemuxmlconfdata/serial-pty-chardev.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-pty-chardev.xml rename to tests/qemuxmlconfdata/serial-pty-chardev.xml diff --git a/tests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args b/tests/qemuxmlconfdata/serial-spiceport.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args rename to tests/qemuxmlconfdata/serial-spiceport.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/serial-spiceport.xml b/tests/qemuxmlconfdata/serial-spiceport.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-spiceport.xml rename to tests/qemuxmlconfdata/serial-spiceport.xml diff --git a/tests/qemuxml2argvdata/serial-target-port-auto.x86_64-latest.args b/tests/qemuxmlconfdata/serial-target-port-auto.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/serial-target-port-auto.x86_64-latest.args rename to tests/qemuxmlconfdata/serial-target-port-auto.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/serial-target-port-auto.xml b/tests/qemuxmlconfdata/serial-target-port-auto.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-target-port-auto.xml rename to tests/qemuxmlconfdata/serial-target-port-auto.xml diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-tcp-chardev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args rename to tests/qemuxmlconfdata/serial-tcp-chardev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.xml b/tests/qemuxmlconfdata/serial-tcp-chardev.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-tcp-chardev.xml rename to tests/qemuxmlconfdata/serial-tcp-chardev.xml diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-tcp-telnet-chardev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest.args rename to tests/qemuxmlconfdata/serial-tcp-telnet-chardev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.xml b/tests/qemuxmlconfdata/serial-tcp-telnet-chardev.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-tcp-telnet-chardev.xml rename to tests/qemuxmlconfdata/serial-tcp-telnet-chardev.xml diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.args b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.args rename to tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-notls.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml rename to tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-notls.xml diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x86_64-latest.args b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-verify.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x86_64-latest.args rename to tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-verify.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-verify.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml rename to tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-verify.xml diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-latest.args rename to tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml rename to tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev.xml diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest.args rename to tests/qemuxmlconfdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml b/tests/qemuxmlconfdata/serial-tcp-tlsx509-secret-chardev.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml rename to tests/qemuxmlconfdata/serial-tcp-tlsx509-secret-chardev.xml diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-udp-chardev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args rename to tests/qemuxmlconfdata/serial-udp-chardev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.xml b/tests/qemuxmlconfdata/serial-udp-chardev.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-udp-chardev.xml rename to tests/qemuxmlconfdata/serial-udp-chardev.xml diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args rename to tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.xml b/tests/qemuxmlconfdata/serial-unix-chardev.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-unix-chardev.xml rename to tests/qemuxmlconfdata/serial-unix-chardev.xml diff --git a/tests/qemuxml2argvdata/serial-unix-missing-source.x86_64-latest.err b/tests/qemuxmlconfdata/serial-unix-missing-source.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/serial-unix-missing-source.x86_64-latest.err rename to tests/qemuxmlconfdata/serial-unix-missing-source.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/serial-unix-missing-source.xml b/tests/qemuxmlconfdata/serial-unix-missing-source.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-unix-missing-source.xml rename to tests/qemuxmlconfdata/serial-unix-missing-source.xml diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-vc-chardev.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args rename to tests/qemuxmlconfdata/serial-vc-chardev.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.xml b/tests/qemuxmlconfdata/serial-vc-chardev.xml similarity index 100% rename from tests/qemuxml2argvdata/serial-vc-chardev.xml rename to tests/qemuxmlconfdata/serial-vc-chardev.xml diff --git a/tests/qemuxml2argvdata/sgx-epc.x86_64-7.0.0.args b/tests/qemuxmlconfdata/sgx-epc.x86_64-7.0.0.args similarity index 100% rename from tests/qemuxml2argvdata/sgx-epc.x86_64-7.0.0.args rename to tests/qemuxmlconfdata/sgx-epc.x86_64-7.0.0.args diff --git a/tests/qemuxml2argvdata/sgx-epc.xml b/tests/qemuxmlconfdata/sgx-epc.xml similarity index 100% rename from tests/qemuxml2argvdata/sgx-epc.xml rename to tests/qemuxmlconfdata/sgx-epc.xml diff --git a/tests/qemuxml2argvdata/shmem-invalid-address.x86_64-latest.err b/tests/qemuxmlconfdata/shmem-invalid-address.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/shmem-invalid-address.x86_64-latest.err rename to tests/qemuxmlconfdata/shmem-invalid-address.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/shmem-invalid-address.xml b/tests/qemuxmlconfdata/shmem-invalid-address.xml similarity index 100% rename from tests/qemuxml2argvdata/shmem-invalid-address.xml rename to tests/qemuxmlconfdata/shmem-invalid-address.xml diff --git a/tests/qemuxml2argvdata/shmem-invalid-size.x86_64-latest.err b/tests/qemuxmlconfdata/shmem-invalid-size.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/shmem-invalid-size.x86_64-latest.err rename to tests/qemuxmlconfdata/shmem-invalid-size.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/shmem-invalid-size.xml b/tests/qemuxmlconfdata/shmem-invalid-size.xml similarity index 100% rename from tests/qemuxml2argvdata/shmem-invalid-size.xml rename to tests/qemuxmlconfdata/shmem-invalid-size.xml diff --git a/tests/qemuxml2argvdata/shmem-msi-only.x86_64-latest.err b/tests/qemuxmlconfdata/shmem-msi-only.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/shmem-msi-only.x86_64-latest.err rename to tests/qemuxmlconfdata/shmem-msi-only.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/shmem-msi-only.xml b/tests/qemuxmlconfdata/shmem-msi-only.xml similarity index 100% rename from tests/qemuxml2argvdata/shmem-msi-only.xml rename to tests/qemuxmlconfdata/shmem-msi-only.xml diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.x86_64-latest.args b/tests/qemuxmlconfdata/shmem-plain-doorbell.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/shmem-plain-doorbell.x86_64-latest.args rename to tests/qemuxmlconfdata/shmem-plain-doorbell.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.xml b/tests/qemuxmlconfdata/shmem-plain-doorbell.xml similarity index 100% rename from tests/qemuxml2argvdata/shmem-plain-doorbell.xml rename to tests/qemuxmlconfdata/shmem-plain-doorbell.xml diff --git a/tests/qemuxml2argvdata/shmem-small-size.x86_64-latest.err b/tests/qemuxmlconfdata/shmem-small-size.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/shmem-small-size.x86_64-latest.err rename to tests/qemuxmlconfdata/shmem-small-size.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/shmem-small-size.xml b/tests/qemuxmlconfdata/shmem-small-size.xml similarity index 100% rename from tests/qemuxml2argvdata/shmem-small-size.xml rename to tests/qemuxmlconfdata/shmem-small-size.xml diff --git a/tests/qemuxml2argvdata/smartcard-controller.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-controller.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/smartcard-controller.x86_64-latest.args rename to tests/qemuxmlconfdata/smartcard-controller.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/smartcard-controller.xml b/tests/qemuxmlconfdata/smartcard-controller.xml similarity index 100% rename from tests/qemuxml2argvdata/smartcard-controller.xml rename to tests/qemuxmlconfdata/smartcard-controller.xml diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-host-certificates-database.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/smartcard-host-certificates-database.x86_64-latest.args rename to tests/qemuxmlconfdata/smartcard-host-certificates-database.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.xml b/tests/qemuxmlconfdata/smartcard-host-certificates-database.xml similarity index 100% rename from tests/qemuxml2argvdata/smartcard-host-certificates-database.xml rename to tests/qemuxmlconfdata/smartcard-host-certificates-database.xml diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-host-certificates.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/smartcard-host-certificates.x86_64-latest.args rename to tests/qemuxmlconfdata/smartcard-host-certificates.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.xml b/tests/qemuxmlconfdata/smartcard-host-certificates.xml similarity index 100% rename from tests/qemuxml2argvdata/smartcard-host-certificates.xml rename to tests/qemuxmlconfdata/smartcard-host-certificates.xml diff --git a/tests/qemuxml2argvdata/smartcard-host.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-host.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/smartcard-host.x86_64-latest.args rename to tests/qemuxmlconfdata/smartcard-host.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/smartcard-host.xml b/tests/qemuxmlconfdata/smartcard-host.xml similarity index 100% rename from tests/qemuxml2argvdata/smartcard-host.xml rename to tests/qemuxmlconfdata/smartcard-host.xml diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-passthrough-spicevmc.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.x86_64-latest.args rename to tests/qemuxmlconfdata/smartcard-passthrough-spicevmc.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml b/tests/qemuxmlconfdata/smartcard-passthrough-spicevmc.xml similarity index 100% rename from tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.xml rename to tests/qemuxmlconfdata/smartcard-passthrough-spicevmc.xml diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-passthrough-tcp.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/smartcard-passthrough-tcp.x86_64-latest.args rename to tests/qemuxmlconfdata/smartcard-passthrough-tcp.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml b/tests/qemuxmlconfdata/smartcard-passthrough-tcp.xml similarity index 100% rename from tests/qemuxml2argvdata/smartcard-passthrough-tcp.xml rename to tests/qemuxmlconfdata/smartcard-passthrough-tcp.xml diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args rename to tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.xml b/tests/qemuxmlconfdata/smartcard-passthrough-unix.xml similarity index 100% rename from tests/qemuxml2argvdata/smartcard-passthrough-unix.xml rename to tests/qemuxmlconfdata/smartcard-passthrough-unix.xml diff --git a/tests/qemuxml2argvdata/smbios-date.x86_64-latest.err b/tests/qemuxmlconfdata/smbios-date.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/smbios-date.x86_64-latest.err rename to tests/qemuxmlconfdata/smbios-date.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/smbios-date.xml b/tests/qemuxmlconfdata/smbios-date.xml similarity index 100% rename from tests/qemuxml2argvdata/smbios-date.xml rename to tests/qemuxmlconfdata/smbios-date.xml diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.x86_64-latest.args b/tests/qemuxmlconfdata/smbios-type-fwcfg.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/smbios-type-fwcfg.x86_64-latest.args rename to tests/qemuxmlconfdata/smbios-type-fwcfg.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.xml b/tests/qemuxmlconfdata/smbios-type-fwcfg.xml similarity index 100% rename from tests/qemuxml2argvdata/smbios-type-fwcfg.xml rename to tests/qemuxmlconfdata/smbios-type-fwcfg.xml diff --git a/tests/qemuxml2argvdata/smbios-uuid-match.x86_64-latest.err b/tests/qemuxmlconfdata/smbios-uuid-match.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/smbios-uuid-match.x86_64-latest.err rename to tests/qemuxmlconfdata/smbios-uuid-match.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/smbios-uuid-match.xml b/tests/qemuxmlconfdata/smbios-uuid-match.xml similarity index 100% rename from tests/qemuxml2argvdata/smbios-uuid-match.xml rename to tests/qemuxmlconfdata/smbios-uuid-match.xml diff --git a/tests/qemuxml2argvdata/smbios.x86_64-latest.args b/tests/qemuxmlconfdata/smbios.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/smbios.x86_64-latest.args rename to tests/qemuxmlconfdata/smbios.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/smbios.xml b/tests/qemuxmlconfdata/smbios.xml similarity index 100% rename from tests/qemuxml2argvdata/smbios.xml rename to tests/qemuxmlconfdata/smbios.xml diff --git a/tests/qemuxml2argvdata/sound-device.x86_64-4.2.0.args b/tests/qemuxmlconfdata/sound-device.x86_64-4.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/sound-device.x86_64-4.2.0.args rename to tests/qemuxmlconfdata/sound-device.x86_64-4.2.0.args diff --git a/tests/qemuxml2argvdata/sound-device.x86_64-latest.args b/tests/qemuxmlconfdata/sound-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/sound-device.x86_64-latest.args rename to tests/qemuxmlconfdata/sound-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/sound-device.xml b/tests/qemuxmlconfdata/sound-device.xml similarity index 100% rename from tests/qemuxml2argvdata/sound-device.xml rename to tests/qemuxmlconfdata/sound-device.xml diff --git a/tests/qemuxml2argvdata/sparc-minimal.sparc-latest.args b/tests/qemuxmlconfdata/sparc-minimal.sparc-latest.args similarity index 100% rename from tests/qemuxml2argvdata/sparc-minimal.sparc-latest.args rename to tests/qemuxmlconfdata/sparc-minimal.sparc-latest.args diff --git a/tests/qemuxml2argvdata/sparc-minimal.xml b/tests/qemuxmlconfdata/sparc-minimal.xml similarity index 100% rename from tests/qemuxml2argvdata/sparc-minimal.xml rename to tests/qemuxmlconfdata/sparc-minimal.xml diff --git a/tests/qemuxml2argvdata/tap-vhost-incorrect.x86_64-latest.args b/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/tap-vhost-incorrect.x86_64-latest.args rename to tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/tap-vhost-incorrect.xml b/tests/qemuxmlconfdata/tap-vhost-incorrect.xml similarity index 100% rename from tests/qemuxml2argvdata/tap-vhost-incorrect.xml rename to tests/qemuxmlconfdata/tap-vhost-incorrect.xml diff --git a/tests/qemuxml2argvdata/tap-vhost.x86_64-latest.args b/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/tap-vhost.x86_64-latest.args rename to tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/tap-vhost.xml b/tests/qemuxmlconfdata/tap-vhost.xml similarity index 100% rename from tests/qemuxml2argvdata/tap-vhost.xml rename to tests/qemuxmlconfdata/tap-vhost.xml diff --git a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args b/tests/qemuxmlconfdata/tpm-emulator-spapr.ppc64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args rename to tests/qemuxmlconfdata/tpm-emulator-spapr.ppc64-latest.args diff --git a/tests/qemuxml2argvdata/tpm-emulator-spapr.xml b/tests/qemuxmlconfdata/tpm-emulator-spapr.xml similarity index 100% rename from tests/qemuxml2argvdata/tpm-emulator-spapr.xml rename to tests/qemuxmlconfdata/tpm-emulator-spapr.xml diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args rename to tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.xml b/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.xml similarity index 100% rename from tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.xml rename to tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.xml diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args rename to tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.xml b/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.xml similarity index 100% rename from tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.xml rename to tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.xml diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args rename to tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.err b/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.err rename to tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.xml b/tests/qemuxmlconfdata/tpm-emulator-tpm2.xml similarity index 100% rename from tests/qemuxml2argvdata/tpm-emulator-tpm2.xml rename to tests/qemuxmlconfdata/tpm-emulator-tpm2.xml diff --git a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args rename to tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.err b/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.err rename to tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/tpm-emulator.xml b/tests/qemuxmlconfdata/tpm-emulator.xml similarity index 100% rename from tests/qemuxml2argvdata/tpm-emulator.xml rename to tests/qemuxmlconfdata/tpm-emulator.xml diff --git a/tests/qemuxml2argvdata/tpm-external.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/tpm-external.x86_64-latest.args rename to tests/qemuxmlconfdata/tpm-external.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/tpm-external.xml b/tests/qemuxmlconfdata/tpm-external.xml similarity index 100% rename from tests/qemuxml2argvdata/tpm-external.xml rename to tests/qemuxmlconfdata/tpm-external.xml diff --git a/tests/qemuxml2argvdata/tpm-no-backend-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/tpm-no-backend-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/tpm-no-backend-invalid.x86_64-latest.err rename to tests/qemuxmlconfdata/tpm-no-backend-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/tpm-no-backend-invalid.xml b/tests/qemuxmlconfdata/tpm-no-backend-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/tpm-no-backend-invalid.xml rename to tests/qemuxmlconfdata/tpm-no-backend-invalid.xml diff --git a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args rename to tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/tpm-passthrough-crb.xml b/tests/qemuxmlconfdata/tpm-passthrough-crb.xml similarity index 100% rename from tests/qemuxml2argvdata/tpm-passthrough-crb.xml rename to tests/qemuxmlconfdata/tpm-passthrough-crb.xml diff --git a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args rename to tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/tpm-passthrough.xml b/tests/qemuxmlconfdata/tpm-passthrough.xml similarity index 100% rename from tests/qemuxml2argvdata/tpm-passthrough.xml rename to tests/qemuxmlconfdata/tpm-passthrough.xml diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args b/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args rename to tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.xml b/tests/qemuxmlconfdata/tseg-explicit-size.xml similarity index 100% rename from tests/qemuxml2argvdata/tseg-explicit-size.xml rename to tests/qemuxmlconfdata/tseg-explicit-size.xml diff --git a/tests/qemuxml2argvdata/tseg-i440fx.x86_64-latest.err b/tests/qemuxmlconfdata/tseg-i440fx.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/tseg-i440fx.x86_64-latest.err rename to tests/qemuxmlconfdata/tseg-i440fx.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/tseg-i440fx.xml b/tests/qemuxmlconfdata/tseg-i440fx.xml similarity index 100% rename from tests/qemuxml2argvdata/tseg-i440fx.xml rename to tests/qemuxmlconfdata/tseg-i440fx.xml diff --git a/tests/qemuxml2argvdata/tseg-invalid-size.x86_64-latest.err b/tests/qemuxmlconfdata/tseg-invalid-size.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/tseg-invalid-size.x86_64-latest.err rename to tests/qemuxmlconfdata/tseg-invalid-size.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/tseg-invalid-size.xml b/tests/qemuxmlconfdata/tseg-invalid-size.xml similarity index 100% rename from tests/qemuxml2argvdata/tseg-invalid-size.xml rename to tests/qemuxmlconfdata/tseg-invalid-size.xml diff --git a/tests/qemuxml2argvdata/usb-bus-missing.x86_64-latest.err b/tests/qemuxmlconfdata/usb-bus-missing.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-bus-missing.x86_64-latest.err rename to tests/qemuxmlconfdata/usb-bus-missing.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-bus-missing.xml b/tests/qemuxmlconfdata/usb-bus-missing.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-bus-missing.xml rename to tests/qemuxmlconfdata/usb-bus-missing.xml diff --git a/tests/qemuxml2argvdata/usb-controller-default-i440fx.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-default-i440fx.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-default-i440fx.xml b/tests/qemuxmlconfdata/usb-controller-default-i440fx.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-default-i440fx.xml rename to tests/qemuxmlconfdata/usb-controller-default-i440fx.xml diff --git a/tests/qemuxml2argvdata/usb-controller-default-isapc.x86_64-latest.err b/tests/qemuxmlconfdata/usb-controller-default-isapc.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-default-isapc.x86_64-latest.err rename to tests/qemuxmlconfdata/usb-controller-default-isapc.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-controller-default-isapc.xml b/tests/qemuxmlconfdata/usb-controller-default-isapc.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-default-isapc.xml rename to tests/qemuxmlconfdata/usb-controller-default-isapc.xml diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-q35.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-default-q35.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-controller-default-q35.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.xml b/tests/qemuxmlconfdata/usb-controller-default-q35.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-default-q35.xml rename to tests/qemuxmlconfdata/usb-controller-default-q35.xml diff --git a/tests/qemuxml2argvdata/usb-controller-default-unavailable-i440fx.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-unavailable-i440fx.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-default-unavailable-i440fx.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-controller-default-unavailable-i440fx.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-default-unavailable-i440fx.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-i440fx.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-default-unavailable-i440fx.xml rename to tests/qemuxmlconfdata/usb-controller-default-unavailable-i440fx.xml diff --git a/tests/qemuxml2argvdata/usb-controller-default-unavailable-q35.x86_64-latest.err b/tests/qemuxmlconfdata/usb-controller-default-unavailable-q35.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-default-unavailable-q35.x86_64-latest.err rename to tests/qemuxmlconfdata/usb-controller-default-unavailable-q35.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-controller-default-unavailable-q35.xml b/tests/qemuxmlconfdata/usb-controller-default-unavailable-q35.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-default-unavailable-q35.xml rename to tests/qemuxmlconfdata/usb-controller-default-unavailable-q35.xml diff --git a/tests/qemuxml2argvdata/usb-controller-ich9-autoassign.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-ich9-autoassign.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-ich9-autoassign.xml b/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-ich9-autoassign.xml rename to tests/qemuxmlconfdata/usb-controller-ich9-autoassign.xml diff --git a/tests/qemuxml2argvdata/usb-controller-ich9-companion.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-ich9-companion.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-ich9-companion.xml b/tests/qemuxmlconfdata/usb-controller-ich9-companion.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-ich9-companion.xml rename to tests/qemuxmlconfdata/usb-controller-ich9-companion.xml diff --git a/tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.xml b/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.xml rename to tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.xml diff --git a/tests/qemuxml2argvdata/usb-controller-ich9-no-companion.x86_64-latest.err b/tests/qemuxmlconfdata/usb-controller-ich9-no-companion.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-ich9-no-companion.x86_64-latest.err rename to tests/qemuxmlconfdata/usb-controller-ich9-no-companion.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-controller-ich9-no-companion.xml b/tests/qemuxmlconfdata/usb-controller-ich9-no-companion.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-ich9-no-companion.xml rename to tests/qemuxmlconfdata/usb-controller-ich9-no-companion.xml diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-i440fx.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-implicit-i440fx.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-implicit-i440fx.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-controller-implicit-i440fx.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-i440fx.xml b/tests/qemuxmlconfdata/usb-controller-implicit-i440fx.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-implicit-i440fx.xml rename to tests/qemuxmlconfdata/usb-controller-implicit-i440fx.xml diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-isapc.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-implicit-isapc.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-implicit-isapc.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-controller-implicit-isapc.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-isapc.xml b/tests/qemuxmlconfdata/usb-controller-implicit-isapc.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-implicit-isapc.xml rename to tests/qemuxmlconfdata/usb-controller-implicit-isapc.xml diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-q35.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-implicit-q35.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-implicit-q35.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-controller-implicit-q35.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-implicit-q35.xml b/tests/qemuxmlconfdata/usb-controller-implicit-q35.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-implicit-q35.xml rename to tests/qemuxmlconfdata/usb-controller-implicit-q35.xml diff --git a/tests/qemuxml2argvdata/usb-controller-nec-xhci-limit.x86_64-latest.err b/tests/qemuxmlconfdata/usb-controller-nec-xhci-limit.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-nec-xhci-limit.x86_64-latest.err rename to tests/qemuxmlconfdata/usb-controller-nec-xhci-limit.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-controller-nec-xhci-limit.xml b/tests/qemuxmlconfdata/usb-controller-nec-xhci-limit.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-nec-xhci-limit.xml rename to tests/qemuxmlconfdata/usb-controller-nec-xhci-limit.xml diff --git a/tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.x86_64-latest.err b/tests/qemuxmlconfdata/usb-controller-nec-xhci-unavailable.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.x86_64-latest.err rename to tests/qemuxmlconfdata/usb-controller-nec-xhci-unavailable.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.xml b/tests/qemuxmlconfdata/usb-controller-nec-xhci-unavailable.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.xml rename to tests/qemuxmlconfdata/usb-controller-nec-xhci-unavailable.xml diff --git a/tests/qemuxml2argvdata/usb-controller-nec-xhci.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-nec-xhci.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-nec-xhci.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-controller-nec-xhci.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-nec-xhci.xml b/tests/qemuxmlconfdata/usb-controller-nec-xhci.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-nec-xhci.xml rename to tests/qemuxmlconfdata/usb-controller-nec-xhci.xml diff --git a/tests/qemuxml2argvdata/usb-controller-nex-xhci-autoassign.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-nex-xhci-autoassign.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-nex-xhci-autoassign.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-controller-nex-xhci-autoassign.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-nex-xhci-autoassign.xml b/tests/qemuxmlconfdata/usb-controller-nex-xhci-autoassign.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-nex-xhci-autoassign.xml rename to tests/qemuxmlconfdata/usb-controller-nex-xhci-autoassign.xml diff --git a/tests/qemuxml2argvdata/usb-controller-piix3.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-piix3.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-piix3.xml b/tests/qemuxmlconfdata/usb-controller-piix3.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-piix3.xml rename to tests/qemuxmlconfdata/usb-controller-piix3.xml diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci-limit.x86_64-latest.err b/tests/qemuxmlconfdata/usb-controller-qemu-xhci-limit.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-qemu-xhci-limit.x86_64-latest.err rename to tests/qemuxmlconfdata/usb-controller-qemu-xhci-limit.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci-limit.xml b/tests/qemuxmlconfdata/usb-controller-qemu-xhci-limit.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-qemu-xhci-limit.xml rename to tests/qemuxmlconfdata/usb-controller-qemu-xhci-limit.xml diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-qemu-xhci.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-qemu-xhci.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-controller-qemu-xhci.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.xml b/tests/qemuxmlconfdata/usb-controller-qemu-xhci.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-controller-qemu-xhci.xml rename to tests/qemuxmlconfdata/usb-controller-qemu-xhci.xml diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.x86_64-latest.args b/tests/qemuxmlconfdata/usb-hub-autoadd-deluxe.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-hub-autoadd-deluxe.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml b/tests/qemuxmlconfdata/usb-hub-autoadd-deluxe.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.xml rename to tests/qemuxmlconfdata/usb-hub-autoadd-deluxe.xml diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.x86_64-latest.args b/tests/qemuxmlconfdata/usb-hub-autoadd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-hub-autoadd.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-hub-autoadd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.xml b/tests/qemuxmlconfdata/usb-hub-autoadd.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-hub-autoadd.xml rename to tests/qemuxmlconfdata/usb-hub-autoadd.xml diff --git a/tests/qemuxml2argvdata/usb-hub-conflict.x86_64-latest.err b/tests/qemuxmlconfdata/usb-hub-conflict.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-hub-conflict.x86_64-latest.err rename to tests/qemuxmlconfdata/usb-hub-conflict.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-hub-conflict.xml b/tests/qemuxmlconfdata/usb-hub-conflict.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-hub-conflict.xml rename to tests/qemuxmlconfdata/usb-hub-conflict.xml diff --git a/tests/qemuxml2argvdata/usb-hub-nonexistent.x86_64-latest.err b/tests/qemuxmlconfdata/usb-hub-nonexistent.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-hub-nonexistent.x86_64-latest.err rename to tests/qemuxmlconfdata/usb-hub-nonexistent.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-hub-nonexistent.xml b/tests/qemuxmlconfdata/usb-hub-nonexistent.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-hub-nonexistent.xml rename to tests/qemuxmlconfdata/usb-hub-nonexistent.xml diff --git a/tests/qemuxml2argvdata/usb-hub.x86_64-latest.args b/tests/qemuxmlconfdata/usb-hub.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-hub.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-hub.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-hub.xml b/tests/qemuxmlconfdata/usb-hub.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-hub.xml rename to tests/qemuxmlconfdata/usb-hub.xml diff --git a/tests/qemuxml2argvdata/usb-long-port-path.x86_64-latest.args b/tests/qemuxmlconfdata/usb-long-port-path.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-long-port-path.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-long-port-path.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-long-port-path.xml b/tests/qemuxmlconfdata/usb-long-port-path.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-long-port-path.xml rename to tests/qemuxmlconfdata/usb-long-port-path.xml diff --git a/tests/qemuxml2argvdata/usb-none-hub.x86_64-latest.err b/tests/qemuxmlconfdata/usb-none-hub.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-none-hub.x86_64-latest.err rename to tests/qemuxmlconfdata/usb-none-hub.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-none-hub.xml b/tests/qemuxmlconfdata/usb-none-hub.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-none-hub.xml rename to tests/qemuxmlconfdata/usb-none-hub.xml diff --git a/tests/qemuxml2argvdata/usb-none-other.x86_64-latest.err b/tests/qemuxmlconfdata/usb-none-other.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-none-other.x86_64-latest.err rename to tests/qemuxmlconfdata/usb-none-other.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-none-other.xml b/tests/qemuxmlconfdata/usb-none-other.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-none-other.xml rename to tests/qemuxmlconfdata/usb-none-other.xml diff --git a/tests/qemuxml2argvdata/usb-none-usbtablet.x86_64-latest.err b/tests/qemuxmlconfdata/usb-none-usbtablet.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-none-usbtablet.x86_64-latest.err rename to tests/qemuxmlconfdata/usb-none-usbtablet.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-none-usbtablet.xml b/tests/qemuxmlconfdata/usb-none-usbtablet.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-none-usbtablet.xml rename to tests/qemuxmlconfdata/usb-none-usbtablet.xml diff --git a/tests/qemuxml2argvdata/usb-none.x86_64-latest.args b/tests/qemuxmlconfdata/usb-none.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-none.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-none.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-none.xml b/tests/qemuxmlconfdata/usb-none.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-none.xml rename to tests/qemuxmlconfdata/usb-none.xml diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.x86_64-latest.args b/tests/qemuxmlconfdata/usb-port-autoassign.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-port-autoassign.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-port-autoassign.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.xml b/tests/qemuxmlconfdata/usb-port-autoassign.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-port-autoassign.xml rename to tests/qemuxmlconfdata/usb-port-autoassign.xml diff --git a/tests/qemuxml2argvdata/usb-port-missing.x86_64-latest.args b/tests/qemuxmlconfdata/usb-port-missing.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-port-missing.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-port-missing.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-port-missing.xml b/tests/qemuxmlconfdata/usb-port-missing.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-port-missing.xml rename to tests/qemuxmlconfdata/usb-port-missing.xml diff --git a/tests/qemuxml2argvdata/usb-ports-out-of-range.x86_64-latest.err b/tests/qemuxmlconfdata/usb-ports-out-of-range.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-ports-out-of-range.x86_64-latest.err rename to tests/qemuxmlconfdata/usb-ports-out-of-range.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-ports-out-of-range.xml b/tests/qemuxmlconfdata/usb-ports-out-of-range.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-ports-out-of-range.xml rename to tests/qemuxmlconfdata/usb-ports-out-of-range.xml diff --git a/tests/qemuxml2argvdata/usb-ports.x86_64-latest.args b/tests/qemuxmlconfdata/usb-ports.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-ports.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-ports.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-ports.xml b/tests/qemuxmlconfdata/usb-ports.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-ports.xml rename to tests/qemuxmlconfdata/usb-ports.xml diff --git a/tests/qemuxml2argvdata/usb-redir-boot.x86_64-latest.args b/tests/qemuxmlconfdata/usb-redir-boot.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-redir-boot.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-redir-boot.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-redir-boot.xml b/tests/qemuxmlconfdata/usb-redir-boot.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-redir-boot.xml rename to tests/qemuxmlconfdata/usb-redir-boot.xml diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.x86_64-latest.args b/tests/qemuxmlconfdata/usb-redir-filter-version.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-redir-filter-version.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-redir-filter-version.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.xml b/tests/qemuxmlconfdata/usb-redir-filter-version.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-redir-filter-version.xml rename to tests/qemuxmlconfdata/usb-redir-filter-version.xml diff --git a/tests/qemuxml2argvdata/usb-redir-filter.x86_64-latest.args b/tests/qemuxmlconfdata/usb-redir-filter.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-redir-filter.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-redir-filter.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-redir-filter.xml b/tests/qemuxmlconfdata/usb-redir-filter.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-redir-filter.xml rename to tests/qemuxmlconfdata/usb-redir-filter.xml diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args b/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-redir-unix.xml b/tests/qemuxmlconfdata/usb-redir-unix.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-redir-unix.xml rename to tests/qemuxmlconfdata/usb-redir-unix.xml diff --git a/tests/qemuxml2argvdata/usb-redir.x86_64-latest.args b/tests/qemuxmlconfdata/usb-redir.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb-redir.x86_64-latest.args rename to tests/qemuxmlconfdata/usb-redir.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb-redir.xml b/tests/qemuxmlconfdata/usb-redir.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-redir.xml rename to tests/qemuxmlconfdata/usb-redir.xml diff --git a/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/usb-too-long-port-path-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/usb-too-long-port-path-invalid.x86_64-latest.err rename to tests/qemuxmlconfdata/usb-too-long-port-path-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml b/tests/qemuxmlconfdata/usb-too-long-port-path-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/usb-too-long-port-path-invalid.xml rename to tests/qemuxmlconfdata/usb-too-long-port-path-invalid.xml diff --git a/tests/qemuxml2argvdata/usb1-usb2.x86_64-latest.args b/tests/qemuxmlconfdata/usb1-usb2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/usb1-usb2.x86_64-latest.args rename to tests/qemuxmlconfdata/usb1-usb2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/usb1-usb2.xml b/tests/qemuxmlconfdata/usb1-usb2.xml similarity index 100% rename from tests/qemuxml2argvdata/usb1-usb2.xml rename to tests/qemuxmlconfdata/usb1-usb2.xml diff --git a/tests/qemuxml2argvdata/user-aliases-usb.x86_64-latest.args b/tests/qemuxmlconfdata/user-aliases-usb.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/user-aliases-usb.x86_64-latest.args rename to tests/qemuxmlconfdata/user-aliases-usb.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/user-aliases-usb.xml b/tests/qemuxmlconfdata/user-aliases-usb.xml similarity index 100% rename from tests/qemuxml2argvdata/user-aliases-usb.xml rename to tests/qemuxmlconfdata/user-aliases-usb.xml diff --git a/tests/qemuxml2argvdata/user-aliases.x86_64-latest.args b/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/user-aliases.x86_64-latest.args rename to tests/qemuxmlconfdata/user-aliases.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/user-aliases.xml b/tests/qemuxmlconfdata/user-aliases.xml similarity index 100% rename from tests/qemuxml2argvdata/user-aliases.xml rename to tests/qemuxmlconfdata/user-aliases.xml diff --git a/tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args b/tests/qemuxmlconfdata/user-aliases2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args rename to tests/qemuxmlconfdata/user-aliases2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/user-aliases2.xml b/tests/qemuxmlconfdata/user-aliases2.xml similarity index 100% rename from tests/qemuxml2argvdata/user-aliases2.xml rename to tests/qemuxmlconfdata/user-aliases2.xml diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.x86_64-latest.args b/tests/qemuxmlconfdata/vcpu-placement-static.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/vcpu-placement-static.x86_64-latest.args rename to tests/qemuxmlconfdata/vcpu-placement-static.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.xml b/tests/qemuxmlconfdata/vcpu-placement-static.xml similarity index 100% rename from tests/qemuxml2argvdata/vcpu-placement-static.xml rename to tests/qemuxmlconfdata/vcpu-placement-static.xml diff --git a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-user-fs-fd-memory.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args rename to tests/qemuxmlconfdata/vhost-user-fs-fd-memory.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml b/tests/qemuxmlconfdata/vhost-user-fs-fd-memory.xml similarity index 100% rename from tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml rename to tests/qemuxmlconfdata/vhost-user-fs-fd-memory.xml diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args rename to tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml b/tests/qemuxmlconfdata/vhost-user-fs-hugepages.xml similarity index 100% rename from tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml rename to tests/qemuxmlconfdata/vhost-user-fs-hugepages.xml diff --git a/tests/qemuxml2argvdata/vhost-user-fs-readonly.x86_64-latest.err b/tests/qemuxmlconfdata/vhost-user-fs-readonly.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/vhost-user-fs-readonly.x86_64-latest.err rename to tests/qemuxmlconfdata/vhost-user-fs-readonly.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/vhost-user-fs-readonly.xml b/tests/qemuxmlconfdata/vhost-user-fs-readonly.xml similarity index 100% rename from tests/qemuxml2argvdata/vhost-user-fs-readonly.xml rename to tests/qemuxmlconfdata/vhost-user-fs-readonly.xml diff --git a/tests/qemuxml2argvdata/vhost-user-fs-sock.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-user-fs-sock.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/vhost-user-fs-sock.x86_64-latest.args rename to tests/qemuxmlconfdata/vhost-user-fs-sock.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/vhost-user-fs-sock.xml b/tests/qemuxmlconfdata/vhost-user-fs-sock.xml similarity index 100% rename from tests/qemuxml2argvdata/vhost-user-fs-sock.xml rename to tests/qemuxmlconfdata/vhost-user-fs-sock.xml diff --git a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args rename to tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.xml b/tests/qemuxmlconfdata/vhost-user-gpu-secondary.xml similarity index 100% rename from tests/qemuxml2argvdata/vhost-user-gpu-secondary.xml rename to tests/qemuxmlconfdata/vhost-user-gpu-secondary.xml diff --git a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args rename to tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/vhost-user-vga.xml b/tests/qemuxmlconfdata/vhost-user-vga.xml similarity index 100% rename from tests/qemuxml2argvdata/vhost-user-vga.xml rename to tests/qemuxmlconfdata/vhost-user-vga.xml diff --git a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args rename to tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/vhost-vsock-auto.xml b/tests/qemuxmlconfdata/vhost-vsock-auto.xml similarity index 100% rename from tests/qemuxml2argvdata/vhost-vsock-auto.xml rename to tests/qemuxmlconfdata/vhost-vsock-auto.xml diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args b/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args rename to tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.xml b/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.xml similarity index 100% rename from tests/qemuxml2argvdata/vhost-vsock-ccw-auto.xml rename to tests/qemuxmlconfdata/vhost-vsock-ccw-auto.xml diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args b/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args rename to tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.xml b/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.xml similarity index 100% rename from tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.xml rename to tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.xml diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args b/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args rename to tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.xml b/tests/qemuxmlconfdata/vhost-vsock-ccw.xml similarity index 100% rename from tests/qemuxml2argvdata/vhost-vsock-ccw.xml rename to tests/qemuxmlconfdata/vhost-vsock-ccw.xml diff --git a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args rename to tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/vhost-vsock.xml b/tests/qemuxmlconfdata/vhost-vsock.xml similarity index 100% rename from tests/qemuxml2argvdata/vhost-vsock.xml rename to tests/qemuxmlconfdata/vhost-vsock.xml diff --git a/tests/qemuxml2argvdata/vhost_queues-invalid.x86_64-latest.err b/tests/qemuxmlconfdata/vhost_queues-invalid.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/vhost_queues-invalid.x86_64-latest.err rename to tests/qemuxmlconfdata/vhost_queues-invalid.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/vhost_queues-invalid.xml b/tests/qemuxmlconfdata/vhost_queues-invalid.xml similarity index 100% rename from tests/qemuxml2argvdata/vhost_queues-invalid.xml rename to tests/qemuxmlconfdata/vhost_queues-invalid.xml diff --git a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args b/tests/qemuxmlconfdata/video-bochs-display-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args rename to tests/qemuxmlconfdata/video-bochs-display-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-bochs-display-device.xml b/tests/qemuxmlconfdata/video-bochs-display-device.xml similarity index 100% rename from tests/qemuxml2argvdata/video-bochs-display-device.xml rename to tests/qemuxmlconfdata/video-bochs-display-device.xml diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.x86_64-latest.args b/tests/qemuxmlconfdata/video-device-pciaddr-default.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-device-pciaddr-default.x86_64-latest.args rename to tests/qemuxmlconfdata/video-device-pciaddr-default.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.xml b/tests/qemuxmlconfdata/video-device-pciaddr-default.xml similarity index 100% rename from tests/qemuxml2argvdata/video-device-pciaddr-default.xml rename to tests/qemuxmlconfdata/video-device-pciaddr-default.xml diff --git a/tests/qemuxml2argvdata/video-invalid-multiple-devices.x86_64-latest.err b/tests/qemuxmlconfdata/video-invalid-multiple-devices.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/video-invalid-multiple-devices.x86_64-latest.err rename to tests/qemuxmlconfdata/video-invalid-multiple-devices.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/video-invalid-multiple-devices.xml b/tests/qemuxmlconfdata/video-invalid-multiple-devices.xml similarity index 100% rename from tests/qemuxml2argvdata/video-invalid-multiple-devices.xml rename to tests/qemuxmlconfdata/video-invalid-multiple-devices.xml diff --git a/tests/qemuxml2argvdata/video-multiple-primaries.x86_64-latest.err b/tests/qemuxmlconfdata/video-multiple-primaries.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/video-multiple-primaries.x86_64-latest.err rename to tests/qemuxmlconfdata/video-multiple-primaries.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/video-multiple-primaries.xml b/tests/qemuxmlconfdata/video-multiple-primaries.xml similarity index 100% rename from tests/qemuxml2argvdata/video-multiple-primaries.xml rename to tests/qemuxmlconfdata/video-multiple-primaries.xml diff --git a/tests/qemuxml2argvdata/video-none-device.x86_64-latest.args b/tests/qemuxmlconfdata/video-none-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-none-device.x86_64-latest.args rename to tests/qemuxmlconfdata/video-none-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-none-device.xml b/tests/qemuxmlconfdata/video-none-device.xml similarity index 100% rename from tests/qemuxml2argvdata/video-none-device.xml rename to tests/qemuxmlconfdata/video-none-device.xml diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-device-vgamem.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-qxl-device-vgamem.x86_64-latest.args rename to tests/qemuxmlconfdata/video-qxl-device-vgamem.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.xml b/tests/qemuxmlconfdata/video-qxl-device-vgamem.xml similarity index 100% rename from tests/qemuxml2argvdata/video-qxl-device-vgamem.xml rename to tests/qemuxmlconfdata/video-qxl-device-vgamem.xml diff --git a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-device-vram64.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args rename to tests/qemuxmlconfdata/video-qxl-device-vram64.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-qxl-device-vram64.xml b/tests/qemuxmlconfdata/video-qxl-device-vram64.xml similarity index 100% rename from tests/qemuxml2argvdata/video-qxl-device-vram64.xml rename to tests/qemuxmlconfdata/video-qxl-device-vram64.xml diff --git a/tests/qemuxml2argvdata/video-qxl-device.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-qxl-device.x86_64-latest.args rename to tests/qemuxmlconfdata/video-qxl-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-qxl-device.xml b/tests/qemuxmlconfdata/video-qxl-device.xml similarity index 100% rename from tests/qemuxml2argvdata/video-qxl-device.xml rename to tests/qemuxmlconfdata/video-qxl-device.xml diff --git a/tests/qemuxml2argvdata/video-qxl-heads.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-heads.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-qxl-heads.x86_64-latest.args rename to tests/qemuxmlconfdata/video-qxl-heads.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-qxl-heads.xml b/tests/qemuxmlconfdata/video-qxl-heads.xml similarity index 100% rename from tests/qemuxml2argvdata/video-qxl-heads.xml rename to tests/qemuxmlconfdata/video-qxl-heads.xml diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-noheads.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-qxl-noheads.x86_64-latest.args rename to tests/qemuxmlconfdata/video-qxl-noheads.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.xml b/tests/qemuxmlconfdata/video-qxl-noheads.xml similarity index 100% rename from tests/qemuxml2argvdata/video-qxl-noheads.xml rename to tests/qemuxmlconfdata/video-qxl-noheads.xml diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-resolution.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-qxl-resolution.x86_64-latest.args rename to tests/qemuxmlconfdata/video-qxl-resolution.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.xml b/tests/qemuxmlconfdata/video-qxl-resolution.xml similarity index 100% rename from tests/qemuxml2argvdata/video-qxl-resolution.xml rename to tests/qemuxmlconfdata/video-qxl-resolution.xml diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-sec-device-vgamem.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.x86_64-latest.args rename to tests/qemuxmlconfdata/video-qxl-sec-device-vgamem.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml b/tests/qemuxmlconfdata/video-qxl-sec-device-vgamem.xml similarity index 100% rename from tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.xml rename to tests/qemuxmlconfdata/video-qxl-sec-device-vgamem.xml diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-sec-device-vram64.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args rename to tests/qemuxmlconfdata/video-qxl-sec-device-vram64.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.xml b/tests/qemuxmlconfdata/video-qxl-sec-device-vram64.xml similarity index 100% rename from tests/qemuxml2argvdata/video-qxl-sec-device-vram64.xml rename to tests/qemuxmlconfdata/video-qxl-sec-device-vram64.xml diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-sec-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-qxl-sec-device.x86_64-latest.args rename to tests/qemuxmlconfdata/video-qxl-sec-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.xml b/tests/qemuxmlconfdata/video-qxl-sec-device.xml similarity index 100% rename from tests/qemuxml2argvdata/video-qxl-sec-device.xml rename to tests/qemuxmlconfdata/video-qxl-sec-device.xml diff --git a/tests/qemuxml2argvdata/video-ramfb-display-device-pci-address.x86_64-latest.err b/tests/qemuxmlconfdata/video-ramfb-display-device-pci-address.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/video-ramfb-display-device-pci-address.x86_64-latest.err rename to tests/qemuxmlconfdata/video-ramfb-display-device-pci-address.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/video-ramfb-display-device-pci-address.xml b/tests/qemuxmlconfdata/video-ramfb-display-device-pci-address.xml similarity index 100% rename from tests/qemuxml2argvdata/video-ramfb-display-device-pci-address.xml rename to tests/qemuxmlconfdata/video-ramfb-display-device-pci-address.xml diff --git a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args b/tests/qemuxmlconfdata/video-ramfb-display-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args rename to tests/qemuxmlconfdata/video-ramfb-display-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-ramfb-display-device.xml b/tests/qemuxmlconfdata/video-ramfb-display-device.xml similarity index 100% rename from tests/qemuxml2argvdata/video-ramfb-display-device.xml rename to tests/qemuxmlconfdata/video-ramfb-display-device.xml diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.x86_64-latest.args b/tests/qemuxmlconfdata/video-vga-device-vgamem.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-vga-device-vgamem.x86_64-latest.args rename to tests/qemuxmlconfdata/video-vga-device-vgamem.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.xml b/tests/qemuxmlconfdata/video-vga-device-vgamem.xml similarity index 100% rename from tests/qemuxml2argvdata/video-vga-device-vgamem.xml rename to tests/qemuxmlconfdata/video-vga-device-vgamem.xml diff --git a/tests/qemuxml2argvdata/video-vga-device.x86_64-latest.args b/tests/qemuxmlconfdata/video-vga-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-vga-device.x86_64-latest.args rename to tests/qemuxmlconfdata/video-vga-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-vga-device.xml b/tests/qemuxmlconfdata/video-vga-device.xml similarity index 100% rename from tests/qemuxml2argvdata/video-vga-device.xml rename to tests/qemuxmlconfdata/video-vga-device.xml diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.x86_64-latest.args b/tests/qemuxmlconfdata/video-vga-qxl-heads.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-vga-qxl-heads.x86_64-latest.args rename to tests/qemuxmlconfdata/video-vga-qxl-heads.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.xml b/tests/qemuxmlconfdata/video-vga-qxl-heads.xml similarity index 100% rename from tests/qemuxml2argvdata/video-vga-qxl-heads.xml rename to tests/qemuxmlconfdata/video-vga-qxl-heads.xml diff --git a/tests/qemuxml2argvdata/video-virtio-blob-off.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-blob-off.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-blob-off.x86_64-latest.args rename to tests/qemuxmlconfdata/video-virtio-blob-off.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-virtio-blob-off.xml b/tests/qemuxmlconfdata/video-virtio-blob-off.xml similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-blob-off.xml rename to tests/qemuxmlconfdata/video-virtio-blob-off.xml diff --git a/tests/qemuxml2argvdata/video-virtio-blob-on.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-blob-on.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-blob-on.x86_64-latest.args rename to tests/qemuxmlconfdata/video-virtio-blob-on.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-virtio-blob-on.xml b/tests/qemuxmlconfdata/video-virtio-blob-on.xml similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-blob-on.xml rename to tests/qemuxmlconfdata/video-virtio-blob-on.xml diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw-auto.s390x-latest.args b/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-gpu-ccw-auto.s390x-latest.args rename to tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.args diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw-auto.xml b/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.xml similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-gpu-ccw-auto.xml rename to tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.xml diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.s390x-latest.args b/tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-gpu-ccw.s390x-latest.args rename to tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.args diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.xml b/tests/qemuxmlconfdata/video-virtio-gpu-ccw.xml similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-gpu-ccw.xml rename to tests/qemuxmlconfdata/video-virtio-gpu-ccw.xml diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-gpu-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-gpu-device.x86_64-latest.args rename to tests/qemuxmlconfdata/video-virtio-gpu-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.xml b/tests/qemuxmlconfdata/video-virtio-gpu-device.xml similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-gpu-device.xml rename to tests/qemuxmlconfdata/video-virtio-gpu-device.xml diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-gpu-sdl-gl.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.x86_64-latest.args rename to tests/qemuxmlconfdata/video-virtio-gpu-sdl-gl.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml b/tests/qemuxmlconfdata/video-virtio-gpu-sdl-gl.xml similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml rename to tests/qemuxmlconfdata/video-virtio-gpu-sdl-gl.xml diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-gpu-secondary.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-gpu-secondary.x86_64-latest.args rename to tests/qemuxmlconfdata/video-virtio-gpu-secondary.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.xml b/tests/qemuxmlconfdata/video-virtio-gpu-secondary.xml similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-gpu-secondary.xml rename to tests/qemuxmlconfdata/video-virtio-gpu-secondary.xml diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-gpu-spice-gl.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.x86_64-latest.args rename to tests/qemuxmlconfdata/video-virtio-gpu-spice-gl.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml b/tests/qemuxmlconfdata/video-virtio-gpu-spice-gl.xml similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.xml rename to tests/qemuxmlconfdata/video-virtio-gpu-spice-gl.xml diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-gpu-virgl.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-gpu-virgl.x86_64-latest.args rename to tests/qemuxmlconfdata/video-virtio-gpu-virgl.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml b/tests/qemuxmlconfdata/video-virtio-gpu-virgl.xml similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-gpu-virgl.xml rename to tests/qemuxmlconfdata/video-virtio-gpu-virgl.xml diff --git a/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args rename to tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.xml b/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.xml similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.xml rename to tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.xml diff --git a/tests/qemuxml2argvdata/video-virtio-vga.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-vga.x86_64-latest.args rename to tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/video-virtio-vga.xml b/tests/qemuxmlconfdata/video-virtio-vga.xml similarity index 100% rename from tests/qemuxml2argvdata/video-virtio-vga.xml rename to tests/qemuxmlconfdata/video-virtio-vga.xml diff --git a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-9p-createmode.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-9p-createmode.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-9p-createmode.xml b/tests/qemuxmlconfdata/virtio-9p-createmode.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-9p-createmode.xml rename to tests/qemuxmlconfdata/virtio-9p-createmode.xml diff --git a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-9p-multidevs.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-9p-multidevs.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-9p-multidevs.xml b/tests/qemuxmlconfdata/virtio-9p-multidevs.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-9p-multidevs.xml rename to tests/qemuxmlconfdata/virtio-9p-multidevs.xml diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-input-passthrough.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-input-passthrough.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-input-passthrough.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.xml b/tests/qemuxmlconfdata/virtio-input-passthrough.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-input-passthrough.xml rename to tests/qemuxmlconfdata/virtio-input-passthrough.xml diff --git a/tests/qemuxml2argvdata/virtio-input.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-input.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-input.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-input.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-input.xml b/tests/qemuxmlconfdata/virtio-input.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-input.xml rename to tests/qemuxmlconfdata/virtio-input.xml diff --git a/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args rename to tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-iommu-aarch64.xml b/tests/qemuxmlconfdata/virtio-iommu-aarch64.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-iommu-aarch64.xml rename to tests/qemuxmlconfdata/virtio-iommu-aarch64.xml diff --git a/tests/qemuxml2argvdata/virtio-iommu-invalid-address-type.x86_64-latest.err b/tests/qemuxmlconfdata/virtio-iommu-invalid-address-type.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/virtio-iommu-invalid-address-type.x86_64-latest.err rename to tests/qemuxmlconfdata/virtio-iommu-invalid-address-type.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/virtio-iommu-invalid-address-type.xml b/tests/qemuxmlconfdata/virtio-iommu-invalid-address-type.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-iommu-invalid-address-type.xml rename to tests/qemuxmlconfdata/virtio-iommu-invalid-address-type.xml diff --git a/tests/qemuxml2argvdata/virtio-iommu-invalid-address.x86_64-latest.err b/tests/qemuxmlconfdata/virtio-iommu-invalid-address.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/virtio-iommu-invalid-address.x86_64-latest.err rename to tests/qemuxmlconfdata/virtio-iommu-invalid-address.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/virtio-iommu-invalid-address.xml b/tests/qemuxmlconfdata/virtio-iommu-invalid-address.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-iommu-invalid-address.xml rename to tests/qemuxmlconfdata/virtio-iommu-invalid-address.xml diff --git a/tests/qemuxml2argvdata/virtio-iommu-no-acpi.x86_64-latest.err b/tests/qemuxmlconfdata/virtio-iommu-no-acpi.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/virtio-iommu-no-acpi.x86_64-latest.err rename to tests/qemuxmlconfdata/virtio-iommu-no-acpi.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/virtio-iommu-no-acpi.xml b/tests/qemuxmlconfdata/virtio-iommu-no-acpi.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-iommu-no-acpi.xml rename to tests/qemuxmlconfdata/virtio-iommu-no-acpi.xml diff --git a/tests/qemuxml2argvdata/virtio-iommu-wrong-machine.x86_64-latest.err b/tests/qemuxmlconfdata/virtio-iommu-wrong-machine.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/virtio-iommu-wrong-machine.x86_64-latest.err rename to tests/qemuxmlconfdata/virtio-iommu-wrong-machine.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/virtio-iommu-wrong-machine.xml b/tests/qemuxmlconfdata/virtio-iommu-wrong-machine.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-iommu-wrong-machine.xml rename to tests/qemuxmlconfdata/virtio-iommu-wrong-machine.xml diff --git a/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-6.1.0.err b/tests/qemuxmlconfdata/virtio-iommu-x86_64.x86_64-6.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-6.1.0.err rename to tests/qemuxmlconfdata/virtio-iommu-x86_64.x86_64-6.1.0.err diff --git a/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-iommu-x86_64.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-iommu-x86_64.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-iommu-x86_64.xml b/tests/qemuxmlconfdata/virtio-iommu-x86_64.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-iommu-x86_64.xml rename to tests/qemuxmlconfdata/virtio-iommu-x86_64.xml diff --git a/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-lun.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-lun.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-lun.xml b/tests/qemuxmlconfdata/virtio-lun.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-lun.xml rename to tests/qemuxmlconfdata/virtio-lun.xml diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.xml b/tests/qemuxmlconfdata/virtio-non-transitional.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-non-transitional.xml rename to tests/qemuxmlconfdata/virtio-non-transitional.xml diff --git a/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-controller-ats.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-controller-ats.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-controller-ats.xml b/tests/qemuxmlconfdata/virtio-options-controller-ats.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-controller-ats.xml rename to tests/qemuxmlconfdata/virtio-options-controller-ats.xml diff --git a/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-controller-iommu.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-controller-iommu.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-controller-iommu.xml b/tests/qemuxmlconfdata/virtio-options-controller-iommu.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-controller-iommu.xml rename to tests/qemuxmlconfdata/virtio-options-controller-iommu.xml diff --git a/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-controller-packed.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-controller-packed.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-controller-packed.xml b/tests/qemuxmlconfdata/virtio-options-controller-packed.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-controller-packed.xml rename to tests/qemuxmlconfdata/virtio-options-controller-packed.xml diff --git a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-disk-ats.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-disk-ats.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-disk-ats.xml b/tests/qemuxmlconfdata/virtio-options-disk-ats.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-disk-ats.xml rename to tests/qemuxmlconfdata/virtio-options-disk-ats.xml diff --git a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-disk-iommu.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-disk-iommu.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-disk-iommu.xml b/tests/qemuxmlconfdata/virtio-options-disk-iommu.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-disk-iommu.xml rename to tests/qemuxmlconfdata/virtio-options-disk-iommu.xml diff --git a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-disk-packed.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-disk-packed.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-disk-packed.xml b/tests/qemuxmlconfdata/virtio-options-disk-packed.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-disk-packed.xml rename to tests/qemuxmlconfdata/virtio-options-disk-packed.xml diff --git a/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-fs-ats.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-fs-ats.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-fs-ats.xml b/tests/qemuxmlconfdata/virtio-options-fs-ats.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-fs-ats.xml rename to tests/qemuxmlconfdata/virtio-options-fs-ats.xml diff --git a/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-fs-iommu.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-fs-iommu.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-fs-iommu.xml b/tests/qemuxmlconfdata/virtio-options-fs-iommu.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-fs-iommu.xml rename to tests/qemuxmlconfdata/virtio-options-fs-iommu.xml diff --git a/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-fs-packed.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-fs-packed.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-fs-packed.xml b/tests/qemuxmlconfdata/virtio-options-fs-packed.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-fs-packed.xml rename to tests/qemuxmlconfdata/virtio-options-fs-packed.xml diff --git a/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-input-ats.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-input-ats.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-input-ats.xml b/tests/qemuxmlconfdata/virtio-options-input-ats.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-input-ats.xml rename to tests/qemuxmlconfdata/virtio-options-input-ats.xml diff --git a/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-input-iommu.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-input-iommu.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-input-iommu.xml b/tests/qemuxmlconfdata/virtio-options-input-iommu.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-input-iommu.xml rename to tests/qemuxmlconfdata/virtio-options-input-iommu.xml diff --git a/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-input-packed.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-input-packed.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-input-packed.xml b/tests/qemuxmlconfdata/virtio-options-input-packed.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-input-packed.xml rename to tests/qemuxmlconfdata/virtio-options-input-packed.xml diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-memballoon-ats.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-memballoon-ats.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.xml b/tests/qemuxmlconfdata/virtio-options-memballoon-ats.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-memballoon-ats.xml rename to tests/qemuxmlconfdata/virtio-options-memballoon-ats.xml diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err b/tests/qemuxmlconfdata/virtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err rename to tests/qemuxmlconfdata/virtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.xml b/tests/qemuxmlconfdata/virtio-options-memballoon-freepage-reporting.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.xml rename to tests/qemuxmlconfdata/virtio-options-memballoon-freepage-reporting.xml diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-memballoon-iommu.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-memballoon-iommu.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.xml b/tests/qemuxmlconfdata/virtio-options-memballoon-iommu.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-memballoon-iommu.xml rename to tests/qemuxmlconfdata/virtio-options-memballoon-iommu.xml diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-memballoon-packed.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-memballoon-packed.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.xml b/tests/qemuxmlconfdata/virtio-options-memballoon-packed.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-memballoon-packed.xml rename to tests/qemuxmlconfdata/virtio-options-memballoon-packed.xml diff --git a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-net-ats.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-net-ats.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-net-ats.xml b/tests/qemuxmlconfdata/virtio-options-net-ats.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-net-ats.xml rename to tests/qemuxmlconfdata/virtio-options-net-ats.xml diff --git a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-net-iommu.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-net-iommu.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-net-iommu.xml b/tests/qemuxmlconfdata/virtio-options-net-iommu.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-net-iommu.xml rename to tests/qemuxmlconfdata/virtio-options-net-iommu.xml diff --git a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-net-packed.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-net-packed.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-net-packed.xml b/tests/qemuxmlconfdata/virtio-options-net-packed.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-net-packed.xml rename to tests/qemuxmlconfdata/virtio-options-net-packed.xml diff --git a/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-rng-ats.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-rng-ats.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-rng-ats.xml b/tests/qemuxmlconfdata/virtio-options-rng-ats.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-rng-ats.xml rename to tests/qemuxmlconfdata/virtio-options-rng-ats.xml diff --git a/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-rng-iommu.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-rng-iommu.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-rng-iommu.xml b/tests/qemuxmlconfdata/virtio-options-rng-iommu.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-rng-iommu.xml rename to tests/qemuxmlconfdata/virtio-options-rng-iommu.xml diff --git a/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-rng-packed.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-rng-packed.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-rng-packed.xml b/tests/qemuxmlconfdata/virtio-options-rng-packed.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-rng-packed.xml rename to tests/qemuxmlconfdata/virtio-options-rng-packed.xml diff --git a/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-video-ats.xml b/tests/qemuxmlconfdata/virtio-options-video-ats.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-video-ats.xml rename to tests/qemuxmlconfdata/virtio-options-video-ats.xml diff --git a/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-video-iommu.xml b/tests/qemuxmlconfdata/virtio-options-video-iommu.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-video-iommu.xml rename to tests/qemuxmlconfdata/virtio-options-video-iommu.xml diff --git a/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options-video-packed.xml b/tests/qemuxmlconfdata/virtio-options-video-packed.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options-video-packed.xml rename to tests/qemuxmlconfdata/virtio-options-video-packed.xml diff --git a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-options.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-options.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-options.xml b/tests/qemuxmlconfdata/virtio-options.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-options.xml rename to tests/qemuxmlconfdata/virtio-options.xml diff --git a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.args b/tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-rng-builtin.xml b/tests/qemuxmlconfdata/virtio-rng-builtin.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-builtin.xml rename to tests/qemuxmlconfdata/virtio-rng-builtin.xml diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.s390x-latest.args b/tests/qemuxmlconfdata/virtio-rng-ccw.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-ccw.s390x-latest.args rename to tests/qemuxmlconfdata/virtio-rng-ccw.s390x-latest.args diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.xml b/tests/qemuxmlconfdata/virtio-rng-ccw.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-ccw.xml rename to tests/qemuxmlconfdata/virtio-rng-ccw.xml diff --git a/tests/qemuxml2argvdata/virtio-rng-default.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-rng-default.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-default.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-rng-default.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-rng-default.xml b/tests/qemuxmlconfdata/virtio-rng-default.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-default.xml rename to tests/qemuxmlconfdata/virtio-rng-default.xml diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-crash.x86_64-latest.err b/tests/qemuxmlconfdata/virtio-rng-egd-crash.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-egd-crash.x86_64-latest.err rename to tests/qemuxmlconfdata/virtio-rng-egd-crash.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-crash.xml b/tests/qemuxmlconfdata/virtio-rng-egd-crash.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-egd-crash.xml rename to tests/qemuxmlconfdata/virtio-rng-egd-crash.xml diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0.args b/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-5.2.0.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0.args rename to tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-5.2.0.args diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.xml b/tests/qemuxmlconfdata/virtio-rng-egd-unix.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-egd-unix.xml rename to tests/qemuxmlconfdata/virtio-rng-egd-unix.xml diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-rng-egd.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-egd.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-rng-egd.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.xml b/tests/qemuxmlconfdata/virtio-rng-egd.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-egd.xml rename to tests/qemuxmlconfdata/virtio-rng-egd.xml diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-rng-multiple.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-multiple.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-rng-multiple.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.xml b/tests/qemuxmlconfdata/virtio-rng-multiple.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-multiple.xml rename to tests/qemuxmlconfdata/virtio-rng-multiple.xml diff --git a/tests/qemuxml2argvdata/virtio-rng-random.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-rng-random.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-random.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-rng-random.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-rng-random.xml b/tests/qemuxmlconfdata/virtio-rng-random.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-rng-random.xml rename to tests/qemuxmlconfdata/virtio-rng-random.xml diff --git a/tests/qemuxml2argvdata/virtio-transitional-not-supported.x86_64-latest.err b/tests/qemuxmlconfdata/virtio-transitional-not-supported.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/virtio-transitional-not-supported.x86_64-latest.err rename to tests/qemuxmlconfdata/virtio-transitional-not-supported.x86_64-latest.err diff --git a/tests/qemuxml2argvdata/virtio-transitional-not-supported.xml b/tests/qemuxmlconfdata/virtio-transitional-not-supported.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-transitional-not-supported.xml rename to tests/qemuxmlconfdata/virtio-transitional-not-supported.xml diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args rename to tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/virtio-transitional.xml b/tests/qemuxmlconfdata/virtio-transitional.xml similarity index 100% rename from tests/qemuxml2argvdata/virtio-transitional.xml rename to tests/qemuxmlconfdata/virtio-transitional.xml diff --git a/tests/qemuxml2argvdata/vmcoreinfo.x86_64-latest.args b/tests/qemuxmlconfdata/vmcoreinfo.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/vmcoreinfo.x86_64-latest.args rename to tests/qemuxmlconfdata/vmcoreinfo.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/vmcoreinfo.xml b/tests/qemuxmlconfdata/vmcoreinfo.xml similarity index 100% rename from tests/qemuxml2argvdata/vmcoreinfo.xml rename to tests/qemuxmlconfdata/vmcoreinfo.xml diff --git a/tests/qemuxml2argvdata/watchdog-device.x86_64-latest.args b/tests/qemuxmlconfdata/watchdog-device.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/watchdog-device.x86_64-latest.args rename to tests/qemuxmlconfdata/watchdog-device.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/watchdog-device.xml b/tests/qemuxmlconfdata/watchdog-device.xml similarity index 100% rename from tests/qemuxml2argvdata/watchdog-device.xml rename to tests/qemuxmlconfdata/watchdog-device.xml diff --git a/tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args b/tests/qemuxmlconfdata/watchdog-diag288.s390x-latest.args similarity index 100% rename from tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args rename to tests/qemuxmlconfdata/watchdog-diag288.s390x-latest.args diff --git a/tests/qemuxml2argvdata/watchdog-diag288.xml b/tests/qemuxmlconfdata/watchdog-diag288.xml similarity index 100% rename from tests/qemuxml2argvdata/watchdog-diag288.xml rename to tests/qemuxmlconfdata/watchdog-diag288.xml diff --git a/tests/qemuxml2argvdata/watchdog-dump.x86_64-latest.args b/tests/qemuxmlconfdata/watchdog-dump.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/watchdog-dump.x86_64-latest.args rename to tests/qemuxmlconfdata/watchdog-dump.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/watchdog-dump.xml b/tests/qemuxmlconfdata/watchdog-dump.xml similarity index 100% rename from tests/qemuxml2argvdata/watchdog-dump.xml rename to tests/qemuxmlconfdata/watchdog-dump.xml diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args b/tests/qemuxmlconfdata/watchdog-injectnmi.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args rename to tests/qemuxmlconfdata/watchdog-injectnmi.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.xml b/tests/qemuxmlconfdata/watchdog-injectnmi.xml similarity index 100% rename from tests/qemuxml2argvdata/watchdog-injectnmi.xml rename to tests/qemuxmlconfdata/watchdog-injectnmi.xml diff --git a/tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.args b/tests/qemuxmlconfdata/watchdog-q35-multiple.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.args rename to tests/qemuxmlconfdata/watchdog-q35-multiple.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/watchdog-q35-multiple.xml b/tests/qemuxmlconfdata/watchdog-q35-multiple.xml similarity index 100% rename from tests/qemuxml2argvdata/watchdog-q35-multiple.xml rename to tests/qemuxmlconfdata/watchdog-q35-multiple.xml diff --git a/tests/qemuxml2argvdata/watchdog.x86_64-latest.args b/tests/qemuxmlconfdata/watchdog.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/watchdog.x86_64-latest.args rename to tests/qemuxmlconfdata/watchdog.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/watchdog.xml b/tests/qemuxmlconfdata/watchdog.xml similarity index 100% rename from tests/qemuxml2argvdata/watchdog.xml rename to tests/qemuxmlconfdata/watchdog.xml diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-latest.args b/tests/qemuxmlconfdata/x86-kvm-32-on-64.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-latest.args rename to tests/qemuxmlconfdata/x86-kvm-32-on-64.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.xml b/tests/qemuxmlconfdata/x86-kvm-32-on-64.xml similarity index 100% rename from tests/qemuxml2argvdata/x86-kvm-32-on-64.xml rename to tests/qemuxmlconfdata/x86-kvm-32-on-64.xml diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args rename to tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.xml similarity index 100% rename from tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.xml rename to tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc-4.2.xml diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args rename to tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.xml similarity index 100% rename from tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.xml rename to tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35-4.2.xml diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-features.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.x86_64-latest.args rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-features.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-features.xml similarity index 100% rename from tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.xml rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-features.xml diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.xml similarity index 100% rename from tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.xml rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc-4.2.xml diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.xml b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.xml similarity index 100% rename from tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.xml rename to tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35-4.2.xml diff --git a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args rename to tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/x86_64-pc-graphics.xml b/tests/qemuxmlconfdata/x86_64-pc-graphics.xml similarity index 100% rename from tests/qemuxml2argvdata/x86_64-pc-graphics.xml rename to tests/qemuxmlconfdata/x86_64-pc-graphics.xml diff --git a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args rename to tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/x86_64-pc-headless.xml b/tests/qemuxmlconfdata/x86_64-pc-headless.xml similarity index 100% rename from tests/qemuxml2argvdata/x86_64-pc-headless.xml rename to tests/qemuxmlconfdata/x86_64-pc-headless.xml diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args rename to tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.xml b/tests/qemuxmlconfdata/x86_64-q35-graphics.xml similarity index 100% rename from tests/qemuxml2argvdata/x86_64-q35-graphics.xml rename to tests/qemuxmlconfdata/x86_64-q35-graphics.xml diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args rename to tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.xml b/tests/qemuxmlconfdata/x86_64-q35-headless.xml similarity index 100% rename from tests/qemuxml2argvdata/x86_64-q35-headless.xml rename to tests/qemuxmlconfdata/x86_64-q35-headless.xml diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index cb19e7b27d..743ddc995c 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -951,15 +951,15 @@ testConfXMLEnumerate(GHashTable *existingTestCases) if (virTestHasRangeBitmap()) return 0; - if (virDirOpen(&dir, abs_srcdir "/qemuxml2argvdata") < 0) + if (virDirOpen(&dir, abs_srcdir "/qemuxmlconfdata") < 0) return -1; - while ((rc = virDirRead(dir, &ent, abs_srcdir "/qemuxml2argvdata")) > 0) { + while ((rc = virDirRead(dir, &ent, abs_srcdir "/qemuxmlconfdata")) > 0) { if (virStringHasSuffix(ent->d_name, ".xml") || virStringHasSuffix(ent->d_name, ".args") || virStringHasSuffix(ent->d_name, ".err")) { g_hash_table_insert(existingTestCases, - g_strdup_printf(abs_srcdir "/qemuxml2argvdata/%s", ent->d_name), + g_strdup_printf(abs_srcdir "/qemuxmlconfdata/%s", ent->d_name), NULL); } } @@ -1001,11 +1001,11 @@ testRun(const char *name, testQemuInfoSetArgs(info, ap); va_end(ap); - info->infile = g_strdup_printf("%s/qemuxml2argvdata/%s.xml", abs_srcdir, info->name); + info->infile = g_strdup_printf("%s/qemuxmlconfdata/%s.xml", abs_srcdir, info->name); if (info->flags & (FLAG_EXPECT_FAILURE | FLAG_EXPECT_PARSE_ERROR)) { - info->errfile = g_strdup_printf("%s/qemuxml2argvdata/%s%s.err", abs_srcdir, info->name, suffix); + info->errfile = g_strdup_printf("%s/qemuxmlconfdata/%s%s.err", abs_srcdir, info->name, suffix); } else { - info->outfile = g_strdup_printf("%s/qemuxml2argvdata/%s%s.args", abs_srcdir, info->name, suffix); + info->outfile = g_strdup_printf("%s/qemuxmlconfdata/%s%s.args", abs_srcdir, info->name, suffix); } if (!(info->flags & FLAG_EXPECT_PARSE_ERROR)) diff --git a/tests/virschematest.c b/tests/virschematest.c index 1e911cd68e..e13e0b890c 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -239,7 +239,7 @@ static const char *exceptions_qemuxml2xmloutdata[] = { static const struct testSchemaEntry schemaDomain[] = { { .dir = "tests/domainschemadata" }, - { .dir = "tests/qemuxml2argvdata" }, + { .dir = "tests/qemuxmlconfdata" }, { .dir = "tests/xmconfigdata" }, { .dir = "tests/qemuxml2xmloutdata", .exceptions = exceptions_qemuxml2xmloutdata, -- 2.43.0