The -uuid arg was added in QEMU 0.10.0, so the QEMU driver can
assume it is always available.
Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
---
src/qemu/qemu_capabilities.c | 3 ---
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 3 +--
tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 -
tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 -
tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 -
tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 -
tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 -
tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 -
tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 -
tests/qemucaps2xmldata/all_1.6.0-1.caps | 1 -
tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps | 1 -
tests/qemuhelptest.c | 8 --------
.../qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-bios.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args | 1 +
.../qemuxml2argv-boot-menu-disable-drive-bootindex.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args | 1 +
.../qemuxml2argv-boot-menu-enable-with-timeout.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-boot-network.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-boot-order.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-clock-france.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args | 1 +
.../qemuxml2argv-clock-localtime-basis-localtime.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-console-compat.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-controller-order.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args | 1 +
.../qemuxml2argv-cpu-host-passthrough-features.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-cputune.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args | 1 +
.../qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args | 1 +
.../qemuxml2argv-disk-drive-cache-directsync.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args | 1 +
.../qemuxml2argv-disk-drive-error-policy-enospace.args | 1 +
.../qemuxml2argv-disk-drive-error-policy-stop.args | 1 +
.../qemuxml2argv-disk-drive-error-policy-wreport-rignore.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args | 1 +
.../qemuxml2argv-disk-drive-network-iscsi-auth.args | 1 +
.../qemuxml2argv-disk-drive-network-iscsi-lun.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args | 1 +
.../qemuxml2argv-disk-drive-network-nbd-export.args | 1 +
.../qemuxml2argv-disk-drive-network-nbd-ipv6-export.args | 1 +
.../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 1 +
.../qemuxml2argv-disk-drive-network-nbd-unix.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args | 1 +
.../qemuxml2argv-disk-drive-network-rbd-auth.args | 1 +
.../qemuxml2argv-disk-drive-network-rbd-ceph-env.args | 1 +
.../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args | 1 +
.../qemuxml2argv-disk-drive-network-sheepdog.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args | 1 +
.../qemuxml2argv-disk-drive-readonly-no-device.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args | 1 +
.../qemuxml2argv-disk-floppy-tray-no-device-cap.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-many.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-order.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args | 1 +
.../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args | 1 +
.../qemuxml2argv-disk-virtio-scsi-max_sectors.args | 1 +
.../qemuxml2argv-disk-virtio-scsi-num_queues.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args | 1 +
.../qemuxml2argv-graphics-spice-agent-file-xfer.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args | 1 +
.../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args | 1 +
.../qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args | 1 +
.../qemuxml2argv-hostdev-usb-address-device-boot.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-iothreads.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-kvm.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-lease.args | 1 +
.../qemuxml2argv-machine-aeskeywrap-off-argv.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args | 1 +
.../qemuxml2argv-machine-aeskeywrap-off-caps.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args | 1 +
.../qemuxml2argv-machine-deakeywrap-off-argv.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args | 1 +
.../qemuxml2argv-machine-deakeywrap-off-caps.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-memtune.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-metadata.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-migrate.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-minimal.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-net-client.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args | 1 +
.../qemuxml2argv-net-hostdev-vfio-multidomain.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-net-server.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-net-udp.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args | 1 +
.../qemuxml2argv-net-virtio-disable-offloads.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-nographics.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args | 1 +
.../qemuxml2argv-numad-auto-memory-vcpu-cpuset.args | 1 +
...muxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args | 1 +
.../qemuxml2argv-numad-auto-vcpu-static-numatune.args | 1 +
.../qemuxml2argv-numad-static-memory-auto-vcpu.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-numad.args | 1 +
.../qemuxml2argv-numatune-auto-nodeset-invalid.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-panic.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pci-many.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 1 +
.../qemuxml2argv-pcie-switch-downstream-port.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.xml | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.xml | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-q35.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args | 1 +
.../qemuxml2argv-s390-allow-bogus-usb-controller.args | 1 +
.../qemuxml2argv-s390-allow-bogus-usb-controller.xml | 1 +
.../qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.xml | 1 +
tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-file.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-many.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args | 1 +
.../qemuxml2argv-smartcard-host-certificates.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args | 1 +
.../qemuxml2argv-smartcard-passthrough-spicevmc.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-smp.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-sound-device.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-sound.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-usb-none.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args | 1 +
.../qemuxml2argv-video-device-pciaddr-default.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args | 1 +
.../qemuxml2argv-video-qxl-sec-device-vgamem.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args | 1 +
tests/qemuxml2argvdata/qemuxml2argv-watchdog.args | 1 +
tests/qemuxml2argvtest.c | 2 +-
tests/qemuxml2xmltest.c | 1 -
tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args | 1 +
tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args | 1 +
tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args | 1 +
tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args | 1 +
tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args | 1 +
tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args | 1 +
tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args | 1 +
470 files changed, 458 insertions(+), 25 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index e8ba22e..eb7dac2 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1096,8 +1096,6 @@ virQEMUCapsComputeCmdFlags(const char *help,
virQEMUCapsSet(qemuCaps, QEMU_CAPS_ENABLE_KVM);
if (strstr(help, ",process="))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME_PROCESS);
- if (strstr(help, "-uuid"))
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_UUID);
if (strstr(help, "-xen-domid"))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_XEN_DOMID);
else if (strstr(help, "-domid"))
@@ -3210,7 +3208,6 @@ static qemuMonitorCallbacks callbacks = {
static void
virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
{
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_UUID);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNET_HDR);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_TCP);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index f28207d..6433328 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -54,7 +54,7 @@ typedef enum {
/* 5 */
X_QEMU_CAPS_NAME, /* Is the -name flag available */
- QEMU_CAPS_UUID, /* Is the -uuid flag available */
+ X_QEMU_CAPS_UUID, /* Is the -uuid flag available */
QEMU_CAPS_DOMID, /* Xenner: -domid flag available */
QEMU_CAPS_VNET_HDR,
QEMU_CAPS_MIGRATE_KVM_STDIO, /* avoid kvm tcp migration bug */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index e992717..c482253 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9460,8 +9460,7 @@ qemuBuildCommandLine(virConnectPtr conn,
}
}
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_UUID))
- virCommandAddArgList(cmd, "-uuid", uuid, NULL);
+ virCommandAddArgList(cmd, "-uuid", uuid, NULL);
if (def->virtType == VIR_DOMAIN_VIRT_XEN ||
def->os.type == VIR_DOMAIN_OSTYPE_XEN ||
def->os.type == VIR_DOMAIN_OSTYPE_LINUX) {
diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
index c8ac077..36d3732 100644
--- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
@@ -1,5 +1,4 @@
<qemuCaps>
- <flag name='uuid'/>
<flag name='vnet-hdr'/>
<flag name='migrate-qemu-tcp'/>
<flag name='migrate-qemu-exec'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
index fdd7260..d0057d4 100644
--- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
@@ -1,5 +1,4 @@
<qemuCaps>
- <flag name='uuid'/>
<flag name='vnet-hdr'/>
<flag name='migrate-qemu-tcp'/>
<flag name='migrate-qemu-exec'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
index b57d2fb..79ae61a 100644
--- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
@@ -1,5 +1,4 @@
<qemuCaps>
- <flag name='uuid'/>
<flag name='vnet-hdr'/>
<flag name='migrate-qemu-tcp'/>
<flag name='migrate-qemu-exec'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
index f28ab79..7b8e93d 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
@@ -1,5 +1,4 @@
<qemuCaps>
- <flag name='uuid'/>
<flag name='vnet-hdr'/>
<flag name='migrate-qemu-tcp'/>
<flag name='migrate-qemu-exec'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
index 6317737..fe2ea59 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
@@ -1,5 +1,4 @@
<qemuCaps>
- <flag name='uuid'/>
<flag name='vnet-hdr'/>
<flag name='migrate-qemu-tcp'/>
<flag name='migrate-qemu-exec'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
index 70da8fd..80f62a1 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
@@ -1,5 +1,4 @@
<qemuCaps>
- <flag name='uuid'/>
<flag name='vnet-hdr'/>
<flag name='migrate-qemu-tcp'/>
<flag name='migrate-qemu-exec'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
index 393c726..eade502 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
@@ -1,5 +1,4 @@
<qemuCaps>
- <flag name='uuid'/>
<flag name='vnet-hdr'/>
<flag name='migrate-qemu-tcp'/>
<flag name='migrate-qemu-exec'/>
diff --git a/tests/qemucaps2xmldata/all_1.6.0-1.caps b/tests/qemucaps2xmldata/all_1.6.0-1.caps
index dfcdd86..ac6bca9 100644
--- a/tests/qemucaps2xmldata/all_1.6.0-1.caps
+++ b/tests/qemucaps2xmldata/all_1.6.0-1.caps
@@ -1,5 +1,4 @@
<qemuCaps>
- <flag name='uuid'/>
<flag name='vnet-hdr'/>
<flag name='migrate-qemu-tcp'/>
<flag name='migrate-qemu-exec'/>
diff --git a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps
index 125b1c6..e941487 100644
--- a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps
+++ b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps
@@ -1,5 +1,4 @@
<qemuCaps>
- <flag name='uuid'/>
<flag name='vnet-hdr'/>
<flag name='migrate-qemu-tcp'/>
<flag name='migrate-qemu-exec'/>
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index e3953d3..e5b7b7c 100644
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -152,7 +152,6 @@ mymain(void)
DO_TEST_FULL(name, version, is_kvm, kvm_version, VIR_ERR_OK, __VA_ARGS__)
DO_TEST("qemu-0.12.1", 12001, 0, 0,
- QEMU_CAPS_UUID,
QEMU_CAPS_MIGRATE_QEMU_TCP,
QEMU_CAPS_MIGRATE_QEMU_EXEC,
QEMU_CAPS_DRIVE_CACHE_V2,
@@ -185,7 +184,6 @@ mymain(void)
QEMU_CAPS_VNC);
DO_TEST("qemu-kvm-0.12.1.2-rhel60", 12001, 1, 0,
QEMU_CAPS_DRIVE_BOOT,
- QEMU_CAPS_UUID,
QEMU_CAPS_VNET_HDR,
QEMU_CAPS_MIGRATE_QEMU_TCP,
QEMU_CAPS_MIGRATE_QEMU_EXEC,
@@ -244,7 +242,6 @@ mymain(void)
QEMU_CAPS_DEVICE_VIRTIO_NET);
DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0,
QEMU_CAPS_DRIVE_BOOT,
- QEMU_CAPS_UUID,
QEMU_CAPS_VNET_HDR,
QEMU_CAPS_MIGRATE_QEMU_TCP,
QEMU_CAPS_MIGRATE_QEMU_EXEC,
@@ -283,7 +280,6 @@ mymain(void)
QEMU_CAPS_VNC);
DO_TEST("qemu-kvm-0.13.0", 13000, 1, 0,
QEMU_CAPS_DRIVE_BOOT,
- QEMU_CAPS_UUID,
QEMU_CAPS_VNET_HDR,
QEMU_CAPS_MIGRATE_QEMU_TCP,
QEMU_CAPS_MIGRATE_QEMU_EXEC,
@@ -353,7 +349,6 @@ mymain(void)
QEMU_CAPS_DEVICE_E1000,
QEMU_CAPS_DEVICE_VIRTIO_NET);
DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0,
- QEMU_CAPS_UUID,
QEMU_CAPS_VNET_HDR,
QEMU_CAPS_MIGRATE_QEMU_TCP,
QEMU_CAPS_MIGRATE_QEMU_EXEC,
@@ -419,7 +414,6 @@ mymain(void)
QEMU_CAPS_DEVICE_E1000,
QEMU_CAPS_DEVICE_VIRTIO_NET);
DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0,
- QEMU_CAPS_UUID,
QEMU_CAPS_VNET_HDR,
QEMU_CAPS_MIGRATE_QEMU_TCP,
QEMU_CAPS_MIGRATE_QEMU_EXEC,
@@ -493,7 +487,6 @@ mymain(void)
QEMU_CAPS_DEVICE_E1000,
QEMU_CAPS_DEVICE_VIRTIO_NET);
DO_TEST("qemu-1.0", 1000000, 0, 0,
- QEMU_CAPS_UUID,
QEMU_CAPS_MIGRATE_QEMU_TCP,
QEMU_CAPS_MIGRATE_QEMU_EXEC,
QEMU_CAPS_DRIVE_CACHE_V2,
@@ -582,7 +575,6 @@ mymain(void)
QEMU_CAPS_DEVICE_E1000,
QEMU_CAPS_DEVICE_VIRTIO_NET);
DO_TEST("qemu-1.1.0", 1001000, 0, 0,
- QEMU_CAPS_UUID,
QEMU_CAPS_MIGRATE_QEMU_TCP,
QEMU_CAPS_MIGRATE_QEMU_EXEC,
QEMU_CAPS_DRIVE_CACHE_V2,
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args
index d355a5f..09dac0c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
+-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args
index b868e0b..3ded3e9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu host \
-m 1024 \
-smp 1 \
+-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args
index 941342b..be19ea4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args
index c5b3270..a3530bb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gicv3.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args
index e04afd2..3397c33 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu host,aarch64=off \
-m 1024 \
-smp 1 \
+-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args
index 4d41d04..8fa0dd0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-mmio-default-pci.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
+-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args
index 5c3c28e..460a351 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args
index dc9462b..fbd9234 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
+-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args
index f002684..053a6d8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu cortex-a53 \
-m 1024 \
-smp 1 \
+-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args
index 7003f0a..892654a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M vexpress-a9 \
-m 1024 \
-smp 1 \
+-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args
index 1164599..78e9338 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M vexpress-a9 \
-m 1024 \
-smp 1 \
+-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args
index 7b4740e..c19a808 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M vexpress-a9 \
-m 1024 \
-smp 1 \
+-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args
index ec4f2c3..b3f9ab3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M virt \
-m 1024 \
-smp 1 \
+-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args
index bc7090f..4deb0ec 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args
index 4635bcb..bfe81a3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args
index 4635bcb..bfe81a3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args
index 1760939..3dd4e79 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-drive file=/usr/share/OVMF/OVMF_VARS.fd,if=pflash,format=raw,unit=1 \
-m 1024 \
-smp 1 \
+-uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.args b/tests/qemuxml2argvdata/qemuxml2argv-bios.args
index a3dbdca..aba184e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-bios.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-bios /usr/share/seabios/bios.bin \
-m 1024 \
-smp 1 \
+-uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
-nographic \
-nodefaults \
-device sga \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args
index 65593ca..f8aa2fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args
index 48b9a01..a113b4c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args
index 903d23e..7a531fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args
index 903d23e..7a531fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args
index aaa26c0..176791e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args
index 2be7f10..186a44d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args
index 5c14062..d7d4a53 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args
index 90aae0c..d60bcf6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-q35-2.4 \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args
index 958304d..4b55b6b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args
index abfd47b..61d72bc 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args
index 9da5f16..8115545 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args
index 0455c50..5864859 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args
index dc23ed7..1f3727f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args
index d045718..1b4f3d0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args
index 5145437..9a2a178 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args
index 09e72fc..108bea6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args
index 0a778f1..629316f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args
index 0eabe00..2dc0c79 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args
index 4ec0432..be7763c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-q35-2.4 \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args
index 000c042..31b3242 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args
index 41969c8..896c69e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nodefconfig \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args
index 6321840..e75b510 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nodefconfig \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args
index 1a3c750..55a0826 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args
index d412b9d..dcad80b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args
index d7e69bd..6b139cf 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args
index b62df60..b73d0c5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args
index 7188d92..32362bc 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args
index 99640b8..99c5f4c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
index 7acfef6..26b112d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args
index d6d07d6..f1779c8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-rtc base=utc,driftfix=slew \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args
index 8eaa246..cd19362 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args
@@ -11,6 +11,7 @@ TZ=Europe/Paris \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-rtc base=localtime \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args
index d1c99c6..f10cbb6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-rtc base=utc,driftfix=slew \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args
index 1f7e603..a41563f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid 1c15a1f6-f4f0-4d3c-9002-667ddb458736 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-rtc base=2009-02-14T00:01:30 \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args
index 8a8dbbc..562ef76 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-localtime \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args
index da4d85f..bd9fdc0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu32,hv_time \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args
index 903d23e..7a531fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args
index 3a37458..da130d1 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-rtc base=2009-02-15T09:49:06 \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args
index c1558d0..8dab65c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args
index 49831f6..1e07163 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
index c1558d0..8dab65c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args
index 5ef6884..f2feb0a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M s390-virtio \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args
index 715f40c..97adfe3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M s390-ccw \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args
index fa5c92d..09dd2b5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args
index c0cecd9..0d18fe7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M s390-virtio \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args
index 0c8af3a..c0b2f89 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args
index c6eddd1..937f90b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=spice \
-enable-kvm \
-m 4096 \
-smp 4 \
+-uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args
index d1de725..5e36350 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu Haswell-noTSX \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args
index 551b3ec..8fa60eb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu Haswell \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args
index 3eb4cbd..def6a2f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu Haswell,-rtm,-hle \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args
index 551b3ec..8fa60eb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu Haswell \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args
index 5127dbb..a54eba6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu32,-kvm_pv_eoi \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-boot n \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args
index 6df39b9..6587cc5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu32,+kvm_pv_eoi \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-boot n \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args
index d049a77..b256986 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu64,-svm,-lm,-nx,-syscall,-clflush,-pse36,-mca \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args
index d373d9d..13dadd8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+ds_cpl,+tm,+ht,+ds,-nx \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args
index d373d9d..13dadd8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+ds_cpl,+tm,+ht,+ds,-nx \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args
index ae6f96f..d3f4aa4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu Penryn,-sse4.1 \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args
index 8d15d7f..64e410c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-cpu host,-kvmclock \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args
index b58a0f0..613bbef 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
+vme,-sse4.1 \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args
index 156f84f..d08ab20 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
+pbe,+tm,+ht,+ss,+acpi,+ds' \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args
index f5a2b96..a6141ce 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
+ds \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args
index ced3327..42132e8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu host,+abm,+ds,-invtsc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args
index 63d1356..86a963f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu host \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args
index dc2bc2f..f8e007f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-cpu core2duo,-kvmclock \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args
index 4571acc..8464a6e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
+ds \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args
index d1cc2bd..867e3c9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
+ds,-lm,-nx,-syscall \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args
index cc083aa..364b4ed 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-smp 16 \
-numa node,nodeid=0,cpus=0-3,cpus=8-11,mem=107 \
-numa node,nodeid=1,cpus=4-7,cpus=12-15,mem=107 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args
index e3b0873..a58467d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-smp 16,sockets=2,cores=4,threads=2 \
-numa node,nodeid=0,cpus=0-7,mem=107 \
-numa node,nodeid=1,cpus=8-15,mem=107 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args
index 4d0ca79..a12f909 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-smp 16 \
-numa node,nodeid=0,cpus=0-7,mem=107 \
-numa node,nodeid=1,cpus=8-15,mem=107 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args
index e3b0873..a58467d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-smp 16,sockets=2,cores=4,threads=2 \
-numa node,nodeid=0,cpus=0-7,mem=107 \
-numa node,nodeid=1,cpus=8-15,mem=107 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args
index 7d38fd4..244990a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu core2duo,+lahf_lm,+3dnowext,+xtpr,+est,+vmx,+ds_cpl,+tm,+ht,+acpi,+ds,-nx \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args
index 682112a..06516e8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 6,sockets=3,cores=2,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args
index e25dc3a..7d9f072 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu core2duo \
-m 214 \
-smp 6,sockets=1,cores=2,threads=3 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args
index 18c572e..d12ed63 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args
index eeb8d8d..7e5678d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-smp 2,maxcpus=6,sockets=6,cores=1,threads=1 \
-object iothread,id=iothread1 \
-object iothread,id=iothread2 \
+-uuid 4d92ec27-9ebf-400b-ae91-20c71c647c19 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args b/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args
index f9028bb..02b6a55 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 2 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune.args b/tests/qemuxml2argvdata/qemuxml2argv-cputune.args
index f9028bb..02b6a55 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cputune.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 2 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args b/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args
index 03290b5..e9ba68f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,accel=kvm \
-m 4096 \
-smp 4 \
+-uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args b/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args
index 08fc3b0..7a904f2 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine pc-0.11,accel=tcg \
-m 4096 \
-smp 4 \
+-uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args
index 1b768e0..f85624d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args
index 7304fbe..a1f6327 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args
index b22b328..e1fcf99 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args
index bb24f41..6b6b33c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-1.2 \
-m 1024 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args
index 1b09806..c5ea7b8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-1.2 \
-m 1024 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args
index 66123e2..84fca84 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-1.2 \
-m 1024 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args
index 97b9071..2eb64fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-1.2 \
-m 1024 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args
index 42ec5c6..367745e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-1.2 \
-m 1024 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args
index b22b328..e1fcf99 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args
index f60cdce..5fe6440 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-0.13 \
-m 1024 \
-smp 1 \
+-uuid 3fa02811-7832-34bd-004d-1ff56a9286ff \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args
index 7d3f7d1..39d98f7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args
index 24cddfc..c48f939 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-0.13 \
-m 1024 \
-smp 1 \
+-uuid 468404ad-d49c-40f2-9e14-02294f9c1be3 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args
index 6178fc6..ae9780a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args
index 4196706..2ae53ed 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args
index 0e21686..3174af9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args
index 9772e62..911fc3e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args
index 74a3c99..274539e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args
index 974df41..5900509 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args
index 74a3c99..274539e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args
index 8b7efa5..f3f8bdc 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args
index 00151f5..540786f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args
index d338743..eee0996 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args
index ce549b6..592314e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args
index 074eac9..7549f91 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-0.13 \
-m 1024 \
-smp 1 \
+-uuid 92d7a226-cfae-425b-a6d3-00bbf9ec5c9e \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args
index cf20444..7c5d02d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor control,unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args
index 86530a4..e240832 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor control,unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args
index 4dd82be..85cebc7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor control,unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args
index 68e6f67..f1b3250 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args
index bdd9130..8e0c1eb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args
index 36c7cca..363ae82 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args
index 48361b3..d0c030f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args
index b16de7a..689ad2e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args
index 18fa809..50483d2 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args
index a6ef9e5..d3f7bc9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args
index d413f90..66174c7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args
index 40dd6d6..0b6cddb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args
index 5da8372..94c2af6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args
index c9daf15..d160bd9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args
index 95079be..3931318 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args
index 9446e0e..f8761c9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.args
@@ -12,6 +12,7 @@ mon1.example.org:6321,mon2.example.org:6322,mon3.example.org:6322 \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args
index a9979d7..db17df6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args
index 94e759a..62d3280 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args
index 350c709..1639d0c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args
index 2f70cbc..589bbcd 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args
index 6f9e15b..11e2e2d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args
index 62463fd..bbe917f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args
index 6234b99..fd2941f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args
index a4ef36c..799f11a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pseries \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args
index 0cedb01..437d791 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args
index df7d43b..3b6d00d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args
index ddcb0b8..0c4003f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args
index 36995fc..2f94b3f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args
index 646f9f7..45c6dd3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args
index 1949628..606ea51 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args
index 46a25c4..b65770c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-0.13 \
-m 1024 \
-smp 1 \
+-uuid 8c273d77-39b0-47c4-9714-6dddcad56b88 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml
index edfa731..90b0157 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml
@@ -1,5 +1,6 @@
<domain type='qemu'>
<name>test</name>
+ <uuid>8c273d77-39b0-47c4-9714-6dddcad56b88</uuid>
<memory unit='KiB'>1048576</memory>
<vcpu placement='static'>1</vcpu>
<os>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args
index 33f940d..79bbe29 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args
index 584f352..abc1626 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args
index 02dbb3d..7c8641b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args
index 53ef910..00b3103 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args
index 62ca44a..21774b7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args
index 62ca44a..21774b7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args
index 6a26086..c5d35bf 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args
index 17dae7a..9b16956 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args
index 1e92391..0babb37 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args
index ac58027..f99f4f2 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args
index f2fa9a2..4f1caa7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args
index b22ec00..8e5cbd9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args
index 948d3eb..3159a26 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args
index 22ba3d1..86b78eb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args
index 1c09926..d679aec 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args
index 6c8586a..e1d6512 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args
index e5cc374..26f0137 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args
index e53cf2b..b89e9bb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args
index ae26a02..3381073 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args
index 879fb6e..dfc7b9f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args
index 1e0905a..889d635 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M s390-ccw \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args
index 4095ce3..430df81 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M s390-ccw \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args
index 7f34a10..b97090b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M s390-virtio \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args
index 9dcd5f2..179e725 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M s390-ccw \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args
index 37cbe33..f127f92 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 8 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args
index 259e807..4eb1c7e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 8 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args
index 44c98e8..d17e2c3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 8 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args
index 574066c..5c36f27 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 8 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args
index adcd446..d6cb697 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args
index 1a7755d..8f20b3b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args
index 576cd93..87e1d2e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args
@@ -10,6 +10,7 @@ LOGNAME=root \
-m 1024 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
+-uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args
index 5127dbb..a54eba6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu32,-kvm_pv_eoi \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-boot n \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args
index 6df39b9..6587cc5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu32,+kvm_pv_eoi \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-boot n \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args
index 490ef61..768cc9d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-0.13 \
-m 1024 \
-smp 1 \
+-uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args
index 726e0a1..01563f4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args
index 5879345..929078e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args
index a9bad83..8ccb593 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M s390-ccw-virtio \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args
index 0c9b71b..165a153 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args
index 6f22abf..acfb6b4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args
@@ -11,6 +11,7 @@ DISPLAY=:0.1 \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
-boot c \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args
index db7b2df..fec0a5e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args
@@ -11,6 +11,7 @@ DISPLAY=:0.1 \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
-boot c \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args
index 2155ff4..3010767 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args
index 44c1874..4a1c3ac 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nodefconfig \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args
index f15b7de..4cce624 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args
index 73e8227..c3ba565 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
index 0a78f3d..7786553a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=spice \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args
index ede86bd..662445a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=spice \
+ds \
-m 1024 \
-smp 2 \
+-uuid 553effab-b5e1-2d80-dfe3-da4344826c43 \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
-boot dc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args
index a87be90..24e5c34 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nodefconfig \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args
index 074cdd2..1ee5da0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args
index e59dd60..fcb796a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
-boot c \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
index 95bf81d..1cc36b5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
-boot c \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args
index 3f67906..93c3ef3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
-boot c \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
index 7c3e5f1..d586af8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
-boot c \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args
index c0490dc..9f3288e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
-boot c \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args
index f7416b3..5be901f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
-boot c \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args
index 9787c7b..100721a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args
index 0ef4791..69f641a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args
index a699e79..8537a9d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args
index 70d249f..39d397c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args
index e72391e..d8387f0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args
index 090f0b9..252b255 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args
index ed68964..81b18ea 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args
index 20de760..15dfd37 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args
index b48ff19..cb87a7a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args
index d7a44d6..716b18c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args
index 61f2501..0714d53 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args
index aa8383d..9d6730a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args
index 51c0f68..fd30c1f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args
index 2cc6d55..b8a76ae 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args
index 06fef9c..879e69a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args b/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args
index 2047478..777d06b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 4096 \
-smp 4 \
+-uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args
index c9574da..3dec91f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args
@@ -17,6 +17,7 @@ QEMU_AUDIO_DRV=spice \
mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=1-3,\
policy=bind \
-device pc-dimm,node=0,memdev=memdimm0,id=dimm0 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
-rtc base=utc,driftfix=slew \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args
index da9a6ed..d995790 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args
@@ -25,6 +25,7 @@ policy=bind \
-object memory-backend-file,id=ram-node3,prealloc=yes,\
mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=3,policy=bind \
-numa node,nodeid=3,cpus=3,memdev=ram-node3 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args
index cc07aa1..9e78a54 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args
@@ -16,6 +16,7 @@ mem-path=/dev/hugepages2M/libvirt/qemu,size=268435456 \
-object memory-backend-file,id=ram-node1,prealloc=yes,\
mem-path=/dev/hugepages2M/libvirt/qemu,size=805306368 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
+-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args
index c415fec..1e69158 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args
@@ -15,6 +15,7 @@ QEMU_AUDIO_DRV=none \
-object memory-backend-file,id=ram-node1,prealloc=yes,\
mem-path=/dev/hugepages1G/libvirt/qemu,size=805306368 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
+-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args
index 6f9970f..5e51e23 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-mem-prealloc \
-mem-path /dev/hugepages2M/libvirt/qemu \
-smp 2 \
+-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args
index 2b03065..9ed7eed 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 1024 \
-smp 2 \
+-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args
index c15b8ca..f79c32e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args
@@ -25,6 +25,7 @@ policy=bind \
-object memory-backend-file,id=ram-node3,prealloc=yes,\
mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=3,policy=bind \
-numa node,nodeid=3,cpus=3,memdev=ram-node3 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args
index 237f6a4..b66a50e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-mem-prealloc \
-mem-path /dev/hugepages2M/libvirt/qemu \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args b/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args
index 6ade3c4..bcbf0e5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu32 \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-boot n \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args b/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args
index c14495a..a6f37e3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu32,hv_relaxed,hv_vapic,hv_spinlocks=0x2fff \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-boot n \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args
index 8364bba..c6e9b79 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args
index 3355f67..c1e3ace 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args
index d557f66..4c95753 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args
index 470fe11..6cc77d6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-smp 1 \
-object iothread,id=iothread1 \
-object iothread,id=iothread2 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args
index da35ad0..80c0f8a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-smp 2 \
-object iothread,id=iothread1 \
-object iothread,id=iothread2 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args
index 32e72c1..c5b11fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args
@@ -14,6 +14,7 @@ QEMU_AUDIO_DRV=none \
-object iothread,id=iothread6 \
-object iothread,id=iothread1 \
-object iothread,id=iothread2 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args
index 4510721..6863944 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-smp 2 \
-object iothread,id=iothread2 \
-object iothread,id=iothread4 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args b/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args
index d4fe6e9..ba79787 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-smp 2 \
-object iothread,id=iothread1 \
-object iothread,id=iothread2 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args
index 6ade3c4..bcbf0e5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu32 \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-boot n \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args
index 2f0aaf2..ff9f1dc 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu32,kvm=off \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-boot n \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args
index 8039939..2b6f4fe 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 2 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-kvm-pit-reinjection \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args
index 82c4831..95359ac 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 2 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-global kvm-pit.lost_tick_policy=discard \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm.args
index 3a6fafc..9ae9a1e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-kvm.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine pc-1.0,accel=kvm \
-m 4096 \
-smp 4 \
+-uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args
index 780fd70..25d57ca 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu32,-kvmclock,-kvm_pv_eoi \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-boot n \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args
index 8061501..1bb74fe 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu32,-kvmclock \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-lease.args b/tests/qemuxml2argvdata/qemuxml2argv-lease.args
index 45b53f2..4eb7326 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-lease.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-lease.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args
index 2d396e8..98ec167 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,accel=tcg,aes-key-wrap=off \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args
index 9e19335..72a88f4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,accel=tcg,aes-key-wrap=off \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args
index 9e19335..72a88f4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,accel=tcg,aes-key-wrap=off \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args
index 37c19a7..739a453 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,accel=tcg,aes-key-wrap=on \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args
index 1c84cda..55cd4cd 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,accel=tcg,aes-key-wrap=on \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args
index 1c84cda..55cd4cd 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,accel=tcg,aes-key-wrap=on \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args
index 411b8c1..3122fb1 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-0.11 \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args
index 4dba14f..36ba617 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args
index ab44a69..469a2b5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,accel=tcg,dump-guest-core=off \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args
index a2a469a..de95c95 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,accel=tcg,dump-guest-core=on \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args
index 045d781..fcc82e9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,accel=tcg,dea-key-wrap=off \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args
index 409664a..3bc02df 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,accel=tcg,dea-key-wrap=off \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args
index 409664a..3bc02df 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,accel=tcg,dea-key-wrap=off \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args
index f075449..0e2a719 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,accel=tcg,dea-key-wrap=on \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args
index a982a72..74e5ce0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,accel=tcg,dea-key-wrap=on \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args
index a982a72..74e5ce0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,accel=tcg,dea-key-wrap=on \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args
index 494ecb5..8183e90 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,accel=tcg \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args
index 3bdd9f6..809509e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,accel=tcg \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args
index 3bdd9f6..809509e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,accel=tcg \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args
index b574670..5a7f586 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,accel=tcg,usb=off \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args
index 19642f0..b0c6492 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,accel=tcg,vmport=off \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args
index 555888c..7d83966 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args
@@ -14,6 +14,7 @@ QEMU_AUDIO_DRV=none \
-object memory-backend-file,id=memdimm0,prealloc=yes,\
mem-path=/dev/hugepages2M/libvirt/qemu,size=536870912,host-nodes=1-3,policy=bind \
-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args
index ebbe20e..f27cb75 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args
@@ -16,6 +16,7 @@ QEMU_AUDIO_DRV=none \
-object memory-backend-file,id=memdimm1,prealloc=yes,\
mem-path=/dev/hugepages2M/libvirt/qemu,size=536870912,host-nodes=1-3,policy=bind \
-device pc-dimm,node=0,memdev=memdimm1,id=dimm1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args
index b8f80eb..08f653f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-m size=219136k,slots=16,maxmem=1099511627776k \
-smp 2 \
-numa node,nodeid=0,cpus=0-1,mem=214 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args b/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args
index 903d23e..7a531fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune.args b/tests/qemuxml2argvdata/qemuxml2argv-memtune.args
index 903d23e..7a531fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-memtune.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-memtune.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-metadata.args b/tests/qemuxml2argvdata/qemuxml2argv-metadata.args
index 903d23e..7a531fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-metadata.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-metadata.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args b/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args
index bed6a3c..3cf3205 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args
@@ -19,6 +19,7 @@ policy=bind \
-object memory-backend-ram,id=ram-node2,size=24578457600,host-nodes=1-2,\
host-nodes=5,host-nodes=7,policy=bind \
-numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \
+-uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate.args b/tests/qemuxml2argvdata/qemuxml2argv-migrate.args
index c15fa45..2d502af 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-migrate.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args
index de292a8..5bba25c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args
index 0951c04..ac45953 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M s390-virtio \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal.args
index 903d23e..7a531fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-minimal.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args
index c33da9f..079923a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-boot c \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args
index c5fed10..2e2ddca 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args
index 481207c..4063afb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args
index 3a47f61..0cec38c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args
index 5f34b6a..8178ad3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-reboot \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args
index f6f2404..8682959 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-m 214 \
-realtime mlock=off \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args
index 4bbf842..f4c3a33 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-m 214 \
-realtime mlock=on \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args b/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args
index 2cb519d..cd1c2b9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args
index 21e1ae2..50eee81 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args b/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args
index 050a1e3..4572304 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args
index 076e86b..53e8f4c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-client.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-client.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args
index 36b0a82..e0af6d3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args
index 6cf9a7b..07f350b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args
index 7f3e3b0..8d457db 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args
index 0dabd82..7bc8b3f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args
index 3b622d9..594018d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args
index 46a50f9..8aebdf7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args
index 68a72f5..af75d43 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args
index d057a49..c99b264 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args
index a4297b4..f7008c8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-server.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-server.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args b/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args
index 437644a..000617a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args b/tests/qemuxml2argvdata/qemuxml2argv-net-user.args
index 6f2428b..a141c93 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-user.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args
index bf6452a..a6a80c9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args
index e2e7a4d..beabbb2 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args
index 9a8dc81..db25cdf 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M s390-ccw \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args
index 9689475..c4389c6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args
index 017869f..3a6edb4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args
index 04b3166..6cf6fb7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args
index 9333fa5..c3a0b20 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M s390-virtio \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args
index c352f48..a6ea8ba 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args
index 9f840c5..5ca99e9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args
index 8dedbf5..1dc0eb8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics.args b/tests/qemuxml2argvdata/qemuxml2argv-nographics.args
index 903d23e..7a531fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-nographics.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args
index 36f0192..52dd271 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,accel=tcg,mem-merge=off \
-m 215 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args
index f9028bb..02b6a55 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 2 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args
index f9028bb..02b6a55 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 2 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args
index f9028bb..02b6a55 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 2 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args
index f9028bb..02b6a55 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 2 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numad.args b/tests/qemuxml2argvdata/qemuxml2argv-numad.args
index f9028bb..02b6a55 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-numad.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numad.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 2 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args
index f9028bb..02b6a55 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 2 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args
index 46d556e..b4c49d4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-m 64 \
-smp 1 \
-numa node,nodeid=0,cpus=0,mem=64 \
+-uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args
index d5c849c..b131ab8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args
@@ -15,6 +15,7 @@ policy=preferred \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-backend-ram,id=ram-node1,size=33554432 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
+-uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args
index 74e6780..b81a019 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args
@@ -19,6 +19,7 @@ policy=bind \
-object memory-backend-ram,id=ram-node2,size=24578621440,host-nodes=1-2,\
host-nodes=5,host-nodes=7,policy=bind \
-numa node,nodeid=2,cpus=28,cpus=30-31,memdev=ram-node2 \
+-uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args
index f9028bb..02b6a55 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 2 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args b/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args
index a3d238d..dcec4a0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-panic.args b/tests/qemuxml2argvdata/qemuxml2argv-panic.args
index a4e78a0..a181e18 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-panic.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-panic.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args
index 2d478d7..74059ec 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args
index c15f1ae..c240702 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args
index 10bb5f9..3201d73 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args
index 8b507f1..a5852b1 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-1.2 \
-m 2048 \
-smp 2 \
+-uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args
index 322c572..0175856 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-1.2 \
-m 2048 \
-smp 2 \
+-uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args
index 894a717..618c25a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args
@@ -12,6 +12,7 @@ QEMU_AUDIO_DRV=none \
-bios /usr/share/seabios/bios.bin \
-m 3907 \
-smp 1 \
+-uuid 04872dc1-e1de-434b-ab21-e3e80e416349 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args
index 17a2509..63a8ca7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-1.2 \
-m 2048 \
-smp 2 \
+-uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args
index a2a80b2..f1440d5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args
index 2e79b03..8a67d63 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args
index ea1a46b..5c9b55a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M q35 \
-m 2048 \
-smp 2 \
+-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args
index 350aa52..5efe042 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M q35 \
-m 2048 \
-smp 2 \
+-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args
index edc74e8..a9ff9b9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M q35 \
-m 2048 \
-smp 2 \
+-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args
index 689edb1..2d25b34 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M q35 \
-m 2048 \
-smp 2 \
+-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args
index 099eb14..595f13f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-1.2 \
-m 2048 \
-smp 2 \
+-uuid c84fc647-6198-4ff9-bf81-d65a1f8f5ec0 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args
index e67a7b5..5dd9e6c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M q35 \
-m 2048 \
-smp 2 \
+-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args
index 3dbd836..88701e0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-1.2 \
-m 2048 \
-smp 2 \
+-uuid 3c7c30b5-7866-4b05-8a29-efebccba52a0 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args
index 033f5f2..0f1e3ca 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu32,pmu=off \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-boot n \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args
index 5693c30..dfd1feb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu32,pmu=on \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-boot n \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args b/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args
index 8a60b04..f787c1e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M ppce500 \
-m 256 \
-smp 1 \
+-uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args b/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args
index 78b1609..23c2a8f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M ppce500 \
-m 256 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.xml b/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.xml
index 397aadc..4e656d5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.xml
@@ -1,5 +1,6 @@
<domain type='kvm'>
<name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>262144</memory>
<currentMemory unit='KiB'>262144</currentMemory>
<vcpu placement='static'>1</vcpu>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args
index 82af5fc..b437316 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pseries \
-m 512 \
-smp 1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args
index c02d987..0d2848e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu host,compat=power7 \
-m 256 \
-smp 4 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.xml
index e34a8ad..f6c9516 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.xml
@@ -1,5 +1,6 @@
<domain type='kvm'>
<name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>219100</memory>
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static'>4</vcpu>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args
index 887b817..440729d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu POWER7_v2.3 \
-m 512 \
-smp 1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args
index 82af5fc..b437316 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pseries \
-m 512 \
-smp 1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args
index dd3255a..1878d9a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pseries \
-m 512 \
-smp 1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args
index 82af5fc..b437316 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pseries \
-m 512 \
-smp 1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args
index 82af5fc..b437316 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pseries \
-m 512 \
-smp 1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args
index 4fa1399..d8e4d21 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pseries \
-m 512 \
-smp 1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args
index 0c371bc..e2296cb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pseries \
-m 512 \
-smp 1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args
index 5052269..37f8738 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pseries \
-m 512 \
-smp 1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args
index 5b1abc3..17a8fab 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pseries \
-m 512 \
-smp 1 \
+-uuid 2754dd7b-ac8a-4850-aec0-1f3fcd43235b \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args
index 48487ea..bd2a89e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pseries \
-m 512 \
-smp 1 \
+-uuid 2754dd7b-ac8a-4850-aec0-1f3fcd43235b \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args
index 09602ad..880c6a3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu32,-kvm_pv_unhalt \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-boot n \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args
index d3d5421..1a0cf8a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu32,+kvm_pv_unhalt \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-boot n \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-q35.args
index 2027229..faa407f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-q35.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-q35.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M q35 \
-m 2048 \
-smp 2 \
+-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args
index 483f1bd..d48f28d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args
index 0cc95d2..a517f16 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args
@@ -12,6 +12,7 @@ BAR='' \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args
index 8023a87..c7f5ee8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args
index 73c70d0..d09350a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 6 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args
index 7598b9c..017d19c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 213 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args
index 066e19b..e03bb8d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args
index d227a77..2e814a3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args
index ada8882..4f85749 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M s390-virtio \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.xml b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.xml
index ba0e6f7..6b51f8b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.xml
@@ -1,5 +1,6 @@
<domain type='qemu'>
<name>test</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory>219100</memory>
<currentMemory>219100</currentMemory>
<os>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args
index ada8882..4f85749 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M s390-virtio \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.xml
index f2977b5..8429939 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.xml
@@ -1,5 +1,6 @@
<domain type='qemu'>
<name>test</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory>219100</memory>
<currentMemory>219100</currentMemory>
<os>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args
index 903d23e..7a531fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args
index 903d23e..7a531fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args
index 903d23e..7a531fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args
index 7c8123a..b0c3b26 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args
index 903d23e..7a531fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args
index 903d23e..7a531fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args
index 903d23e..7a531fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args
index 903d23e..7a531fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args
index 903d23e..7a531fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args
index 903d23e..7a531fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args
index f5ebcbc..edfb9c6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args
index a7a56e4..0a77fba 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args
index e698c72..6cc64ef 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args
index 7828233..e2e8ba8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args
index e37708c..9fced8f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args
index 73884cb..07c2301 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args
index 2f0168a..e71522c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args
index 49831f6..1e07163 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args
index c1558d0..8dab65c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args
index 903d23e..7a531fb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args
index 67c40a2..fa229c4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nodefconfig \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args
index 443cd35..a934726 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args
index 671f315..33a95e7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args
index cd08f32..10e9524 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args
index ea2558c..f2b56f4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args
index cbd1ce0..610f223 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args
index 3f7ce02..716e65e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args
index 61085875..d5bab35 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args
index 0e16341..f9ace32 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args
index 01e4307..3c475a6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args
index c77015a..5768089 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem.args b/tests/qemuxml2argvdata/qemuxml2argv-shmem.args
index 078ac4c..37b1b81 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-shmem.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-shmem.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args
index 2c6af2e..3e65242 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args
index e5875a5..786f911 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args
index 2c6af2e..3e65242 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args
index 0fdbdbd..e73ac2b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args
index 9002ce6..4c02224 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args
index 2b03eeb1..0203147 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-smbios 'type=0,vendor=LENOVO,version=6FET82WW (3.12 )' \
-smbios 'type=1,manufacturer=Fedora,product=Virt-Manager,version=0.8.2-3.fc14,\
serial=32dfcb37-5af1-552b-357c-be8c3aa38310,\
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smp.args b/tests/qemuxml2argvdata/qemuxml2argv-smp.args
index 3cec52c..886cfd9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-smp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smp.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1,maxcpus=2,sockets=2,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args
index 19507ab..8974d50 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.args b/tests/qemuxml2argvdata/qemuxml2argv-sound.args
index 60359b7..e72b272 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-sound.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args
index c18ec7f..f33120f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-0.12 \
-m 2048 \
-smp 1 \
+-uuid 11d7cd22-da89-3094-6212-079a48a309a1 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args
index 198cdc1..716fe92 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args
index 3daf40d..593d485 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args
index 1b05b73..027d338 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args
index 034ff94..4b29d62 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args
index efc50b8..5296f38 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-none.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args
index ce94d40..722087a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args
index a612293..af1e388 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args
index 43c6b32..41cb514 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args
index e6a84e8..3f8be5a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args
index 185c3d9..a8cb81a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args
index 0344750..e0de506 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args b/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args
index 9faff40..3fdfbd6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args
index 04276d0..86c1c8c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-0.15 \
-m 1024 \
-smp 1 \
+-uuid cdbebdfa-1d6d-65c3-be0f-fd74b978a773 \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args
index dc1b039..a827f7e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 1024 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args
index d56a07e..1a98828 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 1024 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args
index 64b9255..ec17771 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 1024 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args
index b07bb7b..78edb98 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 1024 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args
index 716d6b9..fb8589b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 1024 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args
index babee90..0a7e07b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 1024 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args
index b48e39a..8dbaf4a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 1024 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args
index 5f16980..33796ad 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 1024 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args
index 09bdb6f..a014c55 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc-0.13 \
-m 1024 \
-smp 1 \
+-uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args
index e2b56ad..b849f13 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M s390-ccw \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args
index 1b1c19d..4ccd9c5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args
index f15bf57..b191c3e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args
index 046568f..223a951 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args
index 900d008..6d136c5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args
index 009885b..63b3f87 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args
index 2c2e392..c384b63 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M s390-virtio \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-nodefconfig \
-nodefaults \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args
index 762ccee..fe28c3c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args
index ed464d8..0dd622e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args
index 3fcd0c0..5eac1cf 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/test-monitor,server,nowait \
-no-acpi \
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index df69790..3d7bca8 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -997,7 +997,7 @@ mymain(void)
DO_TEST("misc-enable-s4", QEMU_CAPS_DISABLE_S4);
DO_TEST_FAILURE("misc-enable-s4", NONE);
DO_TEST("misc-no-reboot", NONE);
- DO_TEST("misc-uuid", QEMU_CAPS_UUID);
+ DO_TEST("misc-uuid", NONE);
DO_TEST_PARSE_ERROR("vhost_queues-invalid", NONE);
DO_TEST("net-vhostuser", QEMU_CAPS_DEVICE, QEMU_CAPS_NETDEV);
DO_TEST("net-vhostuser-multiq",
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 38e79b8..4307df6 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -114,7 +114,6 @@ static const char testStatusXMLPrefix[] =
" <vcpu pid='3803519'/>\n"
" </vcpus>\n"
" <qemuCaps>\n"
-" <flag name='uuid'/>\n"
" <flag name='vnet-hdr'/>\n"
" <flag name='qxl.vgamem_mb'/>\n"
" <flag name='qxl-vga.vgamem_mb'/>\n"
diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args
index 3337ec4..d904244 100644
--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args
+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args
index 3337ec4..d904244 100644
--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args
+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args
index 3337ec4..d904244 100644
--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args
+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args
index 3337ec4..d904244 100644
--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args
+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args
index 3337ec4..d904244 100644
--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args
+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args
index 3337ec4..d904244 100644
--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args
+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args
index 5175e49..37a02e8 100644
--- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args
+++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
-M pc \
-m 214 \
-smp 1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-nographic \
-monitor unix:/tmp/domain-QEMUGuest1/monitor.sock,server,nowait \
-no-acpi \
--
2.5.0
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list