6:35 a.m.
We are at the point where we can remove all the code to pass secrets
(RBD/iSCSI authentication passwords) on the commandline in plaintext
as all supported versions of qemu now support -object secret and the
corresponding methods to pass the secrets securely.
Peter Krempa (12):
util: Remove use of virCryptoHaveCipher(VIR_CRYPTO_CIPHER_AES256CBC)
qemu: Always assume presence of QEMU_CAPS_OBJECT_SECRET
qemu: capabilities: Retire QEMU_CAPS_OBJECT_SECRET
qemu: domain: Remove qemuDomainSupportsEncryptedSecret
qemu: domain: Always assume QEMU_CAPS_ISCSI_PASSWORD_SECRET
qemu: capabilities: Retire QEMU_CAPS_ISCSI_PASSWORD_SECRET
qemu: Remove VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN and associated code
qemu: command: Remove qemuBuildGeneralSecinfoURI
qemuBuildSCSIiSCSIHostdevDrvStr: Don't call qemuDiskSourceNeedsProps
qemu: Simplify qemuDomainSecretInfo
qemu: domain: Rename secrets setup function
qemu: command: Remove qemuBuildRBDSecinfoURI
src/libvirt_private.syms | 1 -
src/qemu/qemu_backup.c | 2 +-
src/qemu/qemu_block.c | 40 ++-
src/qemu/qemu_capabilities.c | 6 +-
src/qemu/qemu_capabilities.h | 4 +-
src/qemu/qemu_command.c | 184 +++---------
src/qemu/qemu_domain.c | 274 ++++--------------
src/qemu/qemu_domain.h | 31 +-
src/qemu/qemu_hotplug.c | 4 +-
src/qemu/qemu_migration_params.c | 2 +-
src/storage/storage_util.c | 6 -
src/util/vircrypto.c | 27 --
src/util/vircrypto.h | 2 -
tests/qemublocktest.c | 13 +-
.../caps_2.11.0.s390x.xml | 2 -
.../caps_2.11.0.x86_64.xml | 2 -
.../caps_2.12.0.aarch64.xml | 2 -
.../caps_2.12.0.ppc64.xml | 2 -
.../caps_2.12.0.s390x.xml | 2 -
.../caps_2.12.0.x86_64.xml | 2 -
.../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 -
.../caps_3.0.0.riscv32.xml | 2 -
.../caps_3.0.0.riscv64.xml | 2 -
.../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 2 -
.../caps_3.0.0.x86_64.xml | 2 -
.../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 2 -
.../caps_3.1.0.x86_64.xml | 2 -
.../caps_4.0.0.aarch64.xml | 2 -
.../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 2 -
.../caps_4.0.0.riscv32.xml | 2 -
.../caps_4.0.0.riscv64.xml | 2 -
.../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 2 -
.../caps_4.0.0.x86_64.xml | 2 -
.../caps_4.1.0.x86_64.xml | 2 -
.../caps_4.2.0.aarch64.xml | 2 -
.../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 2 -
.../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 2 -
.../caps_4.2.0.x86_64.xml | 2 -
.../caps_5.0.0.aarch64.xml | 2 -
.../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 2 -
.../caps_5.0.0.riscv64.xml | 2 -
.../caps_5.0.0.x86_64.xml | 2 -
.../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 2 -
.../caps_5.1.0.x86_64.xml | 2 -
.../caps_5.2.0.aarch64.xml | 2 -
.../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 2 -
.../caps_5.2.0.riscv64.xml | 2 -
.../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 2 -
.../caps_5.2.0.x86_64.xml | 2 -
.../caps_6.0.0.aarch64.xml | 2 -
.../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 2 -
.../caps_6.0.0.x86_64.xml | 2 -
.../caps_6.1.0.x86_64.xml | 2 -
.../aarch64-aavmf-virtio-mmio.args | 1 +
tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 1 +
.../aarch64-cpu-passthrough.args | 1 +
tests/qemuxml2argvdata/aarch64-gic-host.args | 1 +
.../aarch64-gic-none-tcg.args | 1 +
tests/qemuxml2argvdata/aarch64-gic-v2.args | 1 +
tests/qemuxml2argvdata/aarch64-gic-v3.args | 1 +
.../aarch64-kvm-32-on-64.args | 1 +
.../aarch64-noacpi-nouefi.args | 1 +
.../qemuxml2argvdata/aarch64-noacpi-uefi.args | 1 +
.../qemuxml2argvdata/aarch64-pci-serial.args | 1 +
.../aarch64-traditional-pci.args | 1 +
.../aarch64-usb-controller-nec-xhci.args | 1 +
.../aarch64-usb-controller-qemu-xhci.args | 1 +
.../aarch64-video-default.args | 1 +
.../aarch64-video-virtio-gpu-pci.args | 1 +
.../aarch64-virt-2.6-virtio-pci-default.args | 1 +
.../aarch64-virt-default-nic.args | 1 +
.../qemuxml2argvdata/aarch64-virt-virtio.args | 1 +
.../aarch64-virtio-pci-default.args | 1 +
.../aarch64-virtio-pci-manual-addresses.args | 1 +
tests/qemuxml2argvdata/acpi-table.args | 1 +
.../arm-vexpressa9-basic.args | 1 +
.../arm-vexpressa9-nodevs.args | 1 +
.../arm-vexpressa9-virtio.args | 1 +
tests/qemuxml2argvdata/arm-virt-virtio.args | 1 +
tests/qemuxml2argvdata/audio-alsa-best.args | 1 +
.../qemuxml2argvdata/audio-alsa-minimal.args | 1 +
.../audio-coreaudio-best.args | 1 +
.../audio-coreaudio-minimal.args | 1 +
.../audio-default-nographics.args | 1 +
tests/qemuxml2argvdata/audio-default-sdl.args | 1 +
.../qemuxml2argvdata/audio-default-spice.args | 1 +
tests/qemuxml2argvdata/audio-default-vnc.args | 1 +
tests/qemuxml2argvdata/audio-file-best.args | 1 +
.../qemuxml2argvdata/audio-file-minimal.args | 1 +
tests/qemuxml2argvdata/audio-none-best.args | 1 +
.../qemuxml2argvdata/audio-none-minimal.args | 1 +
tests/qemuxml2argvdata/audio-oss-best.args | 1 +
tests/qemuxml2argvdata/audio-oss-minimal.args | 1 +
.../audio-pulseaudio-best.args | 1 +
.../audio-pulseaudio-minimal.args | 1 +
tests/qemuxml2argvdata/audio-sdl-best.args | 1 +
tests/qemuxml2argvdata/audio-sdl-minimal.args | 1 +
tests/qemuxml2argvdata/audio-spice-best.args | 1 +
.../qemuxml2argvdata/audio-spice-minimal.args | 1 +
tests/qemuxml2argvdata/autoindex.args | 1 +
.../qemuxml2argvdata/balloon-ccw-deflate.args | 1 +
.../qemuxml2argvdata/balloon-device-auto.args | 1 +
.../balloon-device-deflate-off.args | 1 +
.../balloon-device-deflate.args | 1 +
.../balloon-device-period.args | 1 +
tests/qemuxml2argvdata/balloon-device.args | 1 +
.../balloon-mmio-deflate.args | 1 +
tests/qemuxml2argvdata/bios-nvram-secure.args | 1 +
tests/qemuxml2argvdata/bios-nvram.args | 1 +
tests/qemuxml2argvdata/bios.args | 1 +
tests/qemuxml2argvdata/blkiotune-device.args | 1 +
tests/qemuxml2argvdata/blkiotune.args | 1 +
tests/qemuxml2argvdata/boot-cdrom.args | 1 +
tests/qemuxml2argvdata/boot-complex.args | 1 +
tests/qemuxml2argvdata/boot-floppy-q35.args | 1 +
tests/qemuxml2argvdata/boot-floppy.args | 1 +
.../boot-menu-disable-drive.args | 1 +
tests/qemuxml2argvdata/boot-menu-disable.args | 1 +
.../boot-menu-enable-with-timeout.args | 1 +
tests/qemuxml2argvdata/boot-menu-enable.args | 1 +
tests/qemuxml2argvdata/boot-multi.args | 1 +
tests/qemuxml2argvdata/boot-network.args | 1 +
tests/qemuxml2argvdata/boot-order.args | 1 +
tests/qemuxml2argvdata/boot-strict.args | 1 +
tests/qemuxml2argvdata/channel-guestfwd.args | 1 +
tests/qemuxml2argvdata/channel-spicevmc.args | 1 +
.../qemuxml2argvdata/channel-virtio-auto.args | 1 +
.../channel-virtio-autoadd.args | 1 +
.../channel-virtio-autoassign.args | 1 +
.../channel-virtio-default.args | 1 +
.../channel-virtio-state.args | 1 +
.../qemuxml2argvdata/channel-virtio-unix.args | 1 +
tests/qemuxml2argvdata/channel-virtio.args | 1 +
tests/qemuxml2argvdata/chardev-reconnect.args | 1 +
tests/qemuxml2argvdata/clock-catchup.args | 1 +
tests/qemuxml2argvdata/clock-france.args | 1 +
tests/qemuxml2argvdata/clock-hpet-off.args | 1 +
.../clock-localtime-basis-localtime.args | 1 +
tests/qemuxml2argvdata/clock-localtime.args | 1 +
tests/qemuxml2argvdata/clock-realtime.args | 1 +
.../clock-timer-hyperv-rtc.args | 1 +
tests/qemuxml2argvdata/clock-utc.args | 1 +
tests/qemuxml2argvdata/clock-variable.args | 1 +
.../qemuxml2argvdata/console-compat-auto.args | 1 +
.../console-compat-chardev.args | 1 +
tests/qemuxml2argvdata/console-compat.args | 1 +
.../qemuxml2argvdata/console-virtio-ccw.args | 1 +
.../qemuxml2argvdata/console-virtio-many.args | 1 +
tests/qemuxml2argvdata/console-virtio.args | 1 +
tests/qemuxml2argvdata/controller-order.args | 1 +
tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 1 +
tests/qemuxml2argvdata/cpu-Haswell.args | 1 +
tests/qemuxml2argvdata/cpu-Haswell2.args | 1 +
tests/qemuxml2argvdata/cpu-Haswell3.args | 1 +
tests/qemuxml2argvdata/cpu-cache-disable.args | 1 +
.../qemuxml2argvdata/cpu-cache-disable2.args | 1 +
.../qemuxml2argvdata/cpu-cache-disable3.args | 1 +
.../cpu-cache-emulate-l3.args | 1 +
.../cpu-cache-passthrough.args | 1 +
.../cpu-cache-passthrough2.args | 1 +
.../cpu-check-default-none.args | 1 +
.../cpu-check-default-none2.args | 1 +
.../cpu-check-default-partial.args | 1 +
.../cpu-check-default-partial2.args | 1 +
tests/qemuxml2argvdata/cpu-check-none.args | 1 +
tests/qemuxml2argvdata/cpu-eoi-disabled.args | 1 +
tests/qemuxml2argvdata/cpu-eoi-enabled.args | 1 +
tests/qemuxml2argvdata/cpu-exact1.args | 1 +
.../cpu-exact2-nofallback.args | 1 +
tests/qemuxml2argvdata/cpu-exact2.args | 1 +
tests/qemuxml2argvdata/cpu-fallback.args | 1 +
tests/qemuxml2argvdata/cpu-host-kvmclock.args | 1 +
.../qemuxml2argvdata/cpu-host-model-cmt.args | 1 +
.../cpu-host-model-fallback.args | 1 +
.../cpu-host-model-vendor.args | 1 +
tests/qemuxml2argvdata/cpu-host-model.args | 1 +
.../cpu-host-passthrough-features.args | 1 +
.../cpu-host-passthrough.args | 1 +
.../qemuxml2argvdata/cpu-hotplug-startup.args | 1 +
tests/qemuxml2argvdata/cpu-kvmclock.args | 1 +
tests/qemuxml2argvdata/cpu-minimum1.args | 1 +
tests/qemuxml2argvdata/cpu-minimum2.args | 1 +
.../cpu-no-removed-features.args | 1 +
tests/qemuxml2argvdata/cpu-numa-disjoint.args | 1 +
.../qemuxml2argvdata/cpu-numa-memshared.args | 1 +
.../cpu-numa-no-memory-element.args | 1 +
tests/qemuxml2argvdata/cpu-numa1.args | 1 +
tests/qemuxml2argvdata/cpu-numa2.args | 1 +
tests/qemuxml2argvdata/cpu-s390-features.args | 1 +
tests/qemuxml2argvdata/cpu-s390-zEC12.args | 1 +
tests/qemuxml2argvdata/cpu-strict1.args | 1 +
tests/qemuxml2argvdata/cpu-topology1.args | 1 +
tests/qemuxml2argvdata/cpu-topology2.args | 1 +
tests/qemuxml2argvdata/cpu-topology3.args | 1 +
tests/qemuxml2argvdata/cpu-tsc-frequency.args | 1 +
tests/qemuxml2argvdata/cputune-numatune.args | 1 +
.../qemuxml2argvdata/cputune-zero-shares.args | 1 +
tests/qemuxml2argvdata/cputune.args | 1 +
.../default-kvm-host-arch.args | 1 +
.../default-qemu-host-arch.args | 1 +
tests/qemuxml2argvdata/disk-aio.args | 1 +
tests/qemuxml2argvdata/disk-blockio.args | 1 +
tests/qemuxml2argvdata/disk-boot-cdrom.args | 1 +
tests/qemuxml2argvdata/disk-boot-disk.args | 1 +
.../qemuxml2argvdata/disk-cdrom-network.args | 1 +
tests/qemuxml2argvdata/disk-cdrom-tray.args | 1 +
tests/qemuxml2argvdata/disk-cdrom.args | 1 +
tests/qemuxml2argvdata/disk-copy_on_read.args | 1 +
tests/qemuxml2argvdata/disk-error-policy.args | 1 +
tests/qemuxml2argvdata/disk-floppy-tray.args | 1 +
tests/qemuxml2argvdata/disk-floppy.args | 1 +
tests/qemuxml2argvdata/disk-fmt-qcow.args | 1 +
tests/qemuxml2argvdata/disk-geometry.args | 1 +
tests/qemuxml2argvdata/disk-ide-split.args | 1 +
tests/qemuxml2argvdata/disk-ide-wwn.args | 1 +
tests/qemuxml2argvdata/disk-ioeventfd.args | 1 +
tests/qemuxml2argvdata/disk-iscsi.args | 1 +
.../disk-network-gluster.args | 1 +
.../disk-network-iscsi-modern.args | 10 +-
.../qemuxml2argvdata/disk-network-iscsi.args | 13 +-
tests/qemuxml2argvdata/disk-network-nbd.args | 1 +
.../disk-network-sheepdog.args | 1 +
.../disk-network-source-auth.args | 10 +-
tests/qemuxml2argvdata/disk-network-vxhs.args | 1 +
tests/qemuxml2argvdata/disk-no-boot.args | 1 +
tests/qemuxml2argvdata/disk-order.args | 1 +
.../qemuxml2argvdata/disk-readonly-disk.args | 1 +
tests/qemuxml2argvdata/disk-sata-device.args | 1 +
.../disk-scsi-disk-split.args | 1 +
.../qemuxml2argvdata/disk-scsi-disk-vpd.args | 1 +
.../qemuxml2argvdata/disk-scsi-disk-wwn.args | 1 +
.../disk-scsi-lun-passthrough.args | 1 +
tests/qemuxml2argvdata/disk-serial.args | 1 +
tests/qemuxml2argvdata/disk-snapshot.args | 1 +
.../disk-source-pool-mode.args | 5 +-
tests/qemuxml2argvdata/disk-source-pool.args | 1 +
.../disk-usb-device-removable.args | 1 +
tests/qemuxml2argvdata/disk-usb-device.args | 1 +
.../disk-virtio-ccw-many.args | 1 +
tests/qemuxml2argvdata/disk-virtio-ccw.args | 1 +
.../disk-virtio-s390-zpci.args | 1 +
tests/qemuxml2argvdata/disk-virtio.args | 1 +
tests/qemuxml2argvdata/event_idx.args | 1 +
.../fd-memory-no-numa-topology.args | 1 +
.../fd-memory-numa-topology.args | 1 +
.../fd-memory-numa-topology2.args | 1 +
.../fd-memory-numa-topology3.args | 1 +
tests/qemuxml2argvdata/floppy-drive-fat.args | 1 +
tests/qemuxml2argvdata/fs9p-ccw.args | 1 +
tests/qemuxml2argvdata/fs9p.args | 1 +
.../graphics-egl-headless.args | 1 +
.../graphics-sdl-fullscreen.args | 1 +
tests/qemuxml2argvdata/graphics-sdl.args | 1 +
.../graphics-spice-agent-file-xfer.args | 1 +
.../graphics-spice-agentmouse.args | 1 +
.../graphics-spice-auto-socket-cfg.args | 1 +
.../graphics-spice-auto-socket.args | 1 +
.../graphics-spice-compression.args | 1 +
.../graphics-spice-egl-headless.args | 1 +
.../graphics-spice-no-args.args | 1 +
.../graphics-spice-qxl-vga.args | 1 +
.../qemuxml2argvdata/graphics-spice-sasl.args | 1 +
.../graphics-spice-socket.args | 1 +
.../graphics-spice-timeout.args | 1 +
.../graphics-spice-usb-redir.args | 1 +
tests/qemuxml2argvdata/graphics-spice.args | 1 +
.../graphics-vnc-auto-socket-cfg.args | 1 +
.../graphics-vnc-auto-socket.args | 1 +
.../graphics-vnc-egl-headless.args | 1 +
.../graphics-vnc-no-listen-attr.args | 1 +
tests/qemuxml2argvdata/graphics-vnc-none.args | 1 +
.../qemuxml2argvdata/graphics-vnc-policy.args | 1 +
.../graphics-vnc-remove-generated-socket.args | 1 +
tests/qemuxml2argvdata/graphics-vnc-sasl.args | 1 +
.../graphics-vnc-socket-new-cmdline.args | 1 +
.../qemuxml2argvdata/graphics-vnc-socket.args | 1 +
tests/qemuxml2argvdata/graphics-vnc-tls.args | 1 +
.../graphics-vnc-websocket.args | 1 +
tests/qemuxml2argvdata/graphics-vnc.args | 1 +
.../hostdev-mdev-precreated.args | 1 +
.../hostdev-pci-address-device.args | 1 +
.../hostdev-pci-address-unassigned.args | 1 +
.../qemuxml2argvdata/hostdev-pci-address.args | 1 +
.../hostdev-pci-multifunction.args | 1 +
.../hostdev-scsi-vhost-scsi-ccw.args | 1 +
.../hostdev-scsi-vhost-scsi-pci.args | 1 +
.../hostdev-scsi-vhost-scsi-pcie.args | 1 +
.../hostdev-subsys-mdev-vfio-ccw.args | 1 +
.../hostdev-usb-address-device-boot.args | 1 +
.../hostdev-usb-address-device.args | 1 +
.../qemuxml2argvdata/hostdev-usb-address.args | 1 +
.../hostdev-vfio-multidomain.args | 1 +
.../hostdev-vfio-zpci-autogenerate-fids.args | 1 +
.../hostdev-vfio-zpci-autogenerate-uids.args | 1 +
.../hostdev-vfio-zpci-autogenerate.args | 1 +
.../hostdev-vfio-zpci-boundaries.args | 1 +
.../hostdev-vfio-zpci-ccw-memballoon.args | 1 +
.../hostdev-vfio-zpci-multidomain-many.args | 1 +
tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 1 +
tests/qemuxml2argvdata/hostdev-vfio.args | 1 +
tests/qemuxml2argvdata/hotplug-base.args | 1 +
.../hugepages-default-2M.args | 1 +
.../hugepages-default-system-size.args | 1 +
tests/qemuxml2argvdata/hugepages-default.args | 1 +
.../qemuxml2argvdata/hugepages-memaccess.args | 1 +
.../hugepages-memaccess2.args | 1 +
tests/qemuxml2argvdata/hugepages-nodeset.args | 1 +
.../hugepages-numa-default-2M.args | 1 +
.../hugepages-numa-default-dimm.args | 1 +
.../hugepages-numa-default.args | 1 +
.../hugepages-numa-nodeset-part.args | 1 +
.../hugepages-numa-nodeset.args | 1 +
tests/qemuxml2argvdata/hugepages-shared.args | 1 +
.../qemuxml2argvdata/input-usbmouse-addr.args | 1 +
tests/qemuxml2argvdata/input-usbmouse.args | 1 +
tests/qemuxml2argvdata/input-usbtablet.args | 1 +
tests/qemuxml2argvdata/input-virtio-ccw.args | 1 +
.../iothreads-disk-virtio-ccw.args | 1 +
tests/qemuxml2argvdata/iothreads-disk.args | 1 +
.../iothreads-ids-partial.args | 1 +
tests/qemuxml2argvdata/iothreads-ids.args | 1 +
tests/qemuxml2argvdata/iothreads.args | 1 +
tests/qemuxml2argvdata/kvm-features-off.args | 1 +
tests/qemuxml2argvdata/kvm-features.args | 1 +
tests/qemuxml2argvdata/kvm-pit-delay.args | 1 +
tests/qemuxml2argvdata/kvm-pit-discard.args | 1 +
tests/qemuxml2argvdata/kvmclock.args | 1 +
.../luks-disks-source-qcow2.args | 5 +-
tests/qemuxml2argvdata/luks-disks-source.args | 5 +-
.../mach-virt-console-virtio.args | 1 +
.../mach-virt-serial-native.args | 1 +
.../mach-virt-serial-pci.args | 1 +
.../mach-virt-serial-usb.args | 1 +
.../machine-aeskeywrap-off-cap.args | 1 +
.../machine-aeskeywrap-off-caps.args | 1 +
.../machine-aeskeywrap-on-cap.args | 1 +
.../machine-aeskeywrap-on-caps.args | 1 +
tests/qemuxml2argvdata/machine-aliases1.args | 1 +
tests/qemuxml2argvdata/machine-aliases2.args | 1 +
tests/qemuxml2argvdata/machine-core-off.args | 1 +
tests/qemuxml2argvdata/machine-core-on.args | 1 +
.../machine-deakeywrap-off-cap.args | 1 +
.../machine-deakeywrap-off-caps.args | 1 +
.../machine-deakeywrap-on-cap.args | 1 +
.../machine-deakeywrap-on-caps.args | 1 +
.../machine-keywrap-none-caps.args | 1 +
.../machine-keywrap-none.args | 1 +
...ine-loadparm-multiple-disks-nets-s390.args | 1 +
.../machine-loadparm-net-s390.args | 1 +
.../machine-loadparm-s390.args | 1 +
tests/qemuxml2argvdata/machine-smm-opt.args | 1 +
.../qemuxml2argvdata/machine-vmport-opt.args | 1 +
.../memory-hotplug-dimm-addr.args | 1 +
.../qemuxml2argvdata/memory-hotplug-dimm.args | 1 +
...emory-hotplug-nvdimm-ppc64-abi-update.args | 1 +
.../memory-hotplug-nvdimm-ppc64.args | 1 +
...emory-hotplug-ppc64-nonuma-abi-update.args | 1 +
.../memory-hotplug-ppc64-nonuma.args | 1 +
tests/qemuxml2argvdata/memory-hotplug.args | 1 +
tests/qemuxml2argvdata/memtune-unlimited.args | 1 +
tests/qemuxml2argvdata/memtune.args | 1 +
.../migrate-numa-unaligned.args | 1 +
tests/qemuxml2argvdata/migrate.args | 1 +
tests/qemuxml2argvdata/minimal.args | 1 +
tests/qemuxml2argvdata/misc-acpi.args | 1 +
tests/qemuxml2argvdata/misc-disable-s3.args | 1 +
.../misc-disable-suspends.args | 1 +
tests/qemuxml2argvdata/misc-enable-s4.args | 1 +
tests/qemuxml2argvdata/misc-no-reboot.args | 1 +
tests/qemuxml2argvdata/misc-uuid.args | 1 +
tests/qemuxml2argvdata/monitor-json.args | 1 +
.../multifunction-pci-device.args | 1 +
tests/qemuxml2argvdata/name-escape.args | 2 +-
tests/qemuxml2argvdata/net-client.args | 1 +
tests/qemuxml2argvdata/net-eth-hostip.args | 1 +
tests/qemuxml2argvdata/net-eth-ifname.args | 1 +
tests/qemuxml2argvdata/net-eth-names.args | 1 +
.../net-eth-unmanaged-tap.args | 1 +
tests/qemuxml2argvdata/net-eth.args | 1 +
.../net-hostdev-bootorder.args | 1 +
.../net-hostdev-multidomain.args | 1 +
.../net-hostdev-vfio-multidomain.args | 1 +
tests/qemuxml2argvdata/net-hostdev-vfio.args | 1 +
tests/qemuxml2argvdata/net-hostdev.args | 1 +
tests/qemuxml2argvdata/net-many-models.args | 1 +
tests/qemuxml2argvdata/net-mcast.args | 1 +
tests/qemuxml2argvdata/net-server.args | 1 +
tests/qemuxml2argvdata/net-udp.args | 1 +
tests/qemuxml2argvdata/net-user-addr.args | 1 +
tests/qemuxml2argvdata/net-user.args | 1 +
.../net-vhostuser-multiq.args | 1 +
tests/qemuxml2argvdata/net-vhostuser.args | 1 +
tests/qemuxml2argvdata/net-virtio-ccw.args | 1 +
tests/qemuxml2argvdata/net-virtio-device.args | 1 +
.../net-virtio-disable-offloads.args | 1 +
tests/qemuxml2argvdata/net-virtio-netdev.args | 1 +
.../net-virtio-rxtxqueuesize.args | 1 +
.../net-virtio-teaming-hostdev.args | 1 +
.../qemuxml2argvdata/net-virtio-teaming.args | 1 +
tests/qemuxml2argvdata/net-virtio.args | 1 +
tests/qemuxml2argvdata/nosharepages.args | 1 +
.../numad-auto-memory-vcpu-cpuset.args | 1 +
...o-memory-vcpu-no-cpuset-and-placement.args | 1 +
.../numad-auto-vcpu-static-numatune.args | 1 +
.../numad-static-memory-auto-vcpu.args | 1 +
tests/qemuxml2argvdata/numad.args | 1 +
.../numatune-auto-nodeset-invalid.args | 1 +
.../numatune-auto-prefer.args | 1 +
.../qemuxml2argvdata/numatune-distances.args | 1 +
.../numatune-memnode-no-memory.args | 1 +
tests/qemuxml2argvdata/numatune-memnode.args | 1 +
tests/qemuxml2argvdata/numatune-memory.args | 1 +
tests/qemuxml2argvdata/numatune-no-vcpu.args | 1 +
.../qemuxml2argvdata/pages-dimm-discard.args | 1 +
.../pages-discard-hugepages.args | 1 +
tests/qemuxml2argvdata/pages-discard.args | 1 +
tests/qemuxml2argvdata/panic-double.args | 1 +
tests/qemuxml2argvdata/panic-no-address.args | 1 +
tests/qemuxml2argvdata/panic.args | 1 +
.../parallel-parport-chardev.args | 1 +
.../parallel-tcp-chardev.args | 1 +
tests/qemuxml2argvdata/pci-autoadd-addr.args | 1 +
tests/qemuxml2argvdata/pci-autoadd-idx.args | 1 +
tests/qemuxml2argvdata/pci-autofill-addr.args | 1 +
.../pci-bridge-many-disks.args | 1 +
tests/qemuxml2argvdata/pci-bridge.args | 1 +
tests/qemuxml2argvdata/pci-expander-bus.args | 1 +
tests/qemuxml2argvdata/pci-many.args | 1 +
tests/qemuxml2argvdata/pci-rom-disabled.args | 1 +
tests/qemuxml2argvdata/pci-rom.args | 1 +
.../pci-serial-dev-chardev.args | 1 +
tests/qemuxml2argvdata/pcie-expander-bus.args | 1 +
.../pcie-root-port-model-generic.args | 1 +
.../pcie-root-port-model-ioh3420.args | 1 +
tests/qemuxml2argvdata/pcie-root-port.args | 1 +
tests/qemuxml2argvdata/pcie-root.args | 1 +
.../pcie-switch-downstream-port.args | 1 +
.../pcie-switch-upstream-port.args | 1 +
tests/qemuxml2argvdata/pcihole64-q35.args | 1 +
tests/qemuxml2argvdata/pcihole64.args | 1 +
tests/qemuxml2argvdata/pmu-feature-off.args | 1 +
tests/qemuxml2argvdata/pmu-feature.args | 1 +
tests/qemuxml2argvdata/ppc-dtb.args | 1 +
.../ppc64-usb-controller-legacy.args | 1 +
.../ppc64-usb-controller-qemu-xhci.args | 1 +
.../ppc64-usb-controller.args | 1 +
tests/qemuxml2argvdata/ppce500-serial.args | 1 +
tests/qemuxml2argvdata/pseries-basic.args | 1 +
.../pseries-console-virtio.args | 1 +
.../pseries-cpu-compat-power9.args | 1 +
.../qemuxml2argvdata/pseries-cpu-compat.args | 1 +
tests/qemuxml2argvdata/pseries-cpu-exact.args | 1 +
tests/qemuxml2argvdata/pseries-cpu-le.args | 1 +
tests/qemuxml2argvdata/pseries-features.args | 1 +
.../qemuxml2argvdata/pseries-hostdevs-1.args | 1 +
.../qemuxml2argvdata/pseries-hostdevs-2.args | 1 +
.../qemuxml2argvdata/pseries-hostdevs-3.args | 1 +
.../pseries-machine-max-cpu-compat.args | 1 +
.../pseries-many-buses-1.args | 1 +
.../pseries-many-buses-2.args | 1 +
.../pseries-many-devices.args | 1 +
tests/qemuxml2argvdata/pseries-nvram.args | 1 +
.../pseries-panic-missing.args | 1 +
.../pseries-panic-no-address.args | 1 +
.../pseries-phb-default-missing.args | 1 +
.../pseries-phb-numa-node.args | 1 +
.../qemuxml2argvdata/pseries-phb-simple.args | 1 +
.../pseries-serial-native.args | 1 +
.../qemuxml2argvdata/pseries-serial-pci.args | 1 +
.../qemuxml2argvdata/pseries-serial-usb.args | 1 +
.../qemuxml2argvdata/pseries-usb-default.args | 1 +
tests/qemuxml2argvdata/pseries-usb-kbd.args | 1 +
tests/qemuxml2argvdata/pseries-usb-multi.args | 1 +
.../pseries-vio-user-assigned.args | 1 +
tests/qemuxml2argvdata/pseries-vio.args | 1 +
tests/qemuxml2argvdata/q35-acpi-nouefi.args | 1 +
tests/qemuxml2argvdata/q35-acpi-uefi.args | 1 +
.../q35-default-devices-only.args | 1 +
tests/qemuxml2argvdata/q35-multifunction.args | 1 +
tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 1 +
.../q35-pci-force-address.args | 1 +
tests/qemuxml2argvdata/q35-pcie-autoadd.args | 1 +
tests/qemuxml2argvdata/q35-pcie.args | 1 +
.../q35-pm-disable-fallback.args | 1 +
tests/qemuxml2argvdata/q35-pm-disable.args | 1 +
tests/qemuxml2argvdata/q35-usb2-multi.args | 1 +
tests/qemuxml2argvdata/q35-usb2-reorder.args | 1 +
tests/qemuxml2argvdata/q35-usb2.args | 1 +
.../q35-virt-manager-basic.args | 1 +
tests/qemuxml2argvdata/q35-virtio-pci.args | 1 +
tests/qemuxml2argvdata/q35.args | 1 +
tests/qemuxml2argvdata/qemu-ns-alt.args | 1 +
.../qemu-ns-commandline-ns0.args | 1 +
.../qemu-ns-commandline-ns1.args | 1 +
.../qemuxml2argvdata/qemu-ns-commandline.args | 1 +
.../qemu-ns-domain-commandline-ns0.args | 1 +
.../qemu-ns-domain-commandline.args | 1 +
.../qemuxml2argvdata/qemu-ns-domain-ns0.args | 1 +
tests/qemuxml2argvdata/qemu-ns-no-env.args | 1 +
.../reboot-timeout-disabled.args | 1 +
.../reboot-timeout-enabled.args | 1 +
tests/qemuxml2argvdata/restore-v2-fd.args | 1 +
tests/qemuxml2argvdata/restore-v2.args | 1 +
tests/qemuxml2argvdata/riscv64-virt-pci.args | 1 +
tests/qemuxml2argvdata/riscv64-virt.args | 1 +
.../qemuxml2argvdata/s390-panic-missing.args | 1 +
.../s390-panic-no-address.args | 1 +
tests/qemuxml2argvdata/s390-serial-2.args | 1 +
.../qemuxml2argvdata/s390-serial-console.args | 1 +
tests/qemuxml2argvdata/s390-serial.args | 1 +
tests/qemuxml2argvdata/seclabel-dac-none.args | 1 +
.../seclabel-dynamic-baselabel.args | 1 +
.../seclabel-dynamic-labelskip.args | 1 +
.../seclabel-dynamic-override.args | 1 +
.../seclabel-dynamic-relabel.args | 1 +
tests/qemuxml2argvdata/seclabel-dynamic.args | 1 +
tests/qemuxml2argvdata/seclabel-none.args | 1 +
.../seclabel-static-labelskip.args | 1 +
.../seclabel-static-relabel.args | 1 +
tests/qemuxml2argvdata/seclabel-static.args | 1 +
.../serial-dev-chardev-iobase.args | 1 +
.../qemuxml2argvdata/serial-dev-chardev.args | 1 +
.../qemuxml2argvdata/serial-file-chardev.args | 1 +
tests/qemuxml2argvdata/serial-file-log.args | 1 +
.../qemuxml2argvdata/serial-many-chardev.args | 1 +
.../qemuxml2argvdata/serial-pty-chardev.args | 1 +
.../serial-spiceport-nospice.args | 1 +
tests/qemuxml2argvdata/serial-spiceport.args | 1 +
.../qemuxml2argvdata/serial-tcp-chardev.args | 1 +
.../serial-tcp-telnet-chardev.args | 1 +
.../serial-tcp-tlsx509-chardev-notls.args | 1 +
.../serial-tcp-tlsx509-chardev-verify.args | 1 +
.../serial-tcp-tlsx509-chardev.args | 1 +
.../qemuxml2argvdata/serial-udp-chardev.args | 1 +
.../qemuxml2argvdata/serial-unix-chardev.args | 1 +
tests/qemuxml2argvdata/serial-vc-chardev.args | 1 +
.../shmem-plain-doorbell.args | 1 +
tests/qemuxml2argvdata/shmem.args | 1 +
.../smartcard-controller.args | 1 +
.../smartcard-host-certificates-database.args | 1 +
.../smartcard-host-certificates.args | 1 +
tests/qemuxml2argvdata/smartcard-host.args | 1 +
.../smartcard-passthrough-spicevmc.args | 1 +
.../smartcard-passthrough-tcp.args | 1 +
tests/qemuxml2argvdata/smbios-type-fwcfg.args | 1 +
tests/qemuxml2argvdata/smbios.args | 1 +
tests/qemuxml2argvdata/smp-dies.args | 1 +
tests/qemuxml2argvdata/smp.args | 1 +
tests/qemuxml2argvdata/sound-device.args | 1 +
tests/qemuxml2argvdata/sound.args | 1 +
tests/qemuxml2argvdata/sparc-minimal.args | 1 +
.../usb-controller-default-q35.args | 1 +
.../usb-controller-explicit-q35.args | 1 +
.../usb-controller-qemu-xhci.args | 1 +
.../qemuxml2argvdata/usb-controller-xhci.args | 1 +
tests/qemuxml2argvdata/usb-controller.args | 1 +
.../usb-hub-autoadd-deluxe.args | 1 +
tests/qemuxml2argvdata/usb-hub-autoadd.args | 1 +
tests/qemuxml2argvdata/usb-hub.args | 1 +
.../qemuxml2argvdata/usb-ich9-autoassign.args | 1 +
.../qemuxml2argvdata/usb-ich9-companion.args | 1 +
.../qemuxml2argvdata/usb-ich9-ehci-addr.args | 1 +
.../qemuxml2argvdata/usb-long-port-path.args | 1 +
tests/qemuxml2argvdata/usb-none.args | 1 +
.../usb-piix3-controller.args | 1 +
.../qemuxml2argvdata/usb-port-autoassign.args | 1 +
tests/qemuxml2argvdata/usb-port-missing.args | 1 +
tests/qemuxml2argvdata/usb-ports.args | 1 +
tests/qemuxml2argvdata/usb-redir-boot.args | 1 +
.../usb-redir-filter-version.args | 1 +
tests/qemuxml2argvdata/usb-redir-filter.args | 1 +
tests/qemuxml2argvdata/usb-redir.args | 1 +
.../qemuxml2argvdata/usb-xhci-autoassign.args | 1 +
tests/qemuxml2argvdata/usb1-usb2.args | 1 +
tests/qemuxml2argvdata/user-aliases-usb.args | 1 +
.../vcpu-placement-static.args | 1 +
.../video-device-pciaddr-default.args | 1 +
tests/qemuxml2argvdata/video-none-device.args | 1 +
.../video-qxl-device-vgamem.args | 1 +
tests/qemuxml2argvdata/video-qxl-device.args | 1 +
tests/qemuxml2argvdata/video-qxl-heads.args | 1 +
tests/qemuxml2argvdata/video-qxl-noheads.args | 1 +
.../video-qxl-resolution.args | 1 +
.../video-qxl-sec-device-vgamem.args | 1 +
.../video-qxl-sec-device.args | 1 +
.../video-vga-device-vgamem.args | 1 +
tests/qemuxml2argvdata/video-vga-device.args | 1 +
.../qemuxml2argvdata/video-vga-qxl-heads.args | 1 +
.../video-virtio-gpu-ccw.args | 1 +
.../video-virtio-gpu-device.args | 1 +
.../video-virtio-gpu-sdl-gl.args | 1 +
.../video-virtio-gpu-secondary.args | 1 +
.../video-virtio-gpu-spice-gl.args | 1 +
.../video-virtio-gpu-virgl.args | 1 +
tests/qemuxml2argvdata/video-virtio-vga.args | 1 +
.../virtio-input-passthrough.args | 1 +
tests/qemuxml2argvdata/virtio-input.args | 1 +
tests/qemuxml2argvdata/virtio-lun.args | 1 +
tests/qemuxml2argvdata/virtio-rng-ccw.args | 1 +
.../qemuxml2argvdata/virtio-rng-default.args | 1 +
tests/qemuxml2argvdata/virtio-rng-egd.args | 1 +
.../qemuxml2argvdata/virtio-rng-multiple.args | 1 +
tests/qemuxml2argvdata/virtio-rng-random.args | 1 +
tests/qemuxml2argvdata/vmcoreinfo.args | 1 +
tests/qemuxml2argvdata/watchdog-device.args | 1 +
tests/qemuxml2argvdata/watchdog-dump.args | 1 +
.../qemuxml2argvdata/watchdog-injectnmi.args | 1 +
tests/qemuxml2argvdata/watchdog.args | 1 +
tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 1 +
tests/qemuxml2argvtest.c | 23 +-
tests/vircryptotest.c | 5 -
611 files changed, 710 insertions(+), 591 deletions(-)
--
2.31.1
6:35 a.m.
New subject: [PATCH 01/12] util: Remove use of virCryptoHaveCipher(VIR_CRYPTO_CIPHER_AES256CBC)
It always returns true. Make the logic a bit simpler to see through.
This completely removes 'virCryptoHaveCipher' as it's pointless in the
current form.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_private.syms | 1 -
src/qemu/qemu_domain.c | 3 +--
src/storage/storage_util.c | 6 ------
src/util/vircrypto.c | 27 ---------------------------
src/util/vircrypto.h | 2 --
tests/vircryptotest.c | 5 -----
6 files changed, 1 insertion(+), 43 deletions(-)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 25ee21463c..5e11eb1b5c 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2092,7 +2092,6 @@ virConfWriteMem;
virCryptoEncryptData;
virCryptoHashBuf;
virCryptoHashString;
-virCryptoHaveCipher;
# util/virdaemon.h
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 5de7461fb3..0774374784 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1253,8 +1253,7 @@ qemuDomainSecretAESSetupFromSecret(qemuDomainObjPrivate *priv,
bool
qemuDomainSupportsEncryptedSecret(qemuDomainObjPrivate *priv)
{
- return virCryptoHaveCipher(VIR_CRYPTO_CIPHER_AES256CBC) &&
- virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_SECRET) &&
+ return virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_SECRET) &&
priv->masterKey;
}
diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index 53792765ff..ce61f37172 100644
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -839,12 +839,6 @@ storageBackendCreateQemuImgCheckEncryption(int format,
_("no secret provided for luks encryption"));
return -1;
}
- if (!virCryptoHaveCipher(VIR_CRYPTO_CIPHER_AES256CBC)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("luks encryption usage requires encrypted "
- "secret generation to be supported"));
- return -1;
- }
} else {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("volume encryption unsupported with format %s"),
type);
diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c
index 78689721c3..23692d22fb 100644
--- a/src/util/vircrypto.c
+++ b/src/util/vircrypto.c
@@ -100,33 +100,6 @@ virCryptoHashString(virCryptoHash hash,
}
-/* virCryptoHaveCipher:
- * @algorithm: Specific cipher algorithm desired
- *
- * Expected to be called prior to virCryptoEncryptData in order
- * to determine whether the requested encryption option is available,
- * so that "other" alternatives can be taken if the algorithm is
- * not available.
- *
- * Returns true if we can support the encryption.
- */
-bool
-virCryptoHaveCipher(virCryptoCipher algorithm)
-{
- switch (algorithm) {
-
- case VIR_CRYPTO_CIPHER_AES256CBC:
- return true;
-
- case VIR_CRYPTO_CIPHER_NONE:
- case VIR_CRYPTO_CIPHER_LAST:
- break;
- };
-
- return false;
-}
-
-
/* virCryptoEncryptDataAESgntuls:
*
* Performs the AES gnutls encryption
diff --git a/src/util/vircrypto.h b/src/util/vircrypto.h
index bf002d42d5..5f079ac335 100644
--- a/src/util/vircrypto.h
+++ b/src/util/vircrypto.h
@@ -54,8 +54,6 @@ virCryptoHashString(virCryptoHash hash,
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
G_GNUC_WARN_UNUSED_RESULT;
-bool virCryptoHaveCipher(virCryptoCipher algorithm);
-
int virCryptoEncryptData(virCryptoCipher algorithm,
uint8_t *enckey, size_t enckeylen,
uint8_t *iv, size_t ivlen,
diff --git a/tests/vircryptotest.c b/tests/vircryptotest.c
index 98af476156..9fbaf2f636 100644
--- a/tests/vircryptotest.c
+++ b/tests/vircryptotest.c
@@ -73,11 +73,6 @@ testCryptoEncrypt(const void *opaque)
g_autofree uint8_t *ciphertext = NULL;
size_t ciphertextlen = 0;
- if (!virCryptoHaveCipher(data->algorithm)) {
- fprintf(stderr, "cipher algorithm=%d unavailable\n",
data->algorithm);
- return EXIT_AM_SKIP;
- }
-
enckey = g_new0(uint8_t, enckeylen);
iv = g_new0(uint8_t, ivlen);
--
2.31.1
6:35 a.m.
New subject: [PATCH 02/12] qemu: Always assume presence of QEMU_CAPS_OBJECT_SECRET
The secret object is supported since qemu-2.6 and can't be compiled out.
Assume the presence to simplify the code.
This enables the use of the secret key for most tests not using real
caps.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 9 ---------
src/qemu/qemu_domain.c | 17 +++-------------
.../aarch64-aavmf-virtio-mmio.args | 1 +
tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 1 +
.../aarch64-cpu-passthrough.args | 1 +
tests/qemuxml2argvdata/aarch64-gic-host.args | 1 +
.../aarch64-gic-none-tcg.args | 1 +
tests/qemuxml2argvdata/aarch64-gic-v2.args | 1 +
tests/qemuxml2argvdata/aarch64-gic-v3.args | 1 +
.../aarch64-kvm-32-on-64.args | 1 +
.../aarch64-noacpi-nouefi.args | 1 +
.../qemuxml2argvdata/aarch64-noacpi-uefi.args | 1 +
.../qemuxml2argvdata/aarch64-pci-serial.args | 1 +
.../aarch64-traditional-pci.args | 1 +
.../aarch64-usb-controller-nec-xhci.args | 1 +
.../aarch64-usb-controller-qemu-xhci.args | 1 +
.../aarch64-video-default.args | 1 +
.../aarch64-video-virtio-gpu-pci.args | 1 +
.../aarch64-virt-2.6-virtio-pci-default.args | 1 +
.../aarch64-virt-default-nic.args | 1 +
.../qemuxml2argvdata/aarch64-virt-virtio.args | 1 +
.../aarch64-virtio-pci-default.args | 1 +
.../aarch64-virtio-pci-manual-addresses.args | 1 +
tests/qemuxml2argvdata/acpi-table.args | 1 +
.../arm-vexpressa9-basic.args | 1 +
.../arm-vexpressa9-nodevs.args | 1 +
.../arm-vexpressa9-virtio.args | 1 +
tests/qemuxml2argvdata/arm-virt-virtio.args | 1 +
tests/qemuxml2argvdata/audio-alsa-best.args | 1 +
.../qemuxml2argvdata/audio-alsa-minimal.args | 1 +
.../audio-coreaudio-best.args | 1 +
.../audio-coreaudio-minimal.args | 1 +
.../audio-default-nographics.args | 1 +
tests/qemuxml2argvdata/audio-default-sdl.args | 1 +
.../qemuxml2argvdata/audio-default-spice.args | 1 +
tests/qemuxml2argvdata/audio-default-vnc.args | 1 +
tests/qemuxml2argvdata/audio-file-best.args | 1 +
.../qemuxml2argvdata/audio-file-minimal.args | 1 +
tests/qemuxml2argvdata/audio-none-best.args | 1 +
.../qemuxml2argvdata/audio-none-minimal.args | 1 +
tests/qemuxml2argvdata/audio-oss-best.args | 1 +
tests/qemuxml2argvdata/audio-oss-minimal.args | 1 +
.../audio-pulseaudio-best.args | 1 +
.../audio-pulseaudio-minimal.args | 1 +
tests/qemuxml2argvdata/audio-sdl-best.args | 1 +
tests/qemuxml2argvdata/audio-sdl-minimal.args | 1 +
tests/qemuxml2argvdata/audio-spice-best.args | 1 +
.../qemuxml2argvdata/audio-spice-minimal.args | 1 +
tests/qemuxml2argvdata/autoindex.args | 1 +
.../qemuxml2argvdata/balloon-ccw-deflate.args | 1 +
.../qemuxml2argvdata/balloon-device-auto.args | 1 +
.../balloon-device-deflate-off.args | 1 +
.../balloon-device-deflate.args | 1 +
.../balloon-device-period.args | 1 +
tests/qemuxml2argvdata/balloon-device.args | 1 +
.../balloon-mmio-deflate.args | 1 +
tests/qemuxml2argvdata/bios-nvram-secure.args | 1 +
tests/qemuxml2argvdata/bios-nvram.args | 1 +
tests/qemuxml2argvdata/bios.args | 1 +
tests/qemuxml2argvdata/blkiotune-device.args | 1 +
tests/qemuxml2argvdata/blkiotune.args | 1 +
tests/qemuxml2argvdata/boot-cdrom.args | 1 +
tests/qemuxml2argvdata/boot-complex.args | 1 +
tests/qemuxml2argvdata/boot-floppy-q35.args | 1 +
tests/qemuxml2argvdata/boot-floppy.args | 1 +
.../boot-menu-disable-drive.args | 1 +
tests/qemuxml2argvdata/boot-menu-disable.args | 1 +
.../boot-menu-enable-with-timeout.args | 1 +
tests/qemuxml2argvdata/boot-menu-enable.args | 1 +
tests/qemuxml2argvdata/boot-multi.args | 1 +
tests/qemuxml2argvdata/boot-network.args | 1 +
tests/qemuxml2argvdata/boot-order.args | 1 +
tests/qemuxml2argvdata/boot-strict.args | 1 +
tests/qemuxml2argvdata/channel-guestfwd.args | 1 +
tests/qemuxml2argvdata/channel-spicevmc.args | 1 +
.../qemuxml2argvdata/channel-virtio-auto.args | 1 +
.../channel-virtio-autoadd.args | 1 +
.../channel-virtio-autoassign.args | 1 +
.../channel-virtio-default.args | 1 +
.../channel-virtio-state.args | 1 +
.../qemuxml2argvdata/channel-virtio-unix.args | 1 +
tests/qemuxml2argvdata/channel-virtio.args | 1 +
tests/qemuxml2argvdata/chardev-reconnect.args | 1 +
tests/qemuxml2argvdata/clock-catchup.args | 1 +
tests/qemuxml2argvdata/clock-france.args | 1 +
tests/qemuxml2argvdata/clock-hpet-off.args | 1 +
.../clock-localtime-basis-localtime.args | 1 +
tests/qemuxml2argvdata/clock-localtime.args | 1 +
tests/qemuxml2argvdata/clock-realtime.args | 1 +
.../clock-timer-hyperv-rtc.args | 1 +
tests/qemuxml2argvdata/clock-utc.args | 1 +
tests/qemuxml2argvdata/clock-variable.args | 1 +
.../qemuxml2argvdata/console-compat-auto.args | 1 +
.../console-compat-chardev.args | 1 +
tests/qemuxml2argvdata/console-compat.args | 1 +
.../qemuxml2argvdata/console-virtio-ccw.args | 1 +
.../qemuxml2argvdata/console-virtio-many.args | 1 +
tests/qemuxml2argvdata/console-virtio.args | 1 +
tests/qemuxml2argvdata/controller-order.args | 1 +
tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 1 +
tests/qemuxml2argvdata/cpu-Haswell.args | 1 +
tests/qemuxml2argvdata/cpu-Haswell2.args | 1 +
tests/qemuxml2argvdata/cpu-Haswell3.args | 1 +
tests/qemuxml2argvdata/cpu-cache-disable.args | 1 +
.../qemuxml2argvdata/cpu-cache-disable2.args | 1 +
.../qemuxml2argvdata/cpu-cache-disable3.args | 1 +
.../cpu-cache-emulate-l3.args | 1 +
.../cpu-cache-passthrough.args | 1 +
.../cpu-cache-passthrough2.args | 1 +
.../cpu-check-default-none.args | 1 +
.../cpu-check-default-none2.args | 1 +
.../cpu-check-default-partial.args | 1 +
.../cpu-check-default-partial2.args | 1 +
tests/qemuxml2argvdata/cpu-check-none.args | 1 +
tests/qemuxml2argvdata/cpu-eoi-disabled.args | 1 +
tests/qemuxml2argvdata/cpu-eoi-enabled.args | 1 +
tests/qemuxml2argvdata/cpu-exact1.args | 1 +
.../cpu-exact2-nofallback.args | 1 +
tests/qemuxml2argvdata/cpu-exact2.args | 1 +
tests/qemuxml2argvdata/cpu-fallback.args | 1 +
tests/qemuxml2argvdata/cpu-host-kvmclock.args | 1 +
.../qemuxml2argvdata/cpu-host-model-cmt.args | 1 +
.../cpu-host-model-fallback.args | 1 +
.../cpu-host-model-vendor.args | 1 +
tests/qemuxml2argvdata/cpu-host-model.args | 1 +
.../cpu-host-passthrough-features.args | 1 +
.../cpu-host-passthrough.args | 1 +
.../qemuxml2argvdata/cpu-hotplug-startup.args | 1 +
tests/qemuxml2argvdata/cpu-kvmclock.args | 1 +
tests/qemuxml2argvdata/cpu-minimum1.args | 1 +
tests/qemuxml2argvdata/cpu-minimum2.args | 1 +
.../cpu-no-removed-features.args | 1 +
tests/qemuxml2argvdata/cpu-numa-disjoint.args | 1 +
.../qemuxml2argvdata/cpu-numa-memshared.args | 1 +
.../cpu-numa-no-memory-element.args | 1 +
tests/qemuxml2argvdata/cpu-numa1.args | 1 +
tests/qemuxml2argvdata/cpu-numa2.args | 1 +
tests/qemuxml2argvdata/cpu-s390-features.args | 1 +
tests/qemuxml2argvdata/cpu-s390-zEC12.args | 1 +
tests/qemuxml2argvdata/cpu-strict1.args | 1 +
tests/qemuxml2argvdata/cpu-topology1.args | 1 +
tests/qemuxml2argvdata/cpu-topology2.args | 1 +
tests/qemuxml2argvdata/cpu-topology3.args | 1 +
tests/qemuxml2argvdata/cpu-tsc-frequency.args | 1 +
tests/qemuxml2argvdata/cputune-numatune.args | 1 +
.../qemuxml2argvdata/cputune-zero-shares.args | 1 +
tests/qemuxml2argvdata/cputune.args | 1 +
.../default-kvm-host-arch.args | 1 +
.../default-qemu-host-arch.args | 1 +
tests/qemuxml2argvdata/disk-aio.args | 1 +
tests/qemuxml2argvdata/disk-blockio.args | 1 +
tests/qemuxml2argvdata/disk-boot-cdrom.args | 1 +
tests/qemuxml2argvdata/disk-boot-disk.args | 1 +
.../qemuxml2argvdata/disk-cdrom-network.args | 1 +
tests/qemuxml2argvdata/disk-cdrom-tray.args | 1 +
tests/qemuxml2argvdata/disk-cdrom.args | 1 +
tests/qemuxml2argvdata/disk-copy_on_read.args | 1 +
tests/qemuxml2argvdata/disk-error-policy.args | 1 +
tests/qemuxml2argvdata/disk-floppy-tray.args | 1 +
tests/qemuxml2argvdata/disk-floppy.args | 1 +
tests/qemuxml2argvdata/disk-fmt-qcow.args | 1 +
tests/qemuxml2argvdata/disk-geometry.args | 1 +
tests/qemuxml2argvdata/disk-ide-split.args | 1 +
tests/qemuxml2argvdata/disk-ide-wwn.args | 1 +
tests/qemuxml2argvdata/disk-ioeventfd.args | 1 +
tests/qemuxml2argvdata/disk-iscsi.args | 1 +
.../disk-network-gluster.args | 1 +
.../disk-network-iscsi-modern.args | 10 +++++++---
.../qemuxml2argvdata/disk-network-iscsi.args | 1 +
tests/qemuxml2argvdata/disk-network-nbd.args | 1 +
.../disk-network-sheepdog.args | 1 +
.../disk-network-source-auth.args | 7 +++++--
tests/qemuxml2argvdata/disk-network-vxhs.args | 1 +
tests/qemuxml2argvdata/disk-no-boot.args | 1 +
tests/qemuxml2argvdata/disk-order.args | 1 +
.../qemuxml2argvdata/disk-readonly-disk.args | 1 +
tests/qemuxml2argvdata/disk-sata-device.args | 1 +
.../disk-scsi-disk-split.args | 1 +
.../qemuxml2argvdata/disk-scsi-disk-vpd.args | 1 +
.../qemuxml2argvdata/disk-scsi-disk-wwn.args | 1 +
.../disk-scsi-lun-passthrough.args | 1 +
tests/qemuxml2argvdata/disk-serial.args | 1 +
tests/qemuxml2argvdata/disk-snapshot.args | 1 +
.../disk-source-pool-mode.args | 1 +
tests/qemuxml2argvdata/disk-source-pool.args | 1 +
.../disk-usb-device-removable.args | 1 +
tests/qemuxml2argvdata/disk-usb-device.args | 1 +
.../disk-virtio-ccw-many.args | 1 +
tests/qemuxml2argvdata/disk-virtio-ccw.args | 1 +
.../disk-virtio-s390-zpci.args | 1 +
tests/qemuxml2argvdata/disk-virtio.args | 1 +
tests/qemuxml2argvdata/event_idx.args | 1 +
.../fd-memory-no-numa-topology.args | 1 +
.../fd-memory-numa-topology.args | 1 +
.../fd-memory-numa-topology2.args | 1 +
.../fd-memory-numa-topology3.args | 1 +
tests/qemuxml2argvdata/floppy-drive-fat.args | 1 +
tests/qemuxml2argvdata/fs9p-ccw.args | 1 +
tests/qemuxml2argvdata/fs9p.args | 1 +
.../graphics-egl-headless.args | 1 +
.../graphics-sdl-fullscreen.args | 1 +
tests/qemuxml2argvdata/graphics-sdl.args | 1 +
.../graphics-spice-agent-file-xfer.args | 1 +
.../graphics-spice-agentmouse.args | 1 +
.../graphics-spice-auto-socket-cfg.args | 1 +
.../graphics-spice-auto-socket.args | 1 +
.../graphics-spice-compression.args | 1 +
.../graphics-spice-egl-headless.args | 1 +
.../graphics-spice-no-args.args | 1 +
.../graphics-spice-qxl-vga.args | 1 +
.../qemuxml2argvdata/graphics-spice-sasl.args | 1 +
.../graphics-spice-socket.args | 1 +
.../graphics-spice-timeout.args | 1 +
.../graphics-spice-usb-redir.args | 1 +
tests/qemuxml2argvdata/graphics-spice.args | 1 +
.../graphics-vnc-auto-socket-cfg.args | 1 +
.../graphics-vnc-auto-socket.args | 1 +
.../graphics-vnc-egl-headless.args | 1 +
.../graphics-vnc-no-listen-attr.args | 1 +
tests/qemuxml2argvdata/graphics-vnc-none.args | 1 +
.../qemuxml2argvdata/graphics-vnc-policy.args | 1 +
.../graphics-vnc-remove-generated-socket.args | 1 +
tests/qemuxml2argvdata/graphics-vnc-sasl.args | 1 +
.../graphics-vnc-socket-new-cmdline.args | 1 +
.../qemuxml2argvdata/graphics-vnc-socket.args | 1 +
tests/qemuxml2argvdata/graphics-vnc-tls.args | 1 +
.../graphics-vnc-websocket.args | 1 +
tests/qemuxml2argvdata/graphics-vnc.args | 1 +
.../hostdev-mdev-precreated.args | 1 +
.../hostdev-pci-address-device.args | 1 +
.../hostdev-pci-address-unassigned.args | 1 +
.../qemuxml2argvdata/hostdev-pci-address.args | 1 +
.../hostdev-pci-multifunction.args | 1 +
.../hostdev-scsi-vhost-scsi-ccw.args | 1 +
.../hostdev-scsi-vhost-scsi-pci.args | 1 +
.../hostdev-scsi-vhost-scsi-pcie.args | 1 +
.../hostdev-subsys-mdev-vfio-ccw.args | 1 +
.../hostdev-usb-address-device-boot.args | 1 +
.../hostdev-usb-address-device.args | 1 +
.../qemuxml2argvdata/hostdev-usb-address.args | 1 +
.../hostdev-vfio-multidomain.args | 1 +
.../hostdev-vfio-zpci-autogenerate-fids.args | 1 +
.../hostdev-vfio-zpci-autogenerate-uids.args | 1 +
.../hostdev-vfio-zpci-autogenerate.args | 1 +
.../hostdev-vfio-zpci-boundaries.args | 1 +
.../hostdev-vfio-zpci-ccw-memballoon.args | 1 +
.../hostdev-vfio-zpci-multidomain-many.args | 1 +
tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 1 +
tests/qemuxml2argvdata/hostdev-vfio.args | 1 +
tests/qemuxml2argvdata/hotplug-base.args | 1 +
.../hugepages-default-2M.args | 1 +
.../hugepages-default-system-size.args | 1 +
tests/qemuxml2argvdata/hugepages-default.args | 1 +
.../qemuxml2argvdata/hugepages-memaccess.args | 1 +
.../hugepages-memaccess2.args | 1 +
tests/qemuxml2argvdata/hugepages-nodeset.args | 1 +
.../hugepages-numa-default-2M.args | 1 +
.../hugepages-numa-default-dimm.args | 1 +
.../hugepages-numa-default.args | 1 +
.../hugepages-numa-nodeset-part.args | 1 +
.../hugepages-numa-nodeset.args | 1 +
tests/qemuxml2argvdata/hugepages-shared.args | 1 +
.../qemuxml2argvdata/input-usbmouse-addr.args | 1 +
tests/qemuxml2argvdata/input-usbmouse.args | 1 +
tests/qemuxml2argvdata/input-usbtablet.args | 1 +
tests/qemuxml2argvdata/input-virtio-ccw.args | 1 +
.../iothreads-disk-virtio-ccw.args | 1 +
tests/qemuxml2argvdata/iothreads-disk.args | 1 +
.../iothreads-ids-partial.args | 1 +
tests/qemuxml2argvdata/iothreads-ids.args | 1 +
tests/qemuxml2argvdata/iothreads.args | 1 +
tests/qemuxml2argvdata/kvm-features-off.args | 1 +
tests/qemuxml2argvdata/kvm-features.args | 1 +
tests/qemuxml2argvdata/kvm-pit-delay.args | 1 +
tests/qemuxml2argvdata/kvm-pit-discard.args | 1 +
tests/qemuxml2argvdata/kvmclock.args | 1 +
.../mach-virt-console-virtio.args | 1 +
.../mach-virt-serial-native.args | 1 +
.../mach-virt-serial-pci.args | 1 +
.../mach-virt-serial-usb.args | 1 +
.../machine-aeskeywrap-off-cap.args | 1 +
.../machine-aeskeywrap-off-caps.args | 1 +
.../machine-aeskeywrap-on-cap.args | 1 +
.../machine-aeskeywrap-on-caps.args | 1 +
tests/qemuxml2argvdata/machine-aliases1.args | 1 +
tests/qemuxml2argvdata/machine-aliases2.args | 1 +
tests/qemuxml2argvdata/machine-core-off.args | 1 +
tests/qemuxml2argvdata/machine-core-on.args | 1 +
.../machine-deakeywrap-off-cap.args | 1 +
.../machine-deakeywrap-off-caps.args | 1 +
.../machine-deakeywrap-on-cap.args | 1 +
.../machine-deakeywrap-on-caps.args | 1 +
.../machine-keywrap-none-caps.args | 1 +
.../machine-keywrap-none.args | 1 +
...ine-loadparm-multiple-disks-nets-s390.args | 1 +
.../machine-loadparm-net-s390.args | 1 +
.../machine-loadparm-s390.args | 1 +
tests/qemuxml2argvdata/machine-smm-opt.args | 1 +
.../qemuxml2argvdata/machine-vmport-opt.args | 1 +
.../memory-hotplug-dimm-addr.args | 1 +
.../qemuxml2argvdata/memory-hotplug-dimm.args | 1 +
...emory-hotplug-nvdimm-ppc64-abi-update.args | 1 +
.../memory-hotplug-nvdimm-ppc64.args | 1 +
...emory-hotplug-ppc64-nonuma-abi-update.args | 1 +
.../memory-hotplug-ppc64-nonuma.args | 1 +
tests/qemuxml2argvdata/memory-hotplug.args | 1 +
tests/qemuxml2argvdata/memtune-unlimited.args | 1 +
tests/qemuxml2argvdata/memtune.args | 1 +
.../migrate-numa-unaligned.args | 1 +
tests/qemuxml2argvdata/migrate.args | 1 +
tests/qemuxml2argvdata/minimal.args | 1 +
tests/qemuxml2argvdata/misc-acpi.args | 1 +
tests/qemuxml2argvdata/misc-disable-s3.args | 1 +
.../misc-disable-suspends.args | 1 +
tests/qemuxml2argvdata/misc-enable-s4.args | 1 +
tests/qemuxml2argvdata/misc-no-reboot.args | 1 +
tests/qemuxml2argvdata/misc-uuid.args | 1 +
tests/qemuxml2argvdata/monitor-json.args | 1 +
.../multifunction-pci-device.args | 1 +
tests/qemuxml2argvdata/net-client.args | 1 +
tests/qemuxml2argvdata/net-eth-hostip.args | 1 +
tests/qemuxml2argvdata/net-eth-ifname.args | 1 +
tests/qemuxml2argvdata/net-eth-names.args | 1 +
.../net-eth-unmanaged-tap.args | 1 +
tests/qemuxml2argvdata/net-eth.args | 1 +
.../net-hostdev-bootorder.args | 1 +
.../net-hostdev-multidomain.args | 1 +
.../net-hostdev-vfio-multidomain.args | 1 +
tests/qemuxml2argvdata/net-hostdev-vfio.args | 1 +
tests/qemuxml2argvdata/net-hostdev.args | 1 +
tests/qemuxml2argvdata/net-many-models.args | 1 +
tests/qemuxml2argvdata/net-mcast.args | 1 +
tests/qemuxml2argvdata/net-server.args | 1 +
tests/qemuxml2argvdata/net-udp.args | 1 +
tests/qemuxml2argvdata/net-user-addr.args | 1 +
tests/qemuxml2argvdata/net-user.args | 1 +
.../net-vhostuser-multiq.args | 1 +
tests/qemuxml2argvdata/net-vhostuser.args | 1 +
tests/qemuxml2argvdata/net-virtio-ccw.args | 1 +
tests/qemuxml2argvdata/net-virtio-device.args | 1 +
.../net-virtio-disable-offloads.args | 1 +
tests/qemuxml2argvdata/net-virtio-netdev.args | 1 +
.../net-virtio-rxtxqueuesize.args | 1 +
.../net-virtio-teaming-hostdev.args | 1 +
.../qemuxml2argvdata/net-virtio-teaming.args | 1 +
tests/qemuxml2argvdata/net-virtio.args | 1 +
tests/qemuxml2argvdata/nosharepages.args | 1 +
.../numad-auto-memory-vcpu-cpuset.args | 1 +
...o-memory-vcpu-no-cpuset-and-placement.args | 1 +
.../numad-auto-vcpu-static-numatune.args | 1 +
.../numad-static-memory-auto-vcpu.args | 1 +
tests/qemuxml2argvdata/numad.args | 1 +
.../numatune-auto-nodeset-invalid.args | 1 +
.../numatune-auto-prefer.args | 1 +
.../qemuxml2argvdata/numatune-distances.args | 1 +
.../numatune-memnode-no-memory.args | 1 +
tests/qemuxml2argvdata/numatune-memnode.args | 1 +
tests/qemuxml2argvdata/numatune-memory.args | 1 +
tests/qemuxml2argvdata/numatune-no-vcpu.args | 1 +
.../qemuxml2argvdata/pages-dimm-discard.args | 1 +
.../pages-discard-hugepages.args | 1 +
tests/qemuxml2argvdata/pages-discard.args | 1 +
tests/qemuxml2argvdata/panic-double.args | 1 +
tests/qemuxml2argvdata/panic-no-address.args | 1 +
tests/qemuxml2argvdata/panic.args | 1 +
.../parallel-parport-chardev.args | 1 +
.../parallel-tcp-chardev.args | 1 +
tests/qemuxml2argvdata/pci-autoadd-addr.args | 1 +
tests/qemuxml2argvdata/pci-autoadd-idx.args | 1 +
tests/qemuxml2argvdata/pci-autofill-addr.args | 1 +
.../pci-bridge-many-disks.args | 1 +
tests/qemuxml2argvdata/pci-bridge.args | 1 +
tests/qemuxml2argvdata/pci-expander-bus.args | 1 +
tests/qemuxml2argvdata/pci-many.args | 1 +
tests/qemuxml2argvdata/pci-rom-disabled.args | 1 +
tests/qemuxml2argvdata/pci-rom.args | 1 +
.../pci-serial-dev-chardev.args | 1 +
tests/qemuxml2argvdata/pcie-expander-bus.args | 1 +
.../pcie-root-port-model-generic.args | 1 +
.../pcie-root-port-model-ioh3420.args | 1 +
tests/qemuxml2argvdata/pcie-root-port.args | 1 +
tests/qemuxml2argvdata/pcie-root.args | 1 +
.../pcie-switch-downstream-port.args | 1 +
.../pcie-switch-upstream-port.args | 1 +
tests/qemuxml2argvdata/pcihole64-q35.args | 1 +
tests/qemuxml2argvdata/pcihole64.args | 1 +
tests/qemuxml2argvdata/pmu-feature-off.args | 1 +
tests/qemuxml2argvdata/pmu-feature.args | 1 +
tests/qemuxml2argvdata/ppc-dtb.args | 1 +
.../ppc64-usb-controller-legacy.args | 1 +
.../ppc64-usb-controller-qemu-xhci.args | 1 +
.../ppc64-usb-controller.args | 1 +
tests/qemuxml2argvdata/ppce500-serial.args | 1 +
tests/qemuxml2argvdata/pseries-basic.args | 1 +
.../pseries-console-virtio.args | 1 +
.../pseries-cpu-compat-power9.args | 1 +
.../qemuxml2argvdata/pseries-cpu-compat.args | 1 +
tests/qemuxml2argvdata/pseries-cpu-exact.args | 1 +
tests/qemuxml2argvdata/pseries-cpu-le.args | 1 +
tests/qemuxml2argvdata/pseries-features.args | 1 +
.../qemuxml2argvdata/pseries-hostdevs-1.args | 1 +
.../qemuxml2argvdata/pseries-hostdevs-2.args | 1 +
.../qemuxml2argvdata/pseries-hostdevs-3.args | 1 +
.../pseries-machine-max-cpu-compat.args | 1 +
.../pseries-many-buses-1.args | 1 +
.../pseries-many-buses-2.args | 1 +
.../pseries-many-devices.args | 1 +
tests/qemuxml2argvdata/pseries-nvram.args | 1 +
.../pseries-panic-missing.args | 1 +
.../pseries-panic-no-address.args | 1 +
.../pseries-phb-default-missing.args | 1 +
.../pseries-phb-numa-node.args | 1 +
.../qemuxml2argvdata/pseries-phb-simple.args | 1 +
.../pseries-serial-native.args | 1 +
.../qemuxml2argvdata/pseries-serial-pci.args | 1 +
.../qemuxml2argvdata/pseries-serial-usb.args | 1 +
.../qemuxml2argvdata/pseries-usb-default.args | 1 +
tests/qemuxml2argvdata/pseries-usb-kbd.args | 1 +
tests/qemuxml2argvdata/pseries-usb-multi.args | 1 +
.../pseries-vio-user-assigned.args | 1 +
tests/qemuxml2argvdata/pseries-vio.args | 1 +
tests/qemuxml2argvdata/q35-acpi-nouefi.args | 1 +
tests/qemuxml2argvdata/q35-acpi-uefi.args | 1 +
.../q35-default-devices-only.args | 1 +
tests/qemuxml2argvdata/q35-multifunction.args | 1 +
tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 1 +
.../q35-pci-force-address.args | 1 +
tests/qemuxml2argvdata/q35-pcie-autoadd.args | 1 +
tests/qemuxml2argvdata/q35-pcie.args | 1 +
.../q35-pm-disable-fallback.args | 1 +
tests/qemuxml2argvdata/q35-pm-disable.args | 1 +
tests/qemuxml2argvdata/q35-usb2-multi.args | 1 +
tests/qemuxml2argvdata/q35-usb2-reorder.args | 1 +
tests/qemuxml2argvdata/q35-usb2.args | 1 +
.../q35-virt-manager-basic.args | 1 +
tests/qemuxml2argvdata/q35-virtio-pci.args | 1 +
tests/qemuxml2argvdata/q35.args | 1 +
tests/qemuxml2argvdata/qemu-ns-alt.args | 1 +
.../qemu-ns-commandline-ns0.args | 1 +
.../qemu-ns-commandline-ns1.args | 1 +
.../qemuxml2argvdata/qemu-ns-commandline.args | 1 +
.../qemu-ns-domain-commandline-ns0.args | 1 +
.../qemu-ns-domain-commandline.args | 1 +
.../qemuxml2argvdata/qemu-ns-domain-ns0.args | 1 +
tests/qemuxml2argvdata/qemu-ns-no-env.args | 1 +
.../reboot-timeout-disabled.args | 1 +
.../reboot-timeout-enabled.args | 1 +
tests/qemuxml2argvdata/restore-v2-fd.args | 1 +
tests/qemuxml2argvdata/restore-v2.args | 1 +
tests/qemuxml2argvdata/riscv64-virt-pci.args | 1 +
tests/qemuxml2argvdata/riscv64-virt.args | 1 +
.../qemuxml2argvdata/s390-panic-missing.args | 1 +
.../s390-panic-no-address.args | 1 +
tests/qemuxml2argvdata/s390-serial-2.args | 1 +
.../qemuxml2argvdata/s390-serial-console.args | 1 +
tests/qemuxml2argvdata/s390-serial.args | 1 +
tests/qemuxml2argvdata/seclabel-dac-none.args | 1 +
.../seclabel-dynamic-baselabel.args | 1 +
.../seclabel-dynamic-labelskip.args | 1 +
.../seclabel-dynamic-override.args | 1 +
.../seclabel-dynamic-relabel.args | 1 +
tests/qemuxml2argvdata/seclabel-dynamic.args | 1 +
tests/qemuxml2argvdata/seclabel-none.args | 1 +
.../seclabel-static-labelskip.args | 1 +
.../seclabel-static-relabel.args | 1 +
tests/qemuxml2argvdata/seclabel-static.args | 1 +
.../serial-dev-chardev-iobase.args | 1 +
.../qemuxml2argvdata/serial-dev-chardev.args | 1 +
.../qemuxml2argvdata/serial-file-chardev.args | 1 +
tests/qemuxml2argvdata/serial-file-log.args | 1 +
.../qemuxml2argvdata/serial-many-chardev.args | 1 +
.../qemuxml2argvdata/serial-pty-chardev.args | 1 +
.../serial-spiceport-nospice.args | 1 +
tests/qemuxml2argvdata/serial-spiceport.args | 1 +
.../qemuxml2argvdata/serial-tcp-chardev.args | 1 +
.../serial-tcp-telnet-chardev.args | 1 +
.../serial-tcp-tlsx509-chardev-notls.args | 1 +
.../serial-tcp-tlsx509-chardev-verify.args | 1 +
.../serial-tcp-tlsx509-chardev.args | 1 +
.../qemuxml2argvdata/serial-udp-chardev.args | 1 +
.../qemuxml2argvdata/serial-unix-chardev.args | 1 +
tests/qemuxml2argvdata/serial-vc-chardev.args | 1 +
.../shmem-plain-doorbell.args | 1 +
tests/qemuxml2argvdata/shmem.args | 1 +
.../smartcard-controller.args | 1 +
.../smartcard-host-certificates-database.args | 1 +
.../smartcard-host-certificates.args | 1 +
tests/qemuxml2argvdata/smartcard-host.args | 1 +
.../smartcard-passthrough-spicevmc.args | 1 +
.../smartcard-passthrough-tcp.args | 1 +
tests/qemuxml2argvdata/smbios-type-fwcfg.args | 1 +
tests/qemuxml2argvdata/smbios.args | 1 +
tests/qemuxml2argvdata/smp-dies.args | 1 +
tests/qemuxml2argvdata/smp.args | 1 +
tests/qemuxml2argvdata/sound-device.args | 1 +
tests/qemuxml2argvdata/sound.args | 1 +
tests/qemuxml2argvdata/sparc-minimal.args | 1 +
.../usb-controller-default-q35.args | 1 +
.../usb-controller-explicit-q35.args | 1 +
.../usb-controller-qemu-xhci.args | 1 +
.../qemuxml2argvdata/usb-controller-xhci.args | 1 +
tests/qemuxml2argvdata/usb-controller.args | 1 +
.../usb-hub-autoadd-deluxe.args | 1 +
tests/qemuxml2argvdata/usb-hub-autoadd.args | 1 +
tests/qemuxml2argvdata/usb-hub.args | 1 +
.../qemuxml2argvdata/usb-ich9-autoassign.args | 1 +
.../qemuxml2argvdata/usb-ich9-companion.args | 1 +
.../qemuxml2argvdata/usb-ich9-ehci-addr.args | 1 +
.../qemuxml2argvdata/usb-long-port-path.args | 1 +
tests/qemuxml2argvdata/usb-none.args | 1 +
.../usb-piix3-controller.args | 1 +
.../qemuxml2argvdata/usb-port-autoassign.args | 1 +
tests/qemuxml2argvdata/usb-port-missing.args | 1 +
tests/qemuxml2argvdata/usb-ports.args | 1 +
tests/qemuxml2argvdata/usb-redir-boot.args | 1 +
.../usb-redir-filter-version.args | 1 +
tests/qemuxml2argvdata/usb-redir-filter.args | 1 +
tests/qemuxml2argvdata/usb-redir.args | 1 +
.../qemuxml2argvdata/usb-xhci-autoassign.args | 1 +
tests/qemuxml2argvdata/usb1-usb2.args | 1 +
tests/qemuxml2argvdata/user-aliases-usb.args | 1 +
.../vcpu-placement-static.args | 1 +
.../video-device-pciaddr-default.args | 1 +
tests/qemuxml2argvdata/video-none-device.args | 1 +
.../video-qxl-device-vgamem.args | 1 +
tests/qemuxml2argvdata/video-qxl-device.args | 1 +
tests/qemuxml2argvdata/video-qxl-heads.args | 1 +
tests/qemuxml2argvdata/video-qxl-noheads.args | 1 +
.../video-qxl-resolution.args | 1 +
.../video-qxl-sec-device-vgamem.args | 1 +
.../video-qxl-sec-device.args | 1 +
.../video-vga-device-vgamem.args | 1 +
tests/qemuxml2argvdata/video-vga-device.args | 1 +
.../qemuxml2argvdata/video-vga-qxl-heads.args | 1 +
.../video-virtio-gpu-ccw.args | 1 +
.../video-virtio-gpu-device.args | 1 +
.../video-virtio-gpu-sdl-gl.args | 1 +
.../video-virtio-gpu-secondary.args | 1 +
.../video-virtio-gpu-spice-gl.args | 1 +
.../video-virtio-gpu-virgl.args | 1 +
tests/qemuxml2argvdata/video-virtio-vga.args | 1 +
.../virtio-input-passthrough.args | 1 +
tests/qemuxml2argvdata/virtio-input.args | 1 +
tests/qemuxml2argvdata/virtio-lun.args | 1 +
tests/qemuxml2argvdata/virtio-rng-ccw.args | 1 +
.../qemuxml2argvdata/virtio-rng-default.args | 1 +
tests/qemuxml2argvdata/virtio-rng-egd.args | 1 +
.../qemuxml2argvdata/virtio-rng-multiple.args | 1 +
tests/qemuxml2argvdata/virtio-rng-random.args | 1 +
tests/qemuxml2argvdata/vmcoreinfo.args | 1 +
tests/qemuxml2argvdata/watchdog-device.args | 1 +
tests/qemuxml2argvdata/watchdog-dump.args | 1 +
.../qemuxml2argvdata/watchdog-injectnmi.args | 1 +
tests/qemuxml2argvdata/watchdog.args | 1 +
tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 1 +
tests/qemuxml2argvtest.c | 20 +++++++++----------
556 files changed, 575 insertions(+), 39 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 3de37aa5c5..7a441b4a04 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -200,15 +200,6 @@ qemuBuildMasterKeyCommandLine(virCommand *cmd,
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
g_autoptr(virJSONValue) props = NULL;
- /* If the -object secret does not exist, then just return. This just
- * means the domain won't be able to use a secret master key and is
- * not a failure.
- */
- if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_SECRET)) {
- VIR_INFO("secret object is not supported by this QEMU binary");
- return 0;
- }
-
if (!(alias = qemuDomainGetMasterKeyAlias()))
return -1;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 0774374784..1340ed0d29 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -557,10 +557,6 @@ qemuDomainMasterKeyReadFile(qemuDomainObjPrivate *priv)
uint8_t *masterKey = NULL;
ssize_t masterKeyLen = 0;
- /* If we don't have the capability, then do nothing. */
- if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_SECRET))
- return 0;
-
if (!(path = qemuDomainGetMasterKeyFilePath(priv->libDir)))
return -1;
@@ -649,10 +645,6 @@ qemuDomainMasterKeyCreate(virDomainObj *vm)
qemuDomainObjPrivate *priv = vm->privateData;
g_autofree uint8_t *key = NULL;
- /* If we don't have the capability, then do nothing. */
- if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_SECRET))
- return 0;
-
key = g_new0(uint8_t, QEMU_DOMAIN_MASTER_KEY_LEN);
if (virRandomBytes(key, QEMU_DOMAIN_MASTER_KEY_LEN) < 0)
@@ -1253,8 +1245,7 @@ qemuDomainSecretAESSetupFromSecret(qemuDomainObjPrivate *priv,
bool
qemuDomainSupportsEncryptedSecret(qemuDomainObjPrivate *priv)
{
- return virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_SECRET) &&
- priv->masterKey;
+ return !!priv->masterKey;
}
@@ -5362,8 +5353,7 @@ qemuDomainDeviceDiskDefPostParseRestoreSecAlias(virDomainDiskDef
*disk,
g_autofree char *encalias = NULL;
if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS) ||
- virStorageSourceIsEmpty(disk->src) ||
- !virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_SECRET))
+ virStorageSourceIsEmpty(disk->src))
return 0;
/* network storage authentication secret */
@@ -5546,8 +5536,7 @@
qemuDomainDeviceHostdevDefPostParseRestoreSecAlias(virDomainHostdevDef *hostdev,
virDomainHostdevSubsysSCSIiSCSI *iscsisrc = &scsisrc->u.iscsi;
g_autofree char *authalias = NULL;
- if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS) ||
- !virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_SECRET))
+ if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS))
return 0;
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index 2c22d808c1..311b1be558 100644
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a53 \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
index cd65e44611..4608573db4 100644
--- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
+++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a57 \
-drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
index 581cd96752..ac97d988ca 100644
--- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
+++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=2 \
-cpu host \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.args
b/tests/qemuxml2argvdata/aarch64-gic-host.args
index f451c9ff68..b97db14b59 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-host.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-host.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=host \
-cpu host \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
index 7080701c95..0ae93f2596 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a57 \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.args
b/tests/qemuxml2argvdata/aarch64-gic-v2.args
index 46c31127af..19c040b4c2 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v2.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=2 \
-cpu host \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args
b/tests/qemuxml2argvdata/aarch64-gic-v3.args
index acf10ec0b2..1bee97561a 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v3.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v3.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
-cpu host \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
index bb6dd39c3d..117a95ef12 100644
--- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-arm \
-name guest=armtest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-armtest/master-key.aes \
-machine virt,accel=kvm,usb=off,dump-guest-core=off \
-cpu host,aarch64=off \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
index c99e6138f4..7dc69e4cbc 100644
--- a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
+++ b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a57 \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
index edbe667606..85cb2fd36b 100644
--- a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
+++ b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a57 \
-drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
diff --git a/tests/qemuxml2argvdata/aarch64-pci-serial.args
b/tests/qemuxml2argvdata/aarch64-pci-serial.args
index 41073b84ed..92f6c00556 100644
--- a/tests/qemuxml2argvdata/aarch64-pci-serial.args
+++ b/tests/qemuxml2argvdata/aarch64-pci-serial.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-traditional-pci.args
b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
index ece10b258d..d2779f0528 100644
--- a/tests/qemuxml2argvdata/aarch64-traditional-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
index 1840334b98..0131117d08 100644
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
index 23290c624c..3e95ce6a4a 100644
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-video-default.args
b/tests/qemuxml2argvdata/aarch64-video-default.args
index 3da5c13f55..568b456389 100644
--- a/tests/qemuxml2argvdata/aarch64-video-default.args
+++ b/tests/qemuxml2argvdata/aarch64-video-default.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64-vgpu,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64-vgpu/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a57 \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
index 638e304b89..49d918e393 100644
--- a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64-vgpu,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64-vgpu/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a57 \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
index 926266bd2e..0f898010f8 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt-2.6,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a53 \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
index d6290d486c..f4a692a0d9 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64-virt-default-nic,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64-virt-default/master-key.aes
\
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a53 \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
index 00c90cc93e..08dfb2bab2 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a53 \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
index bd617a3fec..426881a10d 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a53 \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
index f53ee1570a..c5fa037fcb 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a53 \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/acpi-table.args
b/tests/qemuxml2argvdata/acpi-table.args
index 0cf2a4e9e1..f39a9269a1 100644
--- a/tests/qemuxml2argvdata/acpi-table.args
+++ b/tests/qemuxml2argvdata/acpi-table.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
index 15bc5e0c55..23f4c356ef 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-arm \
-name guest=armtest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-armtest/master-key.aes \
-machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
index 1a410872b6..9bbe063ccc 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-arm \
-name guest=armtest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-armtest/master-key.aes \
-machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
index 87edf5b2a4..76ad274c35 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-arm \
-name guest=armtest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-armtest/master-key.aes \
-machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.args
b/tests/qemuxml2argvdata/arm-virt-virtio.args
index 8cdb49f5ec..00c6f78f05 100644
--- a/tests/qemuxml2argvdata/arm-virt-virtio.args
+++ b/tests/qemuxml2argvdata/arm-virt-virtio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-arm \
-name guest=armtest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-armtest/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-alsa-best.args
b/tests/qemuxml2argvdata/audio-alsa-best.args
index cdc04fb469..a9c6833570 100644
--- a/tests/qemuxml2argvdata/audio-alsa-best.args
+++ b/tests/qemuxml2argvdata/audio-alsa-best.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DAC_DEV=/dev/dsp1 \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-alsa-minimal.args
b/tests/qemuxml2argvdata/audio-alsa-minimal.args
index 31ac502e38..9a1126b0e8 100644
--- a/tests/qemuxml2argvdata/audio-alsa-minimal.args
+++ b/tests/qemuxml2argvdata/audio-alsa-minimal.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=alsa \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-coreaudio-best.args
b/tests/qemuxml2argvdata/audio-coreaudio-best.args
index defdbbc7bc..60308f06f0 100644
--- a/tests/qemuxml2argvdata/audio-coreaudio-best.args
+++ b/tests/qemuxml2argvdata/audio-coreaudio-best.args
@@ -23,6 +23,7 @@ QEMU_COREAUDIO_BUFFER_SIZE=200 \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-coreaudio-minimal.args
b/tests/qemuxml2argvdata/audio-coreaudio-minimal.args
index 740a31f791..f5a1c9822a 100644
--- a/tests/qemuxml2argvdata/audio-coreaudio-minimal.args
+++ b/tests/qemuxml2argvdata/audio-coreaudio-minimal.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=coreaudio \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-default-nographics.args
b/tests/qemuxml2argvdata/audio-default-nographics.args
index 31ac502e38..9a1126b0e8 100644
--- a/tests/qemuxml2argvdata/audio-default-nographics.args
+++ b/tests/qemuxml2argvdata/audio-default-nographics.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=alsa \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-default-sdl.args
b/tests/qemuxml2argvdata/audio-default-sdl.args
index 9e57c39886..db651b3e30 100644
--- a/tests/qemuxml2argvdata/audio-default-sdl.args
+++ b/tests/qemuxml2argvdata/audio-default-sdl.args
@@ -11,6 +11,7 @@ SDL_AUDIODRIVER=esd \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-default-spice.args
b/tests/qemuxml2argvdata/audio-default-spice.args
index 735f8fb52d..9539abded5 100644
--- a/tests/qemuxml2argvdata/audio-default-spice.args
+++ b/tests/qemuxml2argvdata/audio-default-spice.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-default-vnc.args
b/tests/qemuxml2argvdata/audio-default-vnc.args
index 7520b5bd99..c9dd234406 100644
--- a/tests/qemuxml2argvdata/audio-default-vnc.args
+++ b/tests/qemuxml2argvdata/audio-default-vnc.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=alsa \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-file-best.args
b/tests/qemuxml2argvdata/audio-file-best.args
index adc467803c..36bd22e223 100644
--- a/tests/qemuxml2argvdata/audio-file-best.args
+++ b/tests/qemuxml2argvdata/audio-file-best.args
@@ -22,6 +22,7 @@ QEMU_WAV_PATH=audio.wav \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-file-minimal.args
b/tests/qemuxml2argvdata/audio-file-minimal.args
index b458361a05..abb377fab3 100644
--- a/tests/qemuxml2argvdata/audio-file-minimal.args
+++ b/tests/qemuxml2argvdata/audio-file-minimal.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=wav \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-none-best.args
b/tests/qemuxml2argvdata/audio-none-best.args
index ccfbaf6273..8284b7cf5f 100644
--- a/tests/qemuxml2argvdata/audio-none-best.args
+++ b/tests/qemuxml2argvdata/audio-none-best.args
@@ -21,6 +21,7 @@ QEMU_AUDIO_DAC_FIXED_FMT=f32 \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-none-minimal.args
b/tests/qemuxml2argvdata/audio-none-minimal.args
index 431457dead..ec6ddd2857 100644
--- a/tests/qemuxml2argvdata/audio-none-minimal.args
+++ b/tests/qemuxml2argvdata/audio-none-minimal.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-oss-best.args
b/tests/qemuxml2argvdata/audio-oss-best.args
index 9b4d93f0c4..25d37650f6 100644
--- a/tests/qemuxml2argvdata/audio-oss-best.args
+++ b/tests/qemuxml2argvdata/audio-oss-best.args
@@ -26,6 +26,7 @@ QEMU_OSS_NFRAGS=30 \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-oss-minimal.args
b/tests/qemuxml2argvdata/audio-oss-minimal.args
index 8295db971f..eb94dedbe0 100644
--- a/tests/qemuxml2argvdata/audio-oss-minimal.args
+++ b/tests/qemuxml2argvdata/audio-oss-minimal.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=oss \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-best.args
b/tests/qemuxml2argvdata/audio-pulseaudio-best.args
index 6a026741ee..f462325694 100644
--- a/tests/qemuxml2argvdata/audio-pulseaudio-best.args
+++ b/tests/qemuxml2argvdata/audio-pulseaudio-best.args
@@ -25,6 +25,7 @@ QEMU_PA_SERVER=%s=acme.example.org \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.args
b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.args
index 7e9b4e90c4..e68b58528d 100644
--- a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.args
+++ b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=pa \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-sdl-best.args
b/tests/qemuxml2argvdata/audio-sdl-best.args
index a049d48f22..221d67468c 100644
--- a/tests/qemuxml2argvdata/audio-sdl-best.args
+++ b/tests/qemuxml2argvdata/audio-sdl-best.args
@@ -23,6 +23,7 @@ SDL_AUDIODRIVER=pulseaudio \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-sdl-minimal.args
b/tests/qemuxml2argvdata/audio-sdl-minimal.args
index 8e8a397635..fe745b25db 100644
--- a/tests/qemuxml2argvdata/audio-sdl-minimal.args
+++ b/tests/qemuxml2argvdata/audio-sdl-minimal.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=sdl \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-spice-best.args
b/tests/qemuxml2argvdata/audio-spice-best.args
index 62248cbd84..70d10fe24d 100644
--- a/tests/qemuxml2argvdata/audio-spice-best.args
+++ b/tests/qemuxml2argvdata/audio-spice-best.args
@@ -21,6 +21,7 @@ QEMU_AUDIO_DAC_FIXED_FMT=f32 \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/audio-spice-minimal.args
b/tests/qemuxml2argvdata/audio-spice-minimal.args
index d250328ee1..30a4f5e5a0 100644
--- a/tests/qemuxml2argvdata/audio-spice-minimal.args
+++ b/tests/qemuxml2argvdata/audio-spice-minimal.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/autoindex.args
b/tests/qemuxml2argvdata/autoindex.args
index 23e9b73182..2a6233a1ed 100644
--- a/tests/qemuxml2argvdata/autoindex.args
+++ b/tests/qemuxml2argvdata/autoindex.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.args
b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
index c14304907c..351ac7ea48 100644
--- a/tests/qemuxml2argvdata/balloon-ccw-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args
b/tests/qemuxml2argvdata/balloon-device-auto.args
index 34895f1a70..bf3b69c54e 100644
--- a/tests/qemuxml2argvdata/balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/balloon-device-auto.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
index e1e589bb96..4dba0f0e63 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args
b/tests/qemuxml2argvdata/balloon-device-deflate.args
index e4140235cb..778329f68b 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/balloon-device-period.args
b/tests/qemuxml2argvdata/balloon-device-period.args
index 4522e25bd3..92311bfd6e 100644
--- a/tests/qemuxml2argvdata/balloon-device-period.args
+++ b/tests/qemuxml2argvdata/balloon-device-period.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/balloon-device.args
b/tests/qemuxml2argvdata/balloon-device.args
index 4522e25bd3..92311bfd6e 100644
--- a/tests/qemuxml2argvdata/balloon-device.args
+++ b/tests/qemuxml2argvdata/balloon-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.args
b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
index 4989f9ee4a..fd5451ab41 100644
--- a/tests/qemuxml2argvdata/balloon-mmio-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-cpu cortex-a53 \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args
b/tests/qemuxml2argvdata/bios-nvram-secure.args
index c1053b263b..7b9a958536 100644
--- a/tests/qemuxml2argvdata/bios-nvram-secure.args
+++ b/tests/qemuxml2argvdata/bios-nvram-secure.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=test-bios,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes
\
-machine pc-q35-2.5,accel=tcg,usb=off,smm=on,dump-guest-core=off \
-global driver=cfi.pflash01,property=secure,value=on \
-drive file=/usr/share/OVMF/OVMF_CODE.secboot.fd,if=pflash,format=raw,unit=0,readonly=on
\
diff --git a/tests/qemuxml2argvdata/bios-nvram.args
b/tests/qemuxml2argvdata/bios-nvram.args
index e18ba68c3a..36b4a394c4 100644
--- a/tests/qemuxml2argvdata/bios-nvram.args
+++ b/tests/qemuxml2argvdata/bios-nvram.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=test-bios,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
-drive file=/usr/share/OVMF/OVMF_VARS.fd,if=pflash,format=raw,unit=1 \
diff --git a/tests/qemuxml2argvdata/bios.args b/tests/qemuxml2argvdata/bios.args
index ba9297fe12..55e466bac3 100644
--- a/tests/qemuxml2argvdata/bios.args
+++ b/tests/qemuxml2argvdata/bios.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=test-bios,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off,graphics=off \
-bios /usr/share/seabios/bios.bin \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/blkiotune-device.args
b/tests/qemuxml2argvdata/blkiotune-device.args
index 34895f1a70..bf3b69c54e 100644
--- a/tests/qemuxml2argvdata/blkiotune-device.args
+++ b/tests/qemuxml2argvdata/blkiotune-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/blkiotune.args
b/tests/qemuxml2argvdata/blkiotune.args
index 34895f1a70..bf3b69c54e 100644
--- a/tests/qemuxml2argvdata/blkiotune.args
+++ b/tests/qemuxml2argvdata/blkiotune.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/boot-cdrom.args
b/tests/qemuxml2argvdata/boot-cdrom.args
index 431457dead..ec6ddd2857 100644
--- a/tests/qemuxml2argvdata/boot-cdrom.args
+++ b/tests/qemuxml2argvdata/boot-cdrom.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/boot-complex.args
b/tests/qemuxml2argvdata/boot-complex.args
index 0977e8f664..90d3770117 100644
--- a/tests/qemuxml2argvdata/boot-complex.args
+++ b/tests/qemuxml2argvdata/boot-complex.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.args
b/tests/qemuxml2argvdata/boot-floppy-q35.args
index fda0100afd..ef3f9159f1 100644
--- a/tests/qemuxml2argvdata/boot-floppy-q35.args
+++ b/tests/qemuxml2argvdata/boot-floppy-q35.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc-q35-2.4,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/boot-floppy.args
b/tests/qemuxml2argvdata/boot-floppy.args
index 80ffc22e44..57ecd25eb7 100644
--- a/tests/qemuxml2argvdata/boot-floppy.args
+++ b/tests/qemuxml2argvdata/boot-floppy.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
index 5c1c22a0e1..5b1721253c 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args
b/tests/qemuxml2argvdata/boot-menu-disable.args
index 5c1c22a0e1..5b1721253c 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
index 8000fd21e0..516592b1db 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args
b/tests/qemuxml2argvdata/boot-menu-enable.args
index 6568ddebc6..e789f61cdf 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/boot-multi.args
b/tests/qemuxml2argvdata/boot-multi.args
index 6568ddebc6..e789f61cdf 100644
--- a/tests/qemuxml2argvdata/boot-multi.args
+++ b/tests/qemuxml2argvdata/boot-multi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/boot-network.args
b/tests/qemuxml2argvdata/boot-network.args
index c20f343ed5..97fdbc9d3b 100644
--- a/tests/qemuxml2argvdata/boot-network.args
+++ b/tests/qemuxml2argvdata/boot-network.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/boot-order.args
b/tests/qemuxml2argvdata/boot-order.args
index 5f69065c1d..0969ea9bd5 100644
--- a/tests/qemuxml2argvdata/boot-order.args
+++ b/tests/qemuxml2argvdata/boot-order.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/boot-strict.args
b/tests/qemuxml2argvdata/boot-strict.args
index 0977e8f664..90d3770117 100644
--- a/tests/qemuxml2argvdata/boot-strict.args
+++ b/tests/qemuxml2argvdata/boot-strict.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args
b/tests/qemuxml2argvdata/channel-guestfwd.args
index 6a89361336..a8e33d53a9 100644
--- a/tests/qemuxml2argvdata/channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/channel-guestfwd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args
b/tests/qemuxml2argvdata/channel-spicevmc.args
index 844d82beeb..c7288be285 100644
--- a/tests/qemuxml2argvdata/channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/channel-spicevmc.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args
b/tests/qemuxml2argvdata/channel-virtio-auto.args
index 74c1d10eb8..cd085ce22a 100644
--- a/tests/qemuxml2argvdata/channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/channel-virtio-auto.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
index beee5df4bb..2cbc27cb77 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
index 1512212361..090d548542 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args
b/tests/qemuxml2argvdata/channel-virtio-default.args
index 6b56e75b04..31083d69c0 100644
--- a/tests/qemuxml2argvdata/channel-virtio-default.args
+++ b/tests/qemuxml2argvdata/channel-virtio-default.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args
b/tests/qemuxml2argvdata/channel-virtio-state.args
index 0b8b668e0f..ffa4de3f3d 100644
--- a/tests/qemuxml2argvdata/channel-virtio-state.args
+++ b/tests/qemuxml2argvdata/channel-virtio-state.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args
b/tests/qemuxml2argvdata/channel-virtio-unix.args
index f4b9624a4a..084a829c23 100644
--- a/tests/qemuxml2argvdata/channel-virtio-unix.args
+++ b/tests/qemuxml2argvdata/channel-virtio-unix.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/channel-virtio.args
b/tests/qemuxml2argvdata/channel-virtio.args
index bccb6785f6..c845172cd6 100644
--- a/tests/qemuxml2argvdata/channel-virtio.args
+++ b/tests/qemuxml2argvdata/channel-virtio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args
b/tests/qemuxml2argvdata/chardev-reconnect.args
index 51c1c6c2f0..88529f4c26 100644
--- a/tests/qemuxml2argvdata/chardev-reconnect.args
+++ b/tests/qemuxml2argvdata/chardev-reconnect.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/clock-catchup.args
b/tests/qemuxml2argvdata/clock-catchup.args
index 05240e42ac..afc6cd4aa1 100644
--- a/tests/qemuxml2argvdata/clock-catchup.args
+++ b/tests/qemuxml2argvdata/clock-catchup.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/clock-france.args
b/tests/qemuxml2argvdata/clock-france.args
index 4fd26239f7..6bc2154069 100644
--- a/tests/qemuxml2argvdata/clock-france.args
+++ b/tests/qemuxml2argvdata/clock-france.args
@@ -11,6 +11,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args
b/tests/qemuxml2argvdata/clock-hpet-off.args
index 00c8fb2c9f..cf1a583ceb 100644
--- a/tests/qemuxml2argvdata/clock-hpet-off.args
+++ b/tests/qemuxml2argvdata/clock-hpet-off.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
index f52da780ba..c683ee731f 100644
--- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/clock-localtime.args
b/tests/qemuxml2argvdata/clock-localtime.args
index 11eff915f0..4893e9fb79 100644
--- a/tests/qemuxml2argvdata/clock-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/clock-realtime.args
b/tests/qemuxml2argvdata/clock-realtime.args
index 4025597d83..f2bf2c6228 100644
--- a/tests/qemuxml2argvdata/clock-realtime.args
+++ b/tests/qemuxml2argvdata/clock-realtime.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
index 67dd66b9a0..0f1707fd7b 100644
--- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu qemu32,hv-time \
-m 214 \
diff --git a/tests/qemuxml2argvdata/clock-utc.args
b/tests/qemuxml2argvdata/clock-utc.args
index 5498c5c7b7..676c3573a5 100644
--- a/tests/qemuxml2argvdata/clock-utc.args
+++ b/tests/qemuxml2argvdata/clock-utc.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/clock-variable.args
b/tests/qemuxml2argvdata/clock-variable.args
index a2a86d39d0..2b1010ab7a 100644
--- a/tests/qemuxml2argvdata/clock-variable.args
+++ b/tests/qemuxml2argvdata/clock-variable.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/console-compat-auto.args
b/tests/qemuxml2argvdata/console-compat-auto.args
index ce48dde74f..6e7c2f25c0 100644
--- a/tests/qemuxml2argvdata/console-compat-auto.args
+++ b/tests/qemuxml2argvdata/console-compat-auto.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args
b/tests/qemuxml2argvdata/console-compat-chardev.args
index ce48dde74f..6e7c2f25c0 100644
--- a/tests/qemuxml2argvdata/console-compat-chardev.args
+++ b/tests/qemuxml2argvdata/console-compat-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/console-compat.args
b/tests/qemuxml2argvdata/console-compat.args
index 25f617fc8d..c482048e92 100644
--- a/tests/qemuxml2argvdata/console-compat.args
+++ b/tests/qemuxml2argvdata/console-compat.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.args
b/tests/qemuxml2argvdata/console-virtio-ccw.args
index b527c1b7de..5af1839410 100644
--- a/tests/qemuxml2argvdata/console-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/console-virtio-ccw.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/console-virtio-many.args
b/tests/qemuxml2argvdata/console-virtio-many.args
index b968e32914..b5ca7599b7 100644
--- a/tests/qemuxml2argvdata/console-virtio-many.args
+++ b/tests/qemuxml2argvdata/console-virtio-many.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/console-virtio.args
b/tests/qemuxml2argvdata/console-virtio.args
index fac52c0a5c..a9afb4c29a 100644
--- a/tests/qemuxml2argvdata/console-virtio.args
+++ b/tests/qemuxml2argvdata/console-virtio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/controller-order.args
b/tests/qemuxml2argvdata/controller-order.args
index 1bf5febef2..a97fbc7d5d 100644
--- a/tests/qemuxml2argvdata/controller-order.args
+++ b/tests/qemuxml2argvdata/controller-order.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-x86_64 \
-name guest=fdr,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr/master-key.aes \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-m 4096 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
index 8ae6ff36e1..e8d3bbac47 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu Haswell-noTSX \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args
b/tests/qemuxml2argvdata/cpu-Haswell.args
index 6958203d1d..6441a4c1eb 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu Haswell \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args
b/tests/qemuxml2argvdata/cpu-Haswell2.args
index 9ce3f23bdf..ed08de0d72 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell2.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu Haswell,-hle,-rtm \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args
b/tests/qemuxml2argvdata/cpu-Haswell3.args
index 38f8a5070c..110017cf0e 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell3.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell3.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu Haswell,+rtm,+hle \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args
b/tests/qemuxml2argvdata/cpu-cache-disable.args
index f53b00b897..4993191077 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo/master-key.aes \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu host,host-cache-info=off,l3-cache=off \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable2.args
b/tests/qemuxml2argvdata/cpu-cache-disable2.args
index c3a0f4f5d2..dd15a0fd65 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo/master-key.aes \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu host \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args
b/tests/qemuxml2argvdata/cpu-cache-disable3.args
index df21f0f20b..57e5da66ad 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo/master-key.aes \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu
core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,+lahf_lm,l3-cache=off
\
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
index 18acc83045..18fcbbb1f9 100644
--- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo/master-key.aes \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu host,l3-cache=on,host-cache-info=off \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args
b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
index 4fa585e120..7d3a0dbc95 100644
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo/master-key.aes \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu host,host-cache-info=on,l3-cache=off \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
index e9d9ce2667..dce5a8e68e 100644
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo/master-key.aes \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu host,host-cache-info=on \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args
b/tests/qemuxml2argvdata/cpu-check-default-none.args
index c4fa2a86fb..d74e47a51f 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu host \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args
b/tests/qemuxml2argvdata/cpu-check-default-none2.args
index 143079f61d..89d05a6ecd 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-none2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-cpu core2duo \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args
b/tests/qemuxml2argvdata/cpu-check-default-partial.args
index 7cf52c5c08..d1010b1e5d 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-partial.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,+lahf_lm \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args
b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
index 779688f208..ac60a5cdfe 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu core2duo \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-check-none.args
b/tests/qemuxml2argvdata/cpu-check-none.args
index 779688f208..ac60a5cdfe 100644
--- a/tests/qemuxml2argvdata/cpu-check-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-none.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu core2duo \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
index 57c95e04ec..ce4b2e358f 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-cpu qemu32,-kvm_pv_eoi \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
index 82b93ed24f..6e60e11792 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-cpu qemu32,+kvm_pv_eoi \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-exact1.args
b/tests/qemuxml2argvdata/cpu-exact1.args
index 43f1f72d9b..f0498090ed 100644
--- a/tests/qemuxml2argvdata/cpu-exact1.args
+++ b/tests/qemuxml2argvdata/cpu-exact1.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu qemu64,-mca,-pse36,-clflush,-syscall,-nx,-lm,-svm \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
index 6683bfe184..0bb2f4c088 100644
--- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
+++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu
core2duo,+ds,+ht,+tm,+ds_cpl,+xtpr,+3dnowext,+lahf_lm,-nx,-cx16,-tm2,-pbe,-ss,-sse4a,-wdt
\
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-exact2.args
b/tests/qemuxml2argvdata/cpu-exact2.args
index 6683bfe184..0bb2f4c088 100644
--- a/tests/qemuxml2argvdata/cpu-exact2.args
+++ b/tests/qemuxml2argvdata/cpu-exact2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu
core2duo,+ds,+ht,+tm,+ds_cpl,+xtpr,+3dnowext,+lahf_lm,-nx,-cx16,-tm2,-pbe,-ss,-sse4a,-wdt
\
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-fallback.args
b/tests/qemuxml2argvdata/cpu-fallback.args
index 2c68ff0c50..0dbe3bf366 100644
--- a/tests/qemuxml2argvdata/cpu-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-fallback.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu Penryn,-sse4.1,-sse4.2,-popcnt,-aes \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args
b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
index 0efd156e97..63bd54c1b2 100644
--- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu host,-kvmclock \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
index 264bd8007d..ffa9236a47 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-cpu
Haswell,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+dtes64,+monitor,+ds_cpl,+vmx,+smx,+est,+tm2,+xtpr,+pdcm,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm
\
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
index 166e2d6dce..e224f30d84 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-cpu
Penryn,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+monitor,+ds_cpl,+vmx,+est,+tm2,+xtpr,-sse4.1,+cx16,+lahf_lm
\
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args
b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
index 3a65105537..967d74c7c2 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-cpu 'core2duo,vendor=Libvirt
QEMU,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,+lahf_lm' \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-host-model.args
b/tests/qemuxml2argvdata/cpu-host-model.args
index 513d94e846..96fe2f9edb 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine q35,accel=kvm,usb=off,dump-guest-core=off \
-cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,+lahf_lm \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
index c4da30ed83..8c03bd1171 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu host,+abm,+ds,-invtsc \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args
b/tests/qemuxml2argvdata/cpu-host-passthrough.args
index c4fa2a86fb..d74e47a51f 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu host \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.args
b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
index 0ab1b97680..153f0b3ff0 100644
--- a/tests/qemuxml2argvdata/cpu-hotplug-startup.args
+++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args
b/tests/qemuxml2argvdata/cpu-kvmclock.args
index b0254932ea..e12fbbb503 100644
--- a/tests/qemuxml2argvdata/cpu-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-kvmclock.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu core2duo,-kvmclock \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args
b/tests/qemuxml2argvdata/cpu-minimum1.args
index 0a865cd5e2..ff3365b7ff 100644
--- a/tests/qemuxml2argvdata/cpu-minimum1.args
+++ b/tests/qemuxml2argvdata/cpu-minimum1.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,+lahf_lm \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args
b/tests/qemuxml2argvdata/cpu-minimum2.args
index 68be93c24d..7a07bea1b4 100644
--- a/tests/qemuxml2argvdata/cpu-minimum2.args
+++ b/tests/qemuxml2argvdata/cpu-minimum2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu
core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,+lahf_lm,-syscall,-nx,-lm,-svm
\
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args
b/tests/qemuxml2argvdata/cpu-no-removed-features.args
index 779688f208..ac60a5cdfe 100644
--- a/tests/qemuxml2argvdata/cpu-no-removed-features.args
+++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu core2duo \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args
b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
index fc60503e05..5952431a13 100644
--- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args
+++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args
b/tests/qemuxml2argvdata/cpu-numa-memshared.args
index 62a2fb94e7..07fdc9553c 100644
--- a/tests/qemuxml2argvdata/cpu-numa-memshared.args
+++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
index 7e9f431df7..b564d857a5 100644
--- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
+++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/cpu-numa1.args
b/tests/qemuxml2argvdata/cpu-numa1.args
index 7e9f431df7..b564d857a5 100644
--- a/tests/qemuxml2argvdata/cpu-numa1.args
+++ b/tests/qemuxml2argvdata/cpu-numa1.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/cpu-numa2.args
b/tests/qemuxml2argvdata/cpu-numa2.args
index 7e9f431df7..b564d857a5 100644
--- a/tests/qemuxml2argvdata/cpu-numa2.args
+++ b/tests/qemuxml2argvdata/cpu-numa2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/cpu-s390-features.args
b/tests/qemuxml2argvdata/cpu-s390-features.args
index cfdcf9bf0f..c85838c131 100644
--- a/tests/qemuxml2argvdata/cpu-s390-features.args
+++ b/tests/qemuxml2argvdata/cpu-s390-features.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=guest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest1/master-key.aes \
-machine s390-ccw-virtio,accel=kvm,usb=off,dump-guest-core=off \
-cpu zEC12,dfppc=on,stckf=off \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-s390-zEC12.args
b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
index f0e9e41bb7..dd13344433 100644
--- a/tests/qemuxml2argvdata/cpu-s390-zEC12.args
+++ b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=guest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest1/master-key.aes \
-machine s390-ccw-virtio,accel=kvm,usb=off,dump-guest-core=off \
-cpu zEC12 \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-strict1.args
b/tests/qemuxml2argvdata/cpu-strict1.args
index e1b041f22c..fcd159e5fd 100644
--- a/tests/qemuxml2argvdata/cpu-strict1.args
+++ b/tests/qemuxml2argvdata/cpu-strict1.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu
core2duo,+ds,+acpi,+ht,+tm,+ds_cpl,+vmx,+est,+xtpr,+3dnowext,+lahf_lm,-nx,-cx16,-tm2,-pbe,-ss,-sse4a,-wdt
\
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-topology1.args
b/tests/qemuxml2argvdata/cpu-topology1.args
index 91063ed61d..49f0255ce8 100644
--- a/tests/qemuxml2argvdata/cpu-topology1.args
+++ b/tests/qemuxml2argvdata/cpu-topology1.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/cpu-topology2.args
b/tests/qemuxml2argvdata/cpu-topology2.args
index bafaff8e0f..e878b6ab3a 100644
--- a/tests/qemuxml2argvdata/cpu-topology2.args
+++ b/tests/qemuxml2argvdata/cpu-topology2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-cpu core2duo \
-m 214 \
diff --git a/tests/qemuxml2argvdata/cpu-topology3.args
b/tests/qemuxml2argvdata/cpu-topology3.args
index 91063ed61d..49f0255ce8 100644
--- a/tests/qemuxml2argvdata/cpu-topology3.args
+++ b/tests/qemuxml2argvdata/cpu-topology3.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
index d2156c8c7f..3a7d69d6b7 100644
--- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
+++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu
Haswell,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+dtes64,+monitor,+ds_cpl,+vmx,+smx,+est,+tm2,+xtpr,+pdcm,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm,+invtsc,tsc-frequency=4567890000
\
-m 214 \
diff --git a/tests/qemuxml2argvdata/cputune-numatune.args
b/tests/qemuxml2argvdata/cputune-numatune.args
index 88a8a88190..94c8e13e2a 100644
--- a/tests/qemuxml2argvdata/cputune-numatune.args
+++ b/tests/qemuxml2argvdata/cputune-numatune.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=dummy2,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-dummy2/master-key.aes \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-m 128 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args
b/tests/qemuxml2argvdata/cputune-zero-shares.args
index 17e16f41ea..28151f8d88 100644
--- a/tests/qemuxml2argvdata/cputune-zero-shares.args
+++ b/tests/qemuxml2argvdata/cputune-zero-shares.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/cputune.args
index 17e16f41ea..28151f8d88 100644
--- a/tests/qemuxml2argvdata/cputune.args
+++ b/tests/qemuxml2argvdata/cputune.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args
b/tests/qemuxml2argvdata/default-kvm-host-arch.args
index aa159dac4c..42578bb5b2 100644
--- a/tests/qemuxml2argvdata/default-kvm-host-arch.args
+++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=kvm,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-kvm/master-key.aes \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-m 4096 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args
b/tests/qemuxml2argvdata/default-qemu-host-arch.args
index c96564961b..12337f38b3 100644
--- a/tests/qemuxml2argvdata/default-qemu-host-arch.args
+++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=qemu-host,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-qemu-host/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 4096 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-aio.args b/tests/qemuxml2argvdata/disk-aio.args
index 3796344592..ae4cff74d5 100644
--- a/tests/qemuxml2argvdata/disk-aio.args
+++ b/tests/qemuxml2argvdata/disk-aio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-blockio.args
b/tests/qemuxml2argvdata/disk-blockio.args
index c4353c19a9..7b7fc0b822 100644
--- a/tests/qemuxml2argvdata/disk-blockio.args
+++ b/tests/qemuxml2argvdata/disk-blockio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.args
b/tests/qemuxml2argvdata/disk-boot-cdrom.args
index b6fe321071..ad07fbe21f 100644
--- a/tests/qemuxml2argvdata/disk-boot-cdrom.args
+++ b/tests/qemuxml2argvdata/disk-boot-cdrom.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-boot-disk.args
b/tests/qemuxml2argvdata/disk-boot-disk.args
index 3fd91ae2c8..f889e1748e 100644
--- a/tests/qemuxml2argvdata/disk-boot-disk.args
+++ b/tests/qemuxml2argvdata/disk-boot-disk.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.args
b/tests/qemuxml2argvdata/disk-cdrom-network.args
index 951a82e429..ccac24c97d 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-network.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-network.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.args
b/tests/qemuxml2argvdata/disk-cdrom-tray.args
index d097da292b..07db6e00c8 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-tray.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-tray.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test/master-key.aes \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-cdrom.args
b/tests/qemuxml2argvdata/disk-cdrom.args
index 637110e45c..cbb1075a57 100644
--- a/tests/qemuxml2argvdata/disk-cdrom.args
+++ b/tests/qemuxml2argvdata/disk-cdrom.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.args
b/tests/qemuxml2argvdata/disk-copy_on_read.args
index e585358b46..ef676d6358 100644
--- a/tests/qemuxml2argvdata/disk-copy_on_read.args
+++ b/tests/qemuxml2argvdata/disk-copy_on_read.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test/master-key.aes \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-error-policy.args
b/tests/qemuxml2argvdata/disk-error-policy.args
index b5d17352e3..6004e0d697 100644
--- a/tests/qemuxml2argvdata/disk-error-policy.args
+++ b/tests/qemuxml2argvdata/disk-error-policy.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.args
b/tests/qemuxml2argvdata/disk-floppy-tray.args
index c513a11960..2e9a88a031 100644
--- a/tests/qemuxml2argvdata/disk-floppy-tray.args
+++ b/tests/qemuxml2argvdata/disk-floppy-tray.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-floppy.args
b/tests/qemuxml2argvdata/disk-floppy.args
index 1bc2f9417e..ee14ec4c89 100644
--- a/tests/qemuxml2argvdata/disk-floppy.args
+++ b/tests/qemuxml2argvdata/disk-floppy.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.args
b/tests/qemuxml2argvdata/disk-fmt-qcow.args
index 9bde88ead2..aa284c1e15 100644
--- a/tests/qemuxml2argvdata/disk-fmt-qcow.args
+++ b/tests/qemuxml2argvdata/disk-fmt-qcow.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-geometry.args
b/tests/qemuxml2argvdata/disk-geometry.args
index 6be777a0df..e657864647 100644
--- a/tests/qemuxml2argvdata/disk-geometry.args
+++ b/tests/qemuxml2argvdata/disk-geometry.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-ide-split.args
b/tests/qemuxml2argvdata/disk-ide-split.args
index bb164b4c7a..68c6c6200d 100644
--- a/tests/qemuxml2argvdata/disk-ide-split.args
+++ b/tests/qemuxml2argvdata/disk-ide-split.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.args
b/tests/qemuxml2argvdata/disk-ide-wwn.args
index c6f27bca8e..20096e04b8 100644
--- a/tests/qemuxml2argvdata/disk-ide-wwn.args
+++ b/tests/qemuxml2argvdata/disk-ide-wwn.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.args
b/tests/qemuxml2argvdata/disk-ioeventfd.args
index 0326d13c73..8928d43ba9 100644
--- a/tests/qemuxml2argvdata/disk-ioeventfd.args
+++ b/tests/qemuxml2argvdata/disk-ioeventfd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test/master-key.aes \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-iscsi.args
b/tests/qemuxml2argvdata/disk-iscsi.args
index af1788b11a..a0365694e0 100644
--- a/tests/qemuxml2argvdata/disk-iscsi.args
+++ b/tests/qemuxml2argvdata/disk-iscsi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-network-gluster.args
b/tests/qemuxml2argvdata/disk-network-gluster.args
index 00399c5924..2fe2b9fa20 100644
--- a/tests/qemuxml2argvdata/disk-network-gluster.args
+++ b/tests/qemuxml2argvdata/disk-network-gluster.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
index bcf8c153c2..c9060c0db6 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
@@ -30,14 +31,17 @@ QEMU_AUDIO_DRV=none \
-device
virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-drive
file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example,file.lun=1,file.transport=tcp,format=raw,if=none,id=drive-virtio-disk1
\
-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
--drive
file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example:storage,file.lun=1,file.transport=tcp,file.user=myname,file.password-secret=AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A,format=raw,if=none,id=drive-virtio-disk2
\
+-object
secret,id=virtio-disk2-auth-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
+-drive
file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example:storage,file.lun=1,file.transport=tcp,file.user=myname,file.password-secret=virtio-disk2-auth-secret0,format=raw,if=none,id=drive-virtio-disk2
\
-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,id=virtio-disk2 \
--drive
file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example:storage,file.lun=2,file.transport=tcp,file.user=myname,file.password-secret=AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A,format=raw,if=none,id=drive-virtio-disk3
\
+-object
secret,id=virtio-disk3-auth-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
+-drive
file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example:storage,file.lun=2,file.transport=tcp,file.user=myname,file.password-secret=virtio-disk3-auth-secret0,format=raw,if=none,id=drive-virtio-disk3
\
-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,id=virtio-disk3 \
-drive
file.driver=iscsi,file.portal=example.org:3260,file.target=iqn.1992-01.com.example,file.lun=0,file.transport=tcp,format=raw,if=none,id=drive-scsi0-0-0-0
\
-device
scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \
-drive
file.driver=iscsi,file.portal=example.org:3260,file.target=iqn.1992-01.com.example:server,file.lun=0,file.transport=tcp,file.initiator-name=iqn.1992-01.com.example:client,format=raw,if=none,id=drive-scsi0-0-0-1
\
-device
scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=1,drive=drive-scsi0-0-0-1,id=scsi0-0-0-1 \
--drive
file.driver=iscsi,file.portal=example.org:3260,file.target=iqn.1992-01.com.example:server,file.lun=0,file.transport=tcp,file.user=myname,file.password-secret=AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A,file.initiator-name=iqn.1992-01.com.example:client,format=raw,if=none,id=drive-scsi0-0-0-2
\
+-object
secret,id=scsi0-0-0-2-auth-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
+-drive
file.driver=iscsi,file.portal=example.org:3260,file.target=iqn.1992-01.com.example:server,file.lun=0,file.transport=tcp,file.user=myname,file.password-secret=scsi0-0-0-2-auth-secret0,file.initiator-name=iqn.1992-01.com.example:client,format=raw,if=none,id=drive-scsi0-0-0-2
\
-device
scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=2,drive=drive-scsi0-0-0-2,id=scsi0-0-0-2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.args
b/tests/qemuxml2argvdata/disk-network-iscsi.args
index 276afefc4d..4e6d920c88 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-network-nbd.args
b/tests/qemuxml2argvdata/disk-network-nbd.args
index e3d9f3e328..d25a7dcfcd 100644
--- a/tests/qemuxml2argvdata/disk-network-nbd.args
+++ b/tests/qemuxml2argvdata/disk-network-nbd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.args
b/tests/qemuxml2argvdata/disk-network-sheepdog.args
index 27a3b5b076..ee27a562f4 100644
--- a/tests/qemuxml2argvdata/disk-network-sheepdog.args
+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.args
b/tests/qemuxml2argvdata/disk-network-source-auth.args
index b461ba5b9e..9c58a9c8c0 100644
--- a/tests/qemuxml2argvdata/disk-network-source-auth.args
+++ b/tests/qemuxml2argvdata/disk-network-source-auth.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
@@ -27,8 +28,10 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive
file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=none,id=drive-virtio-disk0
\
-device
virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--drive
'file=rbd:pool/image:id=myname:key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,id=drive-virtio-disk1'
\
+-object
secret,id=virtio-disk1-auth-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
+-drive
'file=rbd:pool/image:id=myname:auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,file.password-secret=virtio-disk1-auth-secret0,format=raw,if=none,id=drive-virtio-disk1'
\
-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,id=virtio-disk1 \
--drive
'file=rbd:pool/image2:id=myname:key=QVFDVm41aE82SHpGQWhBQXEwTkN2OGp0SmNJY0UrSE9CbE1RMUE=:auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,format=raw,if=none,id=drive-virtio-disk2'
\
+-object
secret,id=virtio-disk2-auth-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
+-drive
'file=rbd:pool/image2:id=myname:auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,file.password-secret=virtio-disk2-auth-secret0,format=raw,if=none,id=drive-virtio-disk2'
\
-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,id=virtio-disk2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-network-vxhs.args
b/tests/qemuxml2argvdata/disk-network-vxhs.args
index 6cbb38cab1..d376318b98 100644
--- a/tests/qemuxml2argvdata/disk-network-vxhs.args
+++ b/tests/qemuxml2argvdata/disk-network-vxhs.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-cpu qemu32 \
-m 214 \
diff --git a/tests/qemuxml2argvdata/disk-no-boot.args
b/tests/qemuxml2argvdata/disk-no-boot.args
index d7829f612d..2c0bca03a5 100644
--- a/tests/qemuxml2argvdata/disk-no-boot.args
+++ b/tests/qemuxml2argvdata/disk-no-boot.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-order.args
b/tests/qemuxml2argvdata/disk-order.args
index a4f9cd563e..89d06cc8b1 100644
--- a/tests/qemuxml2argvdata/disk-order.args
+++ b/tests/qemuxml2argvdata/disk-order.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.args
b/tests/qemuxml2argvdata/disk-readonly-disk.args
index d61d349d33..4dc2f301ff 100644
--- a/tests/qemuxml2argvdata/disk-readonly-disk.args
+++ b/tests/qemuxml2argvdata/disk-readonly-disk.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-sata-device.args
b/tests/qemuxml2argvdata/disk-sata-device.args
index 6d504ac06b..64d1f8d3cf 100644
--- a/tests/qemuxml2argvdata/disk-sata-device.args
+++ b/tests/qemuxml2argvdata/disk-sata-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.args
b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
index 4a94918621..86d0b33f33 100644
--- a/tests/qemuxml2argvdata/disk-scsi-disk-split.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
index 7c161dca7b..ba3989c96f 100644
--- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
index 42a1ce7658..f1c428bbc7 100644
--- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
index cc8ccba930..0652c0be0f 100644
--- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
+++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-serial.args
b/tests/qemuxml2argvdata/disk-serial.args
index e2a75e376f..c68fb2ac72 100644
--- a/tests/qemuxml2argvdata/disk-serial.args
+++ b/tests/qemuxml2argvdata/disk-serial.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-snapshot.args
b/tests/qemuxml2argvdata/disk-snapshot.args
index de075dfeb5..08f7679b7b 100644
--- a/tests/qemuxml2argvdata/disk-snapshot.args
+++ b/tests/qemuxml2argvdata/disk-snapshot.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.args
b/tests/qemuxml2argvdata/disk-source-pool-mode.args
index 524c20e71d..d78637613e 100644
--- a/tests/qemuxml2argvdata/disk-source-pool-mode.args
+++ b/tests/qemuxml2argvdata/disk-source-pool-mode.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-source-pool.args
b/tests/qemuxml2argvdata/disk-source-pool.args
index e03a042fd1..fe97765783 100644
--- a/tests/qemuxml2argvdata/disk-source-pool.args
+++ b/tests/qemuxml2argvdata/disk-source-pool.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.args
b/tests/qemuxml2argvdata/disk-usb-device-removable.args
index 3e9dbf0a62..33229a5662 100644
--- a/tests/qemuxml2argvdata/disk-usb-device-removable.args
+++ b/tests/qemuxml2argvdata/disk-usb-device-removable.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-usb-device.args
b/tests/qemuxml2argvdata/disk-usb-device.args
index e1a1564b6d..5c5403daba 100644
--- a/tests/qemuxml2argvdata/disk-usb-device.args
+++ b/tests/qemuxml2argvdata/disk-usb-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
b/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
index 543782a561..6932f29a18 100644
--- a/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
+++ b/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw.args
b/tests/qemuxml2argvdata/disk-virtio-ccw.args
index 6ccf6c8bd5..1794560190 100644
--- a/tests/qemuxml2argvdata/disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/disk-virtio-ccw.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
index da3fe3aa93..bdec1f752c 100644
--- a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
+++ b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/disk-virtio.args
b/tests/qemuxml2argvdata/disk-virtio.args
index 50e062a258..fef4e3f34e 100644
--- a/tests/qemuxml2argvdata/disk-virtio.args
+++ b/tests/qemuxml2argvdata/disk-virtio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/event_idx.args
b/tests/qemuxml2argvdata/event_idx.args
index 1147798786..3c568e8354 100644
--- a/tests/qemuxml2argvdata/event_idx.args
+++ b/tests/qemuxml2argvdata/event_idx.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test/master-key.aes \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
index 6592d4d70b..86b09534b2 100644
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=instance-00000092,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-instance-00000092/master-key.aes
\
-machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \
-m 14336 \
-mem-prealloc \
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
index e990490df5..f2e0941500 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=instance-00000092,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-instance-00000092/master-key.aes
\
-machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \
-m 14336 \
-mem-prealloc \
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
index 1630ef45ab..e04d814302 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=instance-00000092,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-instance-00000092/master-key.aes
\
-machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \
-m 28672 \
-mem-prealloc \
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
index 4b69654096..497eabe58d 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=instance-00000092,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-instance-00000092/master-key.aes
\
-machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \
-m 43008 \
-mem-prealloc \
diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.args
b/tests/qemuxml2argvdata/floppy-drive-fat.args
index 42ccab52ce..75ae7ee959 100644
--- a/tests/qemuxml2argvdata/floppy-drive-fat.args
+++ b/tests/qemuxml2argvdata/floppy-drive-fat.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/fs9p-ccw.args b/tests/qemuxml2argvdata/fs9p-ccw.args
index 2211dd775f..9cc700e0ce 100644
--- a/tests/qemuxml2argvdata/fs9p-ccw.args
+++ b/tests/qemuxml2argvdata/fs9p-ccw.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/fs9p.args b/tests/qemuxml2argvdata/fs9p.args
index 5ff9dfcec4..a138c5f53c 100644
--- a/tests/qemuxml2argvdata/fs9p.args
+++ b/tests/qemuxml2argvdata/fs9p.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args
b/tests/qemuxml2argvdata/graphics-egl-headless.args
index 7d9cfcace0..84a25bbe8f 100644
--- a/tests/qemuxml2argvdata/graphics-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless.args
@@ -9,6 +9,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
index fd626bd8df..ddf8d0af20 100644
--- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
+++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
@@ -11,6 +11,7 @@ DISPLAY=:0.1 \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-sdl.args
b/tests/qemuxml2argvdata/graphics-sdl.args
index 48fa126136..86f05f6fed 100644
--- a/tests/qemuxml2argvdata/graphics-sdl.args
+++ b/tests/qemuxml2argvdata/graphics-sdl.args
@@ -11,6 +11,7 @@ DISPLAY=:0.1 \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
index ec3f5326cf..a40ecdfb64 100644
--- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
+++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
index 09fab18d91..af80edd5c6 100644
--- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
+++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
index be502f064e..51d8ce8aa3 100644
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
index be502f064e..51d8ce8aa3 100644
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.args
b/tests/qemuxml2argvdata/graphics-spice-compression.args
index 6f1a30305f..4f939a7f08 100644
--- a/tests/qemuxml2argvdata/graphics-spice-compression.args
+++ b/tests/qemuxml2argvdata/graphics-spice-compression.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
index 151c2bbf12..9410251dfc 100644
--- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.args
b/tests/qemuxml2argvdata/graphics-spice-no-args.args
index ee85b07956..32da9284f8 100644
--- a/tests/qemuxml2argvdata/graphics-spice-no-args.args
+++ b/tests/qemuxml2argvdata/graphics-spice-no-args.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
index 3f69461202..b3c5395835 100644
--- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
+++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args
b/tests/qemuxml2argvdata/graphics-spice-sasl.args
index aae9382991..b95381ae1e 100644
--- a/tests/qemuxml2argvdata/graphics-spice-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-spice-sasl.args
@@ -11,6 +11,7 @@ SASL_CONF_PATH=/root/.sasl2 \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.args
b/tests/qemuxml2argvdata/graphics-spice-socket.args
index c7ecae5566..4e09935a69 100644
--- a/tests/qemuxml2argvdata/graphics-spice-socket.args
+++ b/tests/qemuxml2argvdata/graphics-spice-socket.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args
b/tests/qemuxml2argvdata/graphics-spice-timeout.args
index 9d81e94529..61d986b2e6 100644
--- a/tests/qemuxml2argvdata/graphics-spice-timeout.args
+++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=f14,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-f14/master-key.aes \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,+lahf_lm \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
index e38bae4e46..06fa89b8f0 100644
--- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
+++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-spice.args
b/tests/qemuxml2argvdata/graphics-spice.args
index d2cfe513c3..dd715c8ef4 100644
--- a/tests/qemuxml2argvdata/graphics-spice.args
+++ b/tests/qemuxml2argvdata/graphics-spice.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
index 2cce3b7e1c..c0ff5b80fc 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
index 0a6f28b7da..fbbba9b0f4 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
index dad8d0e568..72443b3ef4 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
index 166179a4d4..bd39da09c7 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.args
b/tests/qemuxml2argvdata/graphics-vnc-none.args
index 5899549838..766b8943cd 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-none.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-none.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.args
b/tests/qemuxml2argvdata/graphics-vnc-policy.args
index 65acad3d2b..090b94878a 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-policy.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-policy.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
index fc43310731..22bcf33fcd 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.args
b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
index 13d4e087fc..fd1ce48ab5 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
@@ -11,6 +11,7 @@ SASL_CONF_PATH=/root/.sasl2 \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
index 992aff75e0..8ebf57fd09 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.args
b/tests/qemuxml2argvdata/graphics-vnc-socket.args
index 16a0f0bb7a..c40c289ccd 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.args
b/tests/qemuxml2argvdata/graphics-vnc-tls.args
index aa525e828d..34559c0d25 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.args
@@ -11,6 +11,7 @@ SASL_CONF_PATH=/root/.sasl2 \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.args
b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
index 3b9a2fa846..ba963db2d4 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-websocket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/graphics-vnc.args
b/tests/qemuxml2argvdata/graphics-vnc.args
index 166179a4d4..bd39da09c7 100644
--- a/tests/qemuxml2argvdata/graphics-vnc.args
+++ b/tests/qemuxml2argvdata/graphics-vnc.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
index b2794d64b0..c1c5c15293 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.args
b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
index b495b2bfe1..65709cf3d7 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address-device.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
index fb86e819e3..781203fc0e 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=delete,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-delete/master-key.aes \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-m 256 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.args
b/tests/qemuxml2argvdata/hostdev-pci-address.args
index 7e207ff19a..ce1d55a648 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
index 50327805b7..91503cb564 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=delete,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-delete/master-key.aes \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-m 256 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
index 8c369c1c9d..8f04e0b053 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest2,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes
\
-machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
index c2f57af0cf..5ada09fe40 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
index d49d43c8b9..e1b1a385ae 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes
\
-machine pc-q35-2.7,accel=kvm,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
index 4136d1d0ff..83efc7a6b4 100644
--- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
index 5a0cfaf95f..0af2dd5f03 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.args
b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
index 8ce179a225..32e00d01de 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.args
b/tests/qemuxml2argvdata/hostdev-usb-address.args
index ee9632314e..ac4c99950e 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
index ed6beb1d40..dbbe98781d 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
index ce6fff263b..cbb5d89a0a 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
index d2417f5c27..59a568556e 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
index b9b1bad515..4afa4a60aa 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
index a82ee00d6f..237da72c38 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
index a18d3d2dcf..a9d5d693a1 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=KVMGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-KVMGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=kvm,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
index 172931dc33..7b182f522b 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
index ae5dfb5c4f..5da883ffea 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args
b/tests/qemuxml2argvdata/hostdev-vfio.args
index b78ad10b99..e59f972a77 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hotplug-base.args
b/tests/qemuxml2argvdata/hotplug-base.args
index f8b67d3996..815acdf35e 100644
--- a/tests/qemuxml2argvdata/hotplug-base.args
+++ b/tests/qemuxml2argvdata/hotplug-base.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=hotplug,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-hotplug/master-key.aes \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-m 4096 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.args
b/tests/qemuxml2argvdata/hugepages-default-2M.args
index 8176b7c3a3..c369c3765e 100644
--- a/tests/qemuxml2argvdata/hugepages-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=SomeDummyHugepagesGuest,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-SomeDummyHugepagesGu/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-mem-prealloc \
diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.args
b/tests/qemuxml2argvdata/hugepages-default-system-size.args
index f95f32d2b1..f77ac9f2b7 100644
--- a/tests/qemuxml2argvdata/hugepages-default-system-size.args
+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=SomeDummyHugepagesGuest,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-SomeDummyHugepagesGu/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hugepages-default.args
b/tests/qemuxml2argvdata/hugepages-default.args
index 6b728fc937..6313425b64 100644
--- a/tests/qemuxml2argvdata/hugepages-default.args
+++ b/tests/qemuxml2argvdata/hugepages-default.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-mem-prealloc \
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args
b/tests/qemuxml2argvdata/hugepages-memaccess.args
index 47bbdbaceb..e02b8e479c 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m size=4194304k,slots=16,maxmem=8388608k \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args
b/tests/qemuxml2argvdata/hugepages-memaccess2.args
index 9dbb480302..9a1795c8b1 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess2.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m size=4194304k,slots=16,maxmem=8388608k \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.args
b/tests/qemuxml2argvdata/hugepages-nodeset.args
index 8176b7c3a3..c369c3765e 100644
--- a/tests/qemuxml2argvdata/hugepages-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-nodeset.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=SomeDummyHugepagesGuest,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-SomeDummyHugepagesGu/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-mem-prealloc \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
index 3b68039b0e..a406049689 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=SomeDummyHugepagesGuest,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-SomeDummyHugepagesGu/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
index 5a788724fc..30170860be 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=fedora,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fedora/master-key.aes \
-machine pc-i440fx-2.3,accel=tcg,usb=off,dump-guest-core=off \
-m size=1048576k,slots=16,maxmem=1099511627776k \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.args
b/tests/qemuxml2argvdata/hugepages-numa-default.args
index 44e99904f9..28b0941f89 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=fedora,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fedora/master-key.aes \
-machine pc-i440fx-2.3,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
index a90f4f2cce..a4d485ee68 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=SomeDummyHugepagesGuest,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-SomeDummyHugepagesGu/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
index 32819f0368..2ee8f52a77 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 4096 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/hugepages-shared.args
b/tests/qemuxml2argvdata/hugepages-shared.args
index 0630995483..7a14617aa8 100644
--- a/tests/qemuxml2argvdata/hugepages-shared.args
+++ b/tests/qemuxml2argvdata/hugepages-shared.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 4096 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args
b/tests/qemuxml2argvdata/input-usbmouse-addr.args
index 8780fd7a4a..66beb4af09 100644
--- a/tests/qemuxml2argvdata/input-usbmouse-addr.args
+++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/input-usbmouse.args
b/tests/qemuxml2argvdata/input-usbmouse.args
index 2c89720027..e66087dc84 100644
--- a/tests/qemuxml2argvdata/input-usbmouse.args
+++ b/tests/qemuxml2argvdata/input-usbmouse.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/input-usbtablet.args
b/tests/qemuxml2argvdata/input-usbtablet.args
index bc5c2080f7..07b9288bc6 100644
--- a/tests/qemuxml2argvdata/input-usbtablet.args
+++ b/tests/qemuxml2argvdata/input-usbtablet.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/input-virtio-ccw.args
b/tests/qemuxml2argvdata/input-virtio-ccw.args
index 40dbd932c7..4ce990522d 100644
--- a/tests/qemuxml2argvdata/input-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/input-virtio-ccw.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
index 3112c2e9f5..7d5efa5aa3 100644
--- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/iothreads-disk.args
b/tests/qemuxml2argvdata/iothreads-disk.args
index ebb1213132..a8992bc82a 100644
--- a/tests/qemuxml2argvdata/iothreads-disk.args
+++ b/tests/qemuxml2argvdata/iothreads-disk.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.args
b/tests/qemuxml2argvdata/iothreads-ids-partial.args
index 3735943164..d23b5ac53b 100644
--- a/tests/qemuxml2argvdata/iothreads-ids-partial.args
+++ b/tests/qemuxml2argvdata/iothreads-ids-partial.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/iothreads-ids.args
b/tests/qemuxml2argvdata/iothreads-ids.args
index 0f61daccbe..2d63bd0c02 100644
--- a/tests/qemuxml2argvdata/iothreads-ids.args
+++ b/tests/qemuxml2argvdata/iothreads-ids.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/iothreads.args
b/tests/qemuxml2argvdata/iothreads.args
index ed3d70b23e..6d739bbc49 100644
--- a/tests/qemuxml2argvdata/iothreads.args
+++ b/tests/qemuxml2argvdata/iothreads.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/kvm-features-off.args
b/tests/qemuxml2argvdata/kvm-features-off.args
index 6d0cf13817..f6f13495e6 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.args
+++ b/tests/qemuxml2argvdata/kvm-features-off.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/kvm-features.args
b/tests/qemuxml2argvdata/kvm-features.args
index 7fff1ddda2..00c8c93439 100644
--- a/tests/qemuxml2argvdata/kvm-features.args
+++ b/tests/qemuxml2argvdata/kvm-features.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu host,kvm=off,kvm-hint-dedicated=on,kvm-poll-control=on \
-m 214 \
diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args
b/tests/qemuxml2argvdata/kvm-pit-delay.args
index 0167c62268..16b2895abc 100644
--- a/tests/qemuxml2argvdata/kvm-pit-delay.args
+++ b/tests/qemuxml2argvdata/kvm-pit-delay.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args
b/tests/qemuxml2argvdata/kvm-pit-discard.args
index cd345f6af6..b7b2ef51c7 100644
--- a/tests/qemuxml2argvdata/kvm-pit-discard.args
+++ b/tests/qemuxml2argvdata/kvm-pit-discard.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args
index 4ebb09347a..174cc7ad07 100644
--- a/tests/qemuxml2argvdata/kvmclock.args
+++ b/tests/qemuxml2argvdata/kvmclock.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu qemu32,-kvmclock \
-m 214 \
diff --git a/tests/qemuxml2argvdata/mach-virt-console-virtio.args
b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
index bae141e6c0..68b9f39d99 100644
--- a/tests/qemuxml2argvdata/mach-virt-console-virtio.args
+++ b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-native.args
b/tests/qemuxml2argvdata/mach-virt-serial-native.args
index 884b4389aa..50f7b8ded1 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-native.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-native.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-pci.args
b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
index 002b6573fa..c7b12375b0 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-pci.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-usb.args
b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
index 905feca3b9..77490c1427 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-usb.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
index 4d1109fd34..9f0aeb3f58 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,aes-key-wrap=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
index 4d1109fd34..9f0aeb3f58 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,aes-key-wrap=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
index 7d1f3129f3..b157cf8b74 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,aes-key-wrap=on \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
index 7d1f3129f3..b157cf8b74 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,aes-key-wrap=on \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-aliases1.args
b/tests/qemuxml2argvdata/machine-aliases1.args
index 630e0708e1..858f1aafd6 100644
--- a/tests/qemuxml2argvdata/machine-aliases1.args
+++ b/tests/qemuxml2argvdata/machine-aliases1.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-aliases2.args
b/tests/qemuxml2argvdata/machine-aliases2.args
index d088bd0f6c..a4c8fa7183 100644
--- a/tests/qemuxml2argvdata/machine-aliases2.args
+++ b/tests/qemuxml2argvdata/machine-aliases2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-core-off.args
b/tests/qemuxml2argvdata/machine-core-off.args
index 5498c5c7b7..676c3573a5 100644
--- a/tests/qemuxml2argvdata/machine-core-off.args
+++ b/tests/qemuxml2argvdata/machine-core-off.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-core-on.args
b/tests/qemuxml2argvdata/machine-core-on.args
index 0fe8747aec..568b2f29f9 100644
--- a/tests/qemuxml2argvdata/machine-core-on.args
+++ b/tests/qemuxml2argvdata/machine-core-on.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=on \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
index 87881903a5..cb077d027a 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,dea-key-wrap=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
index 87881903a5..cb077d027a 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,dea-key-wrap=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
index b18eb1c9bf..17b09bcbe2 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,dea-key-wrap=on \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
index b18eb1c9bf..17b09bcbe2 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,dea-key-wrap=on \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
index 1f99518c39..8f659d095c 100644
--- a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
+++ b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.args
b/tests/qemuxml2argvdata/machine-keywrap-none.args
index 1f99518c39..8f659d095c 100644
--- a/tests/qemuxml2argvdata/machine-keywrap-none.args
+++ b/tests/qemuxml2argvdata/machine-keywrap-none.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
index c132e55eaa..68470173fb 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,loadparm=SYSTEM1 \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
index 0e57d5260e..13e099bb80 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,loadparm=2 \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390.args
b/tests/qemuxml2argvdata/machine-loadparm-s390.args
index 26fc85d875..4bd577b16c 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-s390.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,loadparm=2 \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-smm-opt.args
b/tests/qemuxml2argvdata/machine-smm-opt.args
index 8f01ccc0b5..eda178beb4 100644
--- a/tests/qemuxml2argvdata/machine-smm-opt.args
+++ b/tests/qemuxml2argvdata/machine-smm-opt.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine q35,accel=tcg,usb=off,smm=on,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args
b/tests/qemuxml2argvdata/machine-vmport-opt.args
index 38e1927e4f..7f58a294e3 100644
--- a/tests/qemuxml2argvdata/machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,vmport=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
index 80a0ed5165..86231f9e12 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m size=219136k,slots=16,maxmem=1099511627776k \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
index 9fe6c71a8a..463f31053c 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m size=219136k,slots=16,maxmem=1099511627776k \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
index 7ee96f47db..41da472077 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
-m size=1048576k,slots=16,maxmem=1099511627776k \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
index 7ee96f47db..41da472077 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
-m size=1048576k,slots=16,maxmem=1099511627776k \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
index 08eb024fe3..f9e0e0b564 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=kvm,usb=off,dump-guest-core=off \
-m size=1048576k,slots=16,maxmem=4194304k \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
index d9a0afd702..5958fbd82f 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=kvm,usb=off,dump-guest-core=off \
-m size=1310720k,slots=16,maxmem=4194304k \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/memory-hotplug.args
b/tests/qemuxml2argvdata/memory-hotplug.args
index 3f08f69358..35be0b67e1 100644
--- a/tests/qemuxml2argvdata/memory-hotplug.args
+++ b/tests/qemuxml2argvdata/memory-hotplug.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m size=219136k,slots=16,maxmem=1099511627776k \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args
b/tests/qemuxml2argvdata/memtune-unlimited.args
index 34895f1a70..bf3b69c54e 100644
--- a/tests/qemuxml2argvdata/memtune-unlimited.args
+++ b/tests/qemuxml2argvdata/memtune-unlimited.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args
index 34895f1a70..bf3b69c54e 100644
--- a/tests/qemuxml2argvdata/memtune.args
+++ b/tests/qemuxml2argvdata/memtune.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.args
b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
index 35826f400a..6d4c9767f1 100644
--- a/tests/qemuxml2argvdata/migrate-numa-unaligned.args
+++ b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 14338 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/migrate.args
index 97b688ec09..68773f83b0 100644
--- a/tests/qemuxml2argvdata/migrate.args
+++ b/tests/qemuxml2argvdata/migrate.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args
index 34895f1a70..bf3b69c54e 100644
--- a/tests/qemuxml2argvdata/minimal.args
+++ b/tests/qemuxml2argvdata/minimal.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/misc-acpi.args
b/tests/qemuxml2argvdata/misc-acpi.args
index 1c354ebbce..f3d6ecddeb 100644
--- a/tests/qemuxml2argvdata/misc-acpi.args
+++ b/tests/qemuxml2argvdata/misc-acpi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args
b/tests/qemuxml2argvdata/misc-disable-s3.args
index 92984bba76..3b8eed6545 100644
--- a/tests/qemuxml2argvdata/misc-disable-s3.args
+++ b/tests/qemuxml2argvdata/misc-disable-s3.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args
b/tests/qemuxml2argvdata/misc-disable-suspends.args
index 13642a25b5..cb3fa6b1bc 100644
--- a/tests/qemuxml2argvdata/misc-disable-suspends.args
+++ b/tests/qemuxml2argvdata/misc-disable-suspends.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args
b/tests/qemuxml2argvdata/misc-enable-s4.args
index 039dd63609..a9b0c7a01e 100644
--- a/tests/qemuxml2argvdata/misc-enable-s4.args
+++ b/tests/qemuxml2argvdata/misc-enable-s4.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/misc-no-reboot.args
b/tests/qemuxml2argvdata/misc-no-reboot.args
index fbf9bba921..54ae04a480 100644
--- a/tests/qemuxml2argvdata/misc-no-reboot.args
+++ b/tests/qemuxml2argvdata/misc-no-reboot.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/misc-uuid.args
b/tests/qemuxml2argvdata/misc-uuid.args
index 1c354ebbce..f3d6ecddeb 100644
--- a/tests/qemuxml2argvdata/misc-uuid.args
+++ b/tests/qemuxml2argvdata/misc-uuid.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/monitor-json.args
b/tests/qemuxml2argvdata/monitor-json.args
index ae6829ba73..c81e72711f 100644
--- a/tests/qemuxml2argvdata/monitor-json.args
+++ b/tests/qemuxml2argvdata/monitor-json.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=encryptdisk,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args
b/tests/qemuxml2argvdata/multifunction-pci-device.args
index d03aa53c67..80fd184ccd 100644
--- a/tests/qemuxml2argvdata/multifunction-pci-device.args
+++ b/tests/qemuxml2argvdata/multifunction-pci-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-client.args
b/tests/qemuxml2argvdata/net-client.args
index 2d91d978e0..1e7e76080d 100644
--- a/tests/qemuxml2argvdata/net-client.args
+++ b/tests/qemuxml2argvdata/net-client.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args
b/tests/qemuxml2argvdata/net-eth-hostip.args
index 51a50259c1..8ea1da558e 100644
--- a/tests/qemuxml2argvdata/net-eth-hostip.args
+++ b/tests/qemuxml2argvdata/net-eth-hostip.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args
b/tests/qemuxml2argvdata/net-eth-ifname.args
index 51a50259c1..8ea1da558e 100644
--- a/tests/qemuxml2argvdata/net-eth-ifname.args
+++ b/tests/qemuxml2argvdata/net-eth-ifname.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-eth-names.args
b/tests/qemuxml2argvdata/net-eth-names.args
index 2369d494b4..d41e468704 100644
--- a/tests/qemuxml2argvdata/net-eth-names.args
+++ b/tests/qemuxml2argvdata/net-eth-names.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
index 948746f07c..4aa643f1e0 100644
--- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
+++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/net-eth.args
index 51a50259c1..8ea1da558e 100644
--- a/tests/qemuxml2argvdata/net-eth.args
+++ b/tests/qemuxml2argvdata/net-eth.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
index 187be11892..8a2de12511 100644
--- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
index e711d47138..04ad6de4ca 100644
--- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
index 685c38675a..4ca077682f 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args
b/tests/qemuxml2argvdata/net-hostdev-vfio.args
index cc071b64dc..efee69b9e8 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-hostdev.args
b/tests/qemuxml2argvdata/net-hostdev.args
index 5679cd7623..4692d5b36e 100644
--- a/tests/qemuxml2argvdata/net-hostdev.args
+++ b/tests/qemuxml2argvdata/net-hostdev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-many-models.args
b/tests/qemuxml2argvdata/net-many-models.args
index c16260f38d..36c3d9162f 100644
--- a/tests/qemuxml2argvdata/net-many-models.args
+++ b/tests/qemuxml2argvdata/net-many-models.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-mcast.args
b/tests/qemuxml2argvdata/net-mcast.args
index a9b4801a02..8b04aafb8f 100644
--- a/tests/qemuxml2argvdata/net-mcast.args
+++ b/tests/qemuxml2argvdata/net-mcast.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-server.args
b/tests/qemuxml2argvdata/net-server.args
index f382eaf8c7..9b4354a6cf 100644
--- a/tests/qemuxml2argvdata/net-server.args
+++ b/tests/qemuxml2argvdata/net-server.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/net-udp.args
index a4e12daf16..83bc4e1ece 100644
--- a/tests/qemuxml2argvdata/net-udp.args
+++ b/tests/qemuxml2argvdata/net-udp.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-user-addr.args
b/tests/qemuxml2argvdata/net-user-addr.args
index 9bc7053cf0..8e21e023fb 100644
--- a/tests/qemuxml2argvdata/net-user-addr.args
+++ b/tests/qemuxml2argvdata/net-user-addr.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/net-user.args
index f127fa5285..f4eb8f93c4 100644
--- a/tests/qemuxml2argvdata/net-user.args
+++ b/tests/qemuxml2argvdata/net-user.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
index 2b76f64821..33addf8802 100644
--- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
+++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-vhostuser.args
b/tests/qemuxml2argvdata/net-vhostuser.args
index 92c8347662..517e95a515 100644
--- a/tests/qemuxml2argvdata/net-vhostuser.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.args
b/tests/qemuxml2argvdata/net-virtio-ccw.args
index 573475dbf3..76ceaef6cf 100644
--- a/tests/qemuxml2argvdata/net-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/net-virtio-ccw.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-virtio-device.args
b/tests/qemuxml2argvdata/net-virtio-device.args
index f8a8970f97..a52cf0429f 100644
--- a/tests/qemuxml2argvdata/net-virtio-device.args
+++ b/tests/qemuxml2argvdata/net-virtio-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
index 3ddfe258b2..64313f878d 100644
--- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
+++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args
b/tests/qemuxml2argvdata/net-virtio-netdev.args
index 7962a89c7f..c8516dc648 100644
--- a/tests/qemuxml2argvdata/net-virtio-netdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-netdev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
index a922d23efd..0e98be7236 100644
--- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
+++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
index c65ead25cc..0efa7f7d50 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.args
b/tests/qemuxml2argvdata/net-virtio-teaming.args
index da1a276767..bde442221c 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/net-virtio.args
b/tests/qemuxml2argvdata/net-virtio.args
index 483cc0bcea..d7cdee28cf 100644
--- a/tests/qemuxml2argvdata/net-virtio.args
+++ b/tests/qemuxml2argvdata/net-virtio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/nosharepages.args
b/tests/qemuxml2argvdata/nosharepages.args
index 87e27927a8..87afac9ad9 100644
--- a/tests/qemuxml2argvdata/nosharepages.args
+++ b/tests/qemuxml2argvdata/nosharepages.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off,mem-merge=off \
-m 215 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
index 17e16f41ea..28151f8d88 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
index 17e16f41ea..28151f8d88 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
index 17e16f41ea..28151f8d88 100644
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
index 17e16f41ea..28151f8d88 100644
--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
+++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args
index 17e16f41ea..28151f8d88 100644
--- a/tests/qemuxml2argvdata/numad.args
+++ b/tests/qemuxml2argvdata/numad.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
index 17e16f41ea..28151f8d88 100644
--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
+++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.args
b/tests/qemuxml2argvdata/numatune-auto-prefer.args
index f23786895b..0e4301cc84 100644
--- a/tests/qemuxml2argvdata/numatune-auto-prefer.args
+++ b/tests/qemuxml2argvdata/numatune-auto-prefer.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 64 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/numatune-distances.args
b/tests/qemuxml2argvdata/numatune-distances.args
index 3da36e5484..9bd4e27b11 100644
--- a/tests/qemuxml2argvdata/numatune-distances.args
+++ b/tests/qemuxml2argvdata/numatune-distances.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 12288 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
index 9adfceb13c..74a045582a 100644
--- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 64 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/numatune-memnode.args
b/tests/qemuxml2argvdata/numatune-memnode.args
index 5243c7919a..8389070ab3 100644
--- a/tests/qemuxml2argvdata/numatune-memnode.args
+++ b/tests/qemuxml2argvdata/numatune-memnode.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 24105 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/numatune-memory.args
b/tests/qemuxml2argvdata/numatune-memory.args
index 17e16f41ea..28151f8d88 100644
--- a/tests/qemuxml2argvdata/numatune-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memory.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/numatune-no-vcpu.args
b/tests/qemuxml2argvdata/numatune-no-vcpu.args
index c286c6237a..9212c7bf42 100644
--- a/tests/qemuxml2argvdata/numatune-no-vcpu.args
+++ b/tests/qemuxml2argvdata/numatune-no-vcpu.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 12288 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args
b/tests/qemuxml2argvdata/pages-dimm-discard.args
index e777eeb266..68a263d3eb 100644
--- a/tests/qemuxml2argvdata/pages-dimm-discard.args
+++ b/tests/qemuxml2argvdata/pages-dimm-discard.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=fedora,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fedora/master-key.aes \
-machine pc-i440fx-2.3,accel=tcg,usb=off,dump-guest-core=off \
-m size=1048576k,slots=16,maxmem=1099511627776k \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.args
b/tests/qemuxml2argvdata/pages-discard-hugepages.args
index 3b68039b0e..a406049689 100644
--- a/tests/qemuxml2argvdata/pages-discard-hugepages.args
+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=SomeDummyHugepagesGuest,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-SomeDummyHugepagesGu/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pages-discard.args
b/tests/qemuxml2argvdata/pages-discard.args
index 3f89d66776..7a8ca0a96c 100644
--- a/tests/qemuxml2argvdata/pages-discard.args
+++ b/tests/qemuxml2argvdata/pages-discard.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 4096 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/panic-double.args
b/tests/qemuxml2argvdata/panic-double.args
index 8fcc0e9571..9457d267d7 100644
--- a/tests/qemuxml2argvdata/panic-double.args
+++ b/tests/qemuxml2argvdata/panic-double.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-cpu qemu32,hv-crash \
-m 214 \
diff --git a/tests/qemuxml2argvdata/panic-no-address.args
b/tests/qemuxml2argvdata/panic-no-address.args
index c9002d73b1..ed8df3d22a 100644
--- a/tests/qemuxml2argvdata/panic-no-address.args
+++ b/tests/qemuxml2argvdata/panic-no-address.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/panic.args b/tests/qemuxml2argvdata/panic.args
index d125f5287f..83b7d30820 100644
--- a/tests/qemuxml2argvdata/panic.args
+++ b/tests/qemuxml2argvdata/panic.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args
b/tests/qemuxml2argvdata/parallel-parport-chardev.args
index ea701c3739..18e53cf18c 100644
--- a/tests/qemuxml2argvdata/parallel-parport-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
index aaa32437e5..d2b8388d53 100644
--- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args
b/tests/qemuxml2argvdata/pci-autoadd-addr.args
index 88d69bcb05..87f1ce09d3 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-addr.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=fdr-br,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \
-machine pc-1.2,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args
b/tests/qemuxml2argvdata/pci-autoadd-idx.args
index f55830a082..82a2e5b694 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-idx.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=fdr-br,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \
-machine pc-1.2,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args
b/tests/qemuxml2argvdata/pci-autofill-addr.args
index 3ac2bdf523..bc266696ad 100644
--- a/tests/qemuxml2argvdata/pci-autofill-addr.args
+++ b/tests/qemuxml2argvdata/pci-autofill-addr.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=fdr-br,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \
-machine pc-1.2,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
index 5f42211d01..eec754d2ae 100644
--- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
+++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=lots-of-disks,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-lots-of-disks/master-key.aes \
-machine pc-i440fx-1.4,accel=tcg,usb=off,dump-guest-core=off \
-cpu qemu64,-kvmclock \
-bios /usr/share/seabios/bios.bin \
diff --git a/tests/qemuxml2argvdata/pci-bridge.args
b/tests/qemuxml2argvdata/pci-bridge.args
index c2e28d64d4..531c200c81 100644
--- a/tests/qemuxml2argvdata/pci-bridge.args
+++ b/tests/qemuxml2argvdata/pci-bridge.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=fdr-br,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \
-machine pc-1.2,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args
b/tests/qemuxml2argvdata/pci-expander-bus.args
index 08ac1a8bc5..c740efb1ee 100644
--- a/tests/qemuxml2argvdata/pci-expander-bus.args
+++ b/tests/qemuxml2argvdata/pci-expander-bus.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=expander-test,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-expander-test/master-key.aes \
-machine pc-i440fx-2.5,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args
index e97cfd61aa..33408852e3 100644
--- a/tests/qemuxml2argvdata/pci-many.args
+++ b/tests/qemuxml2argvdata/pci-many.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=fdr-br,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-fdr-br/master-key.aes \
-machine pc-1.2,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args
b/tests/qemuxml2argvdata/pci-rom-disabled.args
index e67342c15b..202d2d316a 100644
--- a/tests/qemuxml2argvdata/pci-rom-disabled.args
+++ b/tests/qemuxml2argvdata/pci-rom-disabled.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args
index 95755eb3cf..22bd7f2e67 100644
--- a/tests/qemuxml2argvdata/pci-rom.args
+++ b/tests/qemuxml2argvdata/pci-rom.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
index 4370955e2d..7d5b2e85e4 100644
--- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args
b/tests/qemuxml2argvdata/pcie-expander-bus.args
index abe3675cfa..9cd3d93f3c 100644
--- a/tests/qemuxml2argvdata/pcie-expander-bus.args
+++ b/tests/qemuxml2argvdata/pcie-expander-bus.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=pcie-expander-bus-test,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-pcie-expander-bus-te/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
index 665f0e92ec..dabdefdf20 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
index a2a8cbcb76..7a47183bd1 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pcie-root-port.args
b/tests/qemuxml2argvdata/pcie-root-port.args
index 9c11c3e515..0785bc5bd7 100644
--- a/tests/qemuxml2argvdata/pcie-root-port.args
+++ b/tests/qemuxml2argvdata/pcie-root-port.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pcie-root.args
b/tests/qemuxml2argvdata/pcie-root.args
index ceb430b9e8..5f76d5c171 100644
--- a/tests/qemuxml2argvdata/pcie-root.args
+++ b/tests/qemuxml2argvdata/pcie-root.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
index 0dd8e084b2..9becddc068 100644
--- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
index 91f69f47b1..49b2e63773 100644
--- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args
b/tests/qemuxml2argvdata/pcihole64-q35.args
index 03257d4d40..30004826aa 100644
--- a/tests/qemuxml2argvdata/pcihole64-q35.args
+++ b/tests/qemuxml2argvdata/pcihole64-q35.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pcihole64.args
b/tests/qemuxml2argvdata/pcihole64.args
index 8d34b0b020..5ccc7bccef 100644
--- a/tests/qemuxml2argvdata/pcihole64.args
+++ b/tests/qemuxml2argvdata/pcihole64.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo/master-key.aes \
-machine pc-1.2,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args
b/tests/qemuxml2argvdata/pmu-feature-off.args
index cd77cf3983..cc2ee2acc2 100644
--- a/tests/qemuxml2argvdata/pmu-feature-off.args
+++ b/tests/qemuxml2argvdata/pmu-feature-off.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-cpu qemu32,pmu=off \
-m 214 \
diff --git a/tests/qemuxml2argvdata/pmu-feature.args
b/tests/qemuxml2argvdata/pmu-feature.args
index 396c6553e8..dea803e968 100644
--- a/tests/qemuxml2argvdata/pmu-feature.args
+++ b/tests/qemuxml2argvdata/pmu-feature.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-cpu qemu32,pmu=on \
-m 214 \
diff --git a/tests/qemuxml2argvdata/ppc-dtb.args b/tests/qemuxml2argvdata/ppc-dtb.args
index 6c91ca58f9..e38ef8e650 100644
--- a/tests/qemuxml2argvdata/ppc-dtb.args
+++ b/tests/qemuxml2argvdata/ppc-dtb.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine ppce500,accel=kvm,usb=off,dump-guest-core=off \
-m 256 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
index c80f5e0491..083769e94a 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 256 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
index e7180983ed..ef08c17a05 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 256 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller.args
b/tests/qemuxml2argvdata/ppc64-usb-controller.args
index d1610e7e11..1c4e630cba 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 256 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/ppce500-serial.args
b/tests/qemuxml2argvdata/ppce500-serial.args
index 8d2530bc54..e3de32f83d 100644
--- a/tests/qemuxml2argvdata/ppce500-serial.args
+++ b/tests/qemuxml2argvdata/ppce500-serial.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine ppce500,accel=kvm,usb=off,dump-guest-core=off \
-m 256 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-basic.args
b/tests/qemuxml2argvdata/pseries-basic.args
index 6f99f1c544..241850399f 100644
--- a/tests/qemuxml2argvdata/pseries-basic.args
+++ b/tests/qemuxml2argvdata/pseries-basic.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-console-virtio.args
b/tests/qemuxml2argvdata/pseries-console-virtio.args
index 2a49796b64..ed4e96e0b9 100644
--- a/tests/qemuxml2argvdata/pseries-console-virtio.args
+++ b/tests/qemuxml2argvdata/pseries-console-virtio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
index e8421d6875..29dd9bc29e 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=kvm,usb=off,dump-guest-core=off,max-cpu-compat=power9 \
-cpu host \
-m 256 \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat.args
b/tests/qemuxml2argvdata/pseries-cpu-compat.args
index 884f75f4f0..c54088c505 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-compat.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=kvm,usb=off,dump-guest-core=off,max-cpu-compat=power7 \
-cpu host \
-m 256 \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-exact.args
b/tests/qemuxml2argvdata/pseries-cpu-exact.args
index 8b698edc5f..1d11f5fa93 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-exact.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-exact.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-cpu POWER7 \
-m 512 \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-le.args
b/tests/qemuxml2argvdata/pseries-cpu-le.args
index dfcc69d234..1247f3af8e 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-le.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-le.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=kvm,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-features.args
b/tests/qemuxml2argvdata/pseries-features.args
index defb5e2f39..689652f83f 100644
--- a/tests/qemuxml2argvdata/pseries-features.args
+++ b/tests/qemuxml2argvdata/pseries-features.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine
pseries,accel=tcg,usb=off,dump-guest-core=off,resize-hpt=required,cap-hpt-max-page-size=1048576k,cap-htm=on,cap-nested-hv=off,cap-ccf-assist=on,cap-cfpc=fixed,cap-sbbc=broken,cap-ibs=fixed-ccd
\
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-1.args
b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
index 5f7c8360bb..4409125393 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-1.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-2.args
b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
index e63b229533..2d46febd38 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-2.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-3.args
b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
index 8ba58fd147..a02234b9b0 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-3.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
index b44889a951..ed09cec43b 100644
--- a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
+++ b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=kvm,usb=off,dump-guest-core=off,max-cpu-compat=power7 \
-cpu host \
-m 256 \
diff --git a/tests/qemuxml2argvdata/pseries-many-buses-1.args
b/tests/qemuxml2argvdata/pseries-many-buses-1.args
index a1776b0c2e..bf29671985 100644
--- a/tests/qemuxml2argvdata/pseries-many-buses-1.args
+++ b/tests/qemuxml2argvdata/pseries-many-buses-1.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-many-buses-2.args
b/tests/qemuxml2argvdata/pseries-many-buses-2.args
index 23c59e7633..aaffd1c1a1 100644
--- a/tests/qemuxml2argvdata/pseries-many-buses-2.args
+++ b/tests/qemuxml2argvdata/pseries-many-buses-2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-many-devices.args
b/tests/qemuxml2argvdata/pseries-many-devices.args
index 134e2d8be1..7cc437c84b 100644
--- a/tests/qemuxml2argvdata/pseries-many-devices.args
+++ b/tests/qemuxml2argvdata/pseries-many-devices.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-nvram.args
b/tests/qemuxml2argvdata/pseries-nvram.args
index 38df986d3a..3c1867ea91 100644
--- a/tests/qemuxml2argvdata/pseries-nvram.args
+++ b/tests/qemuxml2argvdata/pseries-nvram.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-panic-missing.args
b/tests/qemuxml2argvdata/pseries-panic-missing.args
index 6f99f1c544..241850399f 100644
--- a/tests/qemuxml2argvdata/pseries-panic-missing.args
+++ b/tests/qemuxml2argvdata/pseries-panic-missing.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-panic-no-address.args
b/tests/qemuxml2argvdata/pseries-panic-no-address.args
index 6f99f1c544..241850399f 100644
--- a/tests/qemuxml2argvdata/pseries-panic-no-address.args
+++ b/tests/qemuxml2argvdata/pseries-panic-no-address.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-phb-default-missing.args
b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
index 37368cbe9c..316fc07bfb 100644
--- a/tests/qemuxml2argvdata/pseries-phb-default-missing.args
+++ b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.args
b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
index e203f2e90e..432ba16bd2 100644
--- a/tests/qemuxml2argvdata/pseries-phb-numa-node.args
+++ b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-phb-simple.args
b/tests/qemuxml2argvdata/pseries-phb-simple.args
index 37368cbe9c..316fc07bfb 100644
--- a/tests/qemuxml2argvdata/pseries-phb-simple.args
+++ b/tests/qemuxml2argvdata/pseries-phb-simple.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-serial-native.args
b/tests/qemuxml2argvdata/pseries-serial-native.args
index dc50f0a00e..9c2e3c156a 100644
--- a/tests/qemuxml2argvdata/pseries-serial-native.args
+++ b/tests/qemuxml2argvdata/pseries-serial-native.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-serial-pci.args
b/tests/qemuxml2argvdata/pseries-serial-pci.args
index a8d01b002e..643b861c7f 100644
--- a/tests/qemuxml2argvdata/pseries-serial-pci.args
+++ b/tests/qemuxml2argvdata/pseries-serial-pci.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-serial-usb.args
b/tests/qemuxml2argvdata/pseries-serial-usb.args
index cd6e47363e..297f0928c4 100644
--- a/tests/qemuxml2argvdata/pseries-serial-usb.args
+++ b/tests/qemuxml2argvdata/pseries-serial-usb.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-usb-default.args
b/tests/qemuxml2argvdata/pseries-usb-default.args
index 1810baf83a..b3b57320c5 100644
--- a/tests/qemuxml2argvdata/pseries-usb-default.args
+++ b/tests/qemuxml2argvdata/pseries-usb-default.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-usb-kbd.args
b/tests/qemuxml2argvdata/pseries-usb-kbd.args
index 5fde085de8..7e0623eef8 100644
--- a/tests/qemuxml2argvdata/pseries-usb-kbd.args
+++ b/tests/qemuxml2argvdata/pseries-usb-kbd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-usb-multi.args
b/tests/qemuxml2argvdata/pseries-usb-multi.args
index 77bb8538b0..2d4ef84838 100644
--- a/tests/qemuxml2argvdata/pseries-usb-multi.args
+++ b/tests/qemuxml2argvdata/pseries-usb-multi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
index 35ad8a7c66..5295cfaca4 100644
--- a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
+++ b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/pseries-vio.args
b/tests/qemuxml2argvdata/pseries-vio.args
index 2c1c4e0f8b..f179e89cd2 100644
--- a/tests/qemuxml2argvdata/pseries-vio.args
+++ b/tests/qemuxml2argvdata/pseries-vio.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-m 512 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/q35-acpi-nouefi.args
b/tests/qemuxml2argvdata/q35-acpi-nouefi.args
index e8bfdd3c57..956ee3b6b7 100644
--- a/tests/qemuxml2argvdata/q35-acpi-nouefi.args
+++ b/tests/qemuxml2argvdata/q35-acpi-nouefi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-cpu Haswell \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.args
b/tests/qemuxml2argvdata/q35-acpi-uefi.args
index 2c01a8eb6c..272369de22 100644
--- a/tests/qemuxml2argvdata/q35-acpi-uefi.args
+++ b/tests/qemuxml2argvdata/q35-acpi-uefi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-cpu Haswell \
-drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.args
b/tests/qemuxml2argvdata/q35-default-devices-only.args
index 0a16e8c5a6..696f37cc4e 100644
--- a/tests/qemuxml2argvdata/q35-default-devices-only.args
+++ b/tests/qemuxml2argvdata/q35-default-devices-only.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/q35-multifunction.args
b/tests/qemuxml2argvdata/q35-multifunction.args
index 92a346f61f..c065de9455 100644
--- a/tests/qemuxml2argvdata/q35-multifunction.args
+++ b/tests/qemuxml2argvdata/q35-multifunction.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
index 9886d0406d..c6cffeea89 100644
--- a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
+++ b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=guest,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-cpu Haswell \
-m 1024 \
diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args
b/tests/qemuxml2argvdata/q35-pci-force-address.args
index 27a731b26a..fc6f182c1f 100644
--- a/tests/qemuxml2argvdata/q35-pci-force-address.args
+++ b/tests/qemuxml2argvdata/q35-pci-force-address.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.args
b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
index a39a63b0d0..1113eecc42 100644
--- a/tests/qemuxml2argvdata/q35-pcie-autoadd.args
+++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/q35-pcie.args b/tests/qemuxml2argvdata/q35-pcie.args
index 4c07563457..4c4a716417 100644
--- a/tests/qemuxml2argvdata/q35-pcie.args
+++ b/tests/qemuxml2argvdata/q35-pcie.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
index c9d4fa7d1b..5b35c49a5c 100644
--- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35/master-key.aes \
-machine pc-q35-2.5,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args
b/tests/qemuxml2argvdata/q35-pm-disable.args
index b8acbcc053..380988992c 100644
--- a/tests/qemuxml2argvdata/q35-pm-disable.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35/master-key.aes \
-machine pc-q35-2.5,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args
b/tests/qemuxml2argvdata/q35-usb2-multi.args
index 2d847da079..78b47b6961 100644
--- a/tests/qemuxml2argvdata/q35-usb2-multi.args
+++ b/tests/qemuxml2argvdata/q35-usb2-multi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args
b/tests/qemuxml2argvdata/q35-usb2-reorder.args
index a6cfb4465d..5b9e55ec4e 100644
--- a/tests/qemuxml2argvdata/q35-usb2-reorder.args
+++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args
index 77807d8189..be18020314 100644
--- a/tests/qemuxml2argvdata/q35-usb2.args
+++ b/tests/qemuxml2argvdata/q35-usb2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
index f448e4219d..19a134919c 100644
--- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-x86_64 \
-name guest=virt-manager-basic,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-virt-manager-basic/master-key.aes
\
-machine pc-q35-2.7,accel=kvm,usb=off,vmport=off,dump-guest-core=off \
-m 4096 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.args
b/tests/qemuxml2argvdata/q35-virtio-pci.args
index 8f81d21bc0..94da3660b5 100644
--- a/tests/qemuxml2argvdata/q35-virtio-pci.args
+++ b/tests/qemuxml2argvdata/q35-virtio-pci.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args
index e9b1060d18..664ba0e284 100644
--- a/tests/qemuxml2argvdata/q35.args
+++ b/tests/qemuxml2argvdata/q35.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args
b/tests/qemuxml2argvdata/qemu-ns-alt.args
index 8cb2611b82..e637e99373 100644
--- a/tests/qemuxml2argvdata/qemu-ns-alt.args
+++ b/tests/qemuxml2argvdata/qemu-ns-alt.args
@@ -12,6 +12,7 @@ BAR='' \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
index dcbbe84ea4..cd07321885 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
index dcbbe84ea4..cd07321885 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args
b/tests/qemuxml2argvdata/qemu-ns-commandline.args
index dcbbe84ea4..cd07321885 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
index dcbbe84ea4..cd07321885 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
index dcbbe84ea4..cd07321885 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
index dcbbe84ea4..cd07321885 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args
b/tests/qemuxml2argvdata/qemu-ns-no-env.args
index 9833bda423..5b826265e3 100644
--- a/tests/qemuxml2argvdata/qemu-ns-no-env.args
+++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
index 5018828b48..e8cbd53cf4 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
index 98a2c323fc..c1286f1094 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args
b/tests/qemuxml2argvdata/restore-v2-fd.args
index 9468513cdd..12cca8bacb 100644
--- a/tests/qemuxml2argvdata/restore-v2-fd.args
+++ b/tests/qemuxml2argvdata/restore-v2-fd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/restore-v2.args
b/tests/qemuxml2argvdata/restore-v2.args
index e149ce2015..cef447e10e 100644
--- a/tests/qemuxml2argvdata/restore-v2.args
+++ b/tests/qemuxml2argvdata/restore-v2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.args
b/tests/qemuxml2argvdata/riscv64-virt-pci.args
index 63fb11004a..e9a32b896c 100644
--- a/tests/qemuxml2argvdata/riscv64-virt-pci.args
+++ b/tests/qemuxml2argvdata/riscv64-virt-pci.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-riscv64 \
-name guest=riscv64,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-riscv64/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/riscv64-virt.args
b/tests/qemuxml2argvdata/riscv64-virt.args
index 4b630cc58f..5f029a8f90 100644
--- a/tests/qemuxml2argvdata/riscv64-virt.args
+++ b/tests/qemuxml2argvdata/riscv64-virt.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-riscv64 \
-name guest=riscv64,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-riscv64/master-key.aes \
-machine virt,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/s390-panic-missing.args
b/tests/qemuxml2argvdata/s390-panic-missing.args
index 2ae8240458..be0873ced9 100644
--- a/tests/qemuxml2argvdata/s390-panic-missing.args
+++ b/tests/qemuxml2argvdata/s390-panic-missing.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 256 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/s390-panic-no-address.args
b/tests/qemuxml2argvdata/s390-panic-no-address.args
index 71b4020186..aff872f8e3 100644
--- a/tests/qemuxml2argvdata/s390-panic-no-address.args
+++ b/tests/qemuxml2argvdata/s390-panic-no-address.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 256 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/s390-serial-2.args
b/tests/qemuxml2argvdata/s390-serial-2.args
index 62c71b1fd5..5c5f9be324 100644
--- a/tests/qemuxml2argvdata/s390-serial-2.args
+++ b/tests/qemuxml2argvdata/s390-serial-2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/s390-serial-console.args
b/tests/qemuxml2argvdata/s390-serial-console.args
index af9a799d85..5dae118539 100644
--- a/tests/qemuxml2argvdata/s390-serial-console.args
+++ b/tests/qemuxml2argvdata/s390-serial-console.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/s390-serial.args
b/tests/qemuxml2argvdata/s390-serial.args
index af9a799d85..5dae118539 100644
--- a/tests/qemuxml2argvdata/s390-serial.args
+++ b/tests/qemuxml2argvdata/s390-serial.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args
b/tests/qemuxml2argvdata/seclabel-dac-none.args
index 34895f1a70..bf3b69c54e 100644
--- a/tests/qemuxml2argvdata/seclabel-dac-none.args
+++ b/tests/qemuxml2argvdata/seclabel-dac-none.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
index 34895f1a70..bf3b69c54e 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
index 34895f1a70..bf3b69c54e 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
index f9125b25ba..a68a54eea8 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
index 34895f1a70..bf3b69c54e 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args
b/tests/qemuxml2argvdata/seclabel-dynamic.args
index 34895f1a70..bf3b69c54e 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/seclabel-none.args
b/tests/qemuxml2argvdata/seclabel-none.args
index 34895f1a70..bf3b69c54e 100644
--- a/tests/qemuxml2argvdata/seclabel-none.args
+++ b/tests/qemuxml2argvdata/seclabel-none.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
index 34895f1a70..bf3b69c54e 100644
--- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args
b/tests/qemuxml2argvdata/seclabel-static-relabel.args
index 34895f1a70..bf3b69c54e 100644
--- a/tests/qemuxml2argvdata/seclabel-static-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/seclabel-static.args
b/tests/qemuxml2argvdata/seclabel-static.args
index 34895f1a70..bf3b69c54e 100644
--- a/tests/qemuxml2argvdata/seclabel-static.args
+++ b/tests/qemuxml2argvdata/seclabel-static.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
index 22238c042b..ecaa342a26 100644
--- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args
b/tests/qemuxml2argvdata/serial-dev-chardev.args
index b391f6cdc9..650a5054e1 100644
--- a/tests/qemuxml2argvdata/serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args
b/tests/qemuxml2argvdata/serial-file-chardev.args
index d1c6ea19d1..56a9c180cd 100644
--- a/tests/qemuxml2argvdata/serial-file-chardev.args
+++ b/tests/qemuxml2argvdata/serial-file-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/serial-file-log.args
b/tests/qemuxml2argvdata/serial-file-log.args
index a995a5cd39..38a60eea16 100644
--- a/tests/qemuxml2argvdata/serial-file-log.args
+++ b/tests/qemuxml2argvdata/serial-file-log.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args
b/tests/qemuxml2argvdata/serial-many-chardev.args
index 030dd96cae..9d4be75148 100644
--- a/tests/qemuxml2argvdata/serial-many-chardev.args
+++ b/tests/qemuxml2argvdata/serial-many-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args
b/tests/qemuxml2argvdata/serial-pty-chardev.args
index ce48dde74f..6e7c2f25c0 100644
--- a/tests/qemuxml2argvdata/serial-pty-chardev.args
+++ b/tests/qemuxml2argvdata/serial-pty-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.args
b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
index 34895f1a70..bf3b69c54e 100644
--- a/tests/qemuxml2argvdata/serial-spiceport-nospice.args
+++ b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/serial-spiceport.args
b/tests/qemuxml2argvdata/serial-spiceport.args
index 287e683af3..adc518365e 100644
--- a/tests/qemuxml2argvdata/serial-spiceport.args
+++ b/tests/qemuxml2argvdata/serial-spiceport.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-chardev.args
index a411c4b4a5..730cc263cb 100644
--- a/tests/qemuxml2argvdata/serial-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
index efab1dce27..492e9fa943 100644
--- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
index 8e4fce1f78..c092de3a40 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
index 8f1560e0f9..90011f5ed0 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
index 8f1560e0f9..90011f5ed0 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args
b/tests/qemuxml2argvdata/serial-udp-chardev.args
index af4a347ef9..87ab1a23a5 100644
--- a/tests/qemuxml2argvdata/serial-udp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-udp-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args
b/tests/qemuxml2argvdata/serial-unix-chardev.args
index eb779fbe40..9b6d8ec9c5 100644
--- a/tests/qemuxml2argvdata/serial-unix-chardev.args
+++ b/tests/qemuxml2argvdata/serial-unix-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args
b/tests/qemuxml2argvdata/serial-vc-chardev.args
index 458b61e396..8b5efe7e16 100644
--- a/tests/qemuxml2argvdata/serial-vc-chardev.args
+++ b/tests/qemuxml2argvdata/serial-vc-chardev.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
index 59252a65cc..5e2fa9748e 100644
--- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
+++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/shmem.args b/tests/qemuxml2argvdata/shmem.args
index b6e986d25e..1da3538635 100644
--- a/tests/qemuxml2argvdata/shmem.args
+++ b/tests/qemuxml2argvdata/shmem.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/smartcard-controller.args
b/tests/qemuxml2argvdata/smartcard-controller.args
index edb20b7f8f..c430a5cbb1 100644
--- a/tests/qemuxml2argvdata/smartcard-controller.args
+++ b/tests/qemuxml2argvdata/smartcard-controller.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
index 1df8f0fd0d..68ef1d8c23 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args
b/tests/qemuxml2argvdata/smartcard-host-certificates.args
index 48544e8692..778f7f7a52 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/smartcard-host.args
b/tests/qemuxml2argvdata/smartcard-host.args
index edb20b7f8f..c430a5cbb1 100644
--- a/tests/qemuxml2argvdata/smartcard-host.args
+++ b/tests/qemuxml2argvdata/smartcard-host.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
index 52be7b407a..9bc7eee379 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
index d717cd1a11..fed815fae1 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.args
b/tests/qemuxml2argvdata/smbios-type-fwcfg.args
index 0a610de10d..0a14295c87 100644
--- a/tests/qemuxml2argvdata/smbios-type-fwcfg.args
+++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args
index 0cab82d29b..81cab55d38 100644
--- a/tests/qemuxml2argvdata/smbios.args
+++ b/tests/qemuxml2argvdata/smbios.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/smp-dies.args
index 3cbd328d01..1ba31f7625 100644
--- a/tests/qemuxml2argvdata/smp-dies.args
+++ b/tests/qemuxml2argvdata/smp-dies.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args
index 0f45f05c39..8b27be6161 100644
--- a/tests/qemuxml2argvdata/smp.args
+++ b/tests/qemuxml2argvdata/smp.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/sound-device.args
b/tests/qemuxml2argvdata/sound-device.args
index 6a6b6f01da..dcf69ce4f9 100644
--- a/tests/qemuxml2argvdata/sound-device.args
+++ b/tests/qemuxml2argvdata/sound-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/sound.args b/tests/qemuxml2argvdata/sound.args
index 62d53627f5..cc155b8439 100644
--- a/tests/qemuxml2argvdata/sound.args
+++ b/tests/qemuxml2argvdata/sound.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/sparc-minimal.args
b/tests/qemuxml2argvdata/sparc-minimal.args
index 143375043b..e454495efb 100644
--- a/tests/qemuxml2argvdata/sparc-minimal.args
+++ b/tests/qemuxml2argvdata/sparc-minimal.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-sparc \
-name guest=redhat62sparc,debug-threads=on \
-S \
+-object
secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-redhat62sparc/master-key.aes \
-machine SS-5,accel=tcg,usb=off,dump-guest-core=off \
-m 500 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args
b/tests/qemuxml2argvdata/usb-controller-default-q35.args
index 9ffc6ab5e5..89970b4e65 100644
--- a/tests/qemuxml2argvdata/usb-controller-default-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
index cb32b341e2..a919366da9 100644
--- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes
\
-machine q35,accel=tcg,usb=off,dump-guest-core=off \
-m 2048 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
index ed0487a84e..b7c4d770a0 100644
--- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args
b/tests/qemuxml2argvdata/usb-controller-xhci.args
index 9b84c4ed0a..46d956e0c7 100644
--- a/tests/qemuxml2argvdata/usb-controller-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-xhci.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-controller.args
b/tests/qemuxml2argvdata/usb-controller.args
index ef6b82f8e6..457e24f41c 100644
--- a/tests/qemuxml2argvdata/usb-controller.args
+++ b/tests/qemuxml2argvdata/usb-controller.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
index 69d4d1b014..ff5a256be6 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args
b/tests/qemuxml2argvdata/usb-hub-autoadd.args
index fc498d7bdb..636180e491 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args
index 0d3f13396c..b83f2f0cac 100644
--- a/tests/qemuxml2argvdata/usb-hub.args
+++ b/tests/qemuxml2argvdata/usb-hub.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
index 7c2a2325b3..9bc10165a2 100644
--- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args
b/tests/qemuxml2argvdata/usb-ich9-companion.args
index 9ab8a7a4d7..cdb7ee44c6 100644
--- a/tests/qemuxml2argvdata/usb-ich9-companion.args
+++ b/tests/qemuxml2argvdata/usb-ich9-companion.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
index f76d1f6f76..44f7298031 100644
--- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
+++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args
b/tests/qemuxml2argvdata/usb-long-port-path.args
index 5e5e588e01..0927603a07 100644
--- a/tests/qemuxml2argvdata/usb-long-port-path.args
+++ b/tests/qemuxml2argvdata/usb-long-port-path.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.args
index 82b72ea57b..d3b0574f5b 100644
--- a/tests/qemuxml2argvdata/usb-none.args
+++ b/tests/qemuxml2argvdata/usb-none.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args
b/tests/qemuxml2argvdata/usb-piix3-controller.args
index 4609816cd1..24946a447a 100644
--- a/tests/qemuxml2argvdata/usb-piix3-controller.args
+++ b/tests/qemuxml2argvdata/usb-piix3-controller.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args
b/tests/qemuxml2argvdata/usb-port-autoassign.args
index 47999bf1ad..9097d1ff47 100644
--- a/tests/qemuxml2argvdata/usb-port-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-port-autoassign.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-port-missing.args
b/tests/qemuxml2argvdata/usb-port-missing.args
index cdae771500..bdda86857b 100644
--- a/tests/qemuxml2argvdata/usb-port-missing.args
+++ b/tests/qemuxml2argvdata/usb-port-missing.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-ports.args
b/tests/qemuxml2argvdata/usb-ports.args
index 2aae99e62d..7d001cf78e 100644
--- a/tests/qemuxml2argvdata/usb-ports.args
+++ b/tests/qemuxml2argvdata/usb-ports.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args
b/tests/qemuxml2argvdata/usb-redir-boot.args
index 5fe01243ab..35d00d8daa 100644
--- a/tests/qemuxml2argvdata/usb-redir-boot.args
+++ b/tests/qemuxml2argvdata/usb-redir-boot.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args
b/tests/qemuxml2argvdata/usb-redir-filter-version.args
index da2c47fc67..9c136c1cb6 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter-version.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args
b/tests/qemuxml2argvdata/usb-redir-filter.args
index 1cc639f055..6f0d503bfe 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-redir.args
b/tests/qemuxml2argvdata/usb-redir.args
index b70bddbea4..7490122e55 100644
--- a/tests/qemuxml2argvdata/usb-redir.args
+++ b/tests/qemuxml2argvdata/usb-redir.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
index f8307b4539..015c25e27b 100644
--- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/usb1-usb2.args
b/tests/qemuxml2argvdata/usb1-usb2.args
index 79276979e9..bb21fec681 100644
--- a/tests/qemuxml2argvdata/usb1-usb2.args
+++ b/tests/qemuxml2argvdata/usb1-usb2.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/user-aliases-usb.args
b/tests/qemuxml2argvdata/user-aliases-usb.args
index 411e3197a5..59cdc5fc8e 100644
--- a/tests/qemuxml2argvdata/user-aliases-usb.args
+++ b/tests/qemuxml2argvdata/user-aliases-usb.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=gentoo,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-gentoo/master-key.aes \
-machine pc-i440fx-1.4,accel=kvm,usb=off,dump-guest-core=off \
-m 4096 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.args
b/tests/qemuxml2argvdata/vcpu-placement-static.args
index 220c3e104e..4b4274926d 100644
--- a/tests/qemuxml2argvdata/vcpu-placement-static.args
+++ b/tests/qemuxml2argvdata/vcpu-placement-static.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=dummy2,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-dummy2/master-key.aes \
-machine pc-q35-2.3,accel=kvm,usb=off,dump-guest-core=off \
-m 128 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
index 8bf469d6e9..f346eb721c 100644
--- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
+++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-none-device.args
b/tests/qemuxml2argvdata/video-none-device.args
index edccd80eb7..aa316e95d0 100644
--- a/tests/qemuxml2argvdata/video-none-device.args
+++ b/tests/qemuxml2argvdata/video-none-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
index 06c90adf83..d4bdeb070b 100644
--- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-qxl-device.args
b/tests/qemuxml2argvdata/video-qxl-device.args
index d92362d997..e0cc8fcd32 100644
--- a/tests/qemuxml2argvdata/video-qxl-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args
b/tests/qemuxml2argvdata/video-qxl-heads.args
index c7a31438e2..1b3945381c 100644
--- a/tests/qemuxml2argvdata/video-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-qxl-heads.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args
b/tests/qemuxml2argvdata/video-qxl-noheads.args
index 5ab6457c53..69609c3bda 100644
--- a/tests/qemuxml2argvdata/video-qxl-noheads.args
+++ b/tests/qemuxml2argvdata/video-qxl-noheads.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.args
b/tests/qemuxml2argvdata/video-qxl-resolution.args
index 01abb18423..c110b190a0 100644
--- a/tests/qemuxml2argvdata/video-qxl-resolution.args
+++ b/tests/qemuxml2argvdata/video-qxl-resolution.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
index 8fecc54d28..c06740aca7 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args
b/tests/qemuxml2argvdata/video-qxl-sec-device.args
index 9860de5e13..f84e501226 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
index 3d06b7f209..1128aad109 100644
--- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-vga-device.args
b/tests/qemuxml2argvdata/video-vga-device.args
index 914ca225f6..1a79f13bb0 100644
--- a/tests/qemuxml2argvdata/video-vga-device.args
+++ b/tests/qemuxml2argvdata/video-vga-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
index c7a31438e2..1b3945381c 100644
--- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
index 9cca9f2c98..e28d9ce554 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
index dd03c0b007..2c0dee172d 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
index cfeddacdb0..66ba6e0e38 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
@@ -9,6 +9,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
index 8bcbf9351d..6b77ab7dfa 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
index 184705ebad..e3ae0d6f45 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
index 0d070d5930..bf853d2a25 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args
b/tests/qemuxml2argvdata/video-virtio-vga.args
index 8db05c9a2a..1f4fd996c7 100644
--- a/tests/qemuxml2argvdata/video-virtio-vga.args
+++ b/tests/qemuxml2argvdata/video-virtio-vga.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args
b/tests/qemuxml2argvdata/virtio-input-passthrough.args
index 3efbbca5ce..655b12fe10 100644
--- a/tests/qemuxml2argvdata/virtio-input-passthrough.args
+++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/virtio-input.args
b/tests/qemuxml2argvdata/virtio-input.args
index 33066c51c6..cc9fd282ae 100644
--- a/tests/qemuxml2argvdata/virtio-input.args
+++ b/tests/qemuxml2argvdata/virtio-input.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/virtio-lun.args
b/tests/qemuxml2argvdata/virtio-lun.args
index bb77bd9a44..56597da601 100644
--- a/tests/qemuxml2argvdata/virtio-lun.args
+++ b/tests/qemuxml2argvdata/virtio-lun.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=test,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test/master-key.aes \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 1024 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.args
b/tests/qemuxml2argvdata/virtio-rng-ccw.args
index 76b98349a3..c728ead87e 100644
--- a/tests/qemuxml2argvdata/virtio-rng-ccw.args
+++ b/tests/qemuxml2argvdata/virtio-rng-ccw.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args
b/tests/qemuxml2argvdata/virtio-rng-default.args
index 7ee903c1be..04e2996d30 100644
--- a/tests/qemuxml2argvdata/virtio-rng-default.args
+++ b/tests/qemuxml2argvdata/virtio-rng-default.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args
b/tests/qemuxml2argvdata/virtio-rng-egd.args
index d7c9adc782..b8a5c0abc6 100644
--- a/tests/qemuxml2argvdata/virtio-rng-egd.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args
b/tests/qemuxml2argvdata/virtio-rng-multiple.args
index 84691c0b0e..17ef05aabf 100644
--- a/tests/qemuxml2argvdata/virtio-rng-multiple.args
+++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args
b/tests/qemuxml2argvdata/virtio-rng-random.args
index c124ea2a74..a715c0de32 100644
--- a/tests/qemuxml2argvdata/virtio-rng-random.args
+++ b/tests/qemuxml2argvdata/virtio-rng-random.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args
b/tests/qemuxml2argvdata/vmcoreinfo.args
index 67bb16846b..b4cd6eb7ff 100644
--- a/tests/qemuxml2argvdata/vmcoreinfo.args
+++ b/tests/qemuxml2argvdata/vmcoreinfo.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/watchdog-device.args
b/tests/qemuxml2argvdata/watchdog-device.args
index 21e50d97af..0ba147c1f9 100644
--- a/tests/qemuxml2argvdata/watchdog-device.args
+++ b/tests/qemuxml2argvdata/watchdog-device.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/watchdog-dump.args
b/tests/qemuxml2argvdata/watchdog-dump.args
index fe89e3fd9a..b0f1d69473 100644
--- a/tests/qemuxml2argvdata/watchdog-dump.args
+++ b/tests/qemuxml2argvdata/watchdog-dump.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.args
b/tests/qemuxml2argvdata/watchdog-injectnmi.args
index 825e5f4ed3..1dac7dc738 100644
--- a/tests/qemuxml2argvdata/watchdog-injectnmi.args
+++ b/tests/qemuxml2argvdata/watchdog-injectnmi.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/watchdog.args
index adb243313d..3e17fcb42c 100644
--- a/tests/qemuxml2argvdata/watchdog.args
+++ b/tests/qemuxml2argvdata/watchdog.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-realtime mlock=off \
diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
index c4bd5a02b6..751cf573e7 100644
--- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
@@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=kvm,debug-threads=on \
-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-kvm/master-key.aes \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu qemu32 \
-m 4096 \
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 18b7b0ecf1..8c068b4a4f 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1701,7 +1701,6 @@ mymain(void)
driver.config->chardevTLSx509certdir =
g_strdup("/etc/pki/libvirt-chardev");
driver.config->chardevTLSx509secretUUID =
g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea");
DO_TEST("serial-tcp-tlsx509-secret-chardev",
- QEMU_CAPS_OBJECT_SECRET,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_OBJECT_TLS_CREDS_X509);
driver.config->chardevTLS = 0;
@@ -2108,16 +2107,16 @@ mymain(void)
DO_TEST_CAPS_LATEST("cpu-translation");
qemuTestSetHostCPU(&driver, driver.hostarch, NULL);
- DO_TEST("encrypted-disk", QEMU_CAPS_QCOW2_LUKS, QEMU_CAPS_OBJECT_SECRET);
- DO_TEST("encrypted-disk-usage", QEMU_CAPS_QCOW2_LUKS,
QEMU_CAPS_OBJECT_SECRET);
- DO_TEST("luks-disks", QEMU_CAPS_OBJECT_SECRET);
- DO_TEST("luks-disks-source", QEMU_CAPS_OBJECT_SECRET);
- DO_TEST_PARSE_ERROR("luks-disks-source-qcow2", QEMU_CAPS_OBJECT_SECRET);
- DO_TEST("luks-disks-source-qcow2", QEMU_CAPS_OBJECT_SECRET,
QEMU_CAPS_QCOW2_LUKS);
+ DO_TEST("encrypted-disk", QEMU_CAPS_QCOW2_LUKS);
+ DO_TEST("encrypted-disk-usage", QEMU_CAPS_QCOW2_LUKS);
+ DO_TEST_NOCAPS("luks-disks");
+ DO_TEST_NOCAPS("luks-disks-source");
+ DO_TEST_PARSE_ERROR_NOCAPS("luks-disks-source-qcow2");
+ DO_TEST("luks-disks-source-qcow2", QEMU_CAPS_QCOW2_LUKS);
DO_TEST_CAPS_VER("luks-disks-source-qcow2", "5.2.0");
DO_TEST_CAPS_LATEST("luks-disks-source-qcow2");
DO_TEST_PARSE_ERROR_NOCAPS("luks-disk-invalid");
- DO_TEST_PARSE_ERROR("luks-disks-source-both", QEMU_CAPS_OBJECT_SECRET);
+ DO_TEST_PARSE_ERROR_NOCAPS("luks-disks-source-both");
DO_TEST_NOCAPS("memtune");
DO_TEST_NOCAPS("memtune-unlimited");
@@ -3270,7 +3269,6 @@ mymain(void)
ARG_END);
DO_TEST("name-escape",
- QEMU_CAPS_OBJECT_SECRET,
QEMU_CAPS_VNC,
QEMU_CAPS_DEVICE_CIRRUS_VGA,
QEMU_CAPS_SPICE,
@@ -3284,7 +3282,7 @@ mymain(void)
QEMU_CAPS_CCID_EMULATED,
QEMU_CAPS_VIRTIO_SCSI);
- DO_TEST("master-key", QEMU_CAPS_OBJECT_SECRET);
+ DO_TEST_NOCAPS("master-key");
DO_TEST("usb-long-port-path",
QEMU_CAPS_USB_HUB);
DO_TEST_PARSE_ERROR("usb-too-long-port-path-invalid",
@@ -3409,7 +3407,7 @@ mymain(void)
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_HDA_DUPLEX,
QEMU_CAPS_CCID_EMULATED,
- QEMU_CAPS_QCOW2_LUKS, QEMU_CAPS_OBJECT_SECRET);
+ QEMU_CAPS_QCOW2_LUKS);
DO_TEST("user-aliases2", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI);
DO_TEST("user-aliases-usb", QEMU_CAPS_KVM,
QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4,
--
2.31.1
6:35 a.m.
New subject: [PATCH 03/12] qemu: capabilities: Retire QEMU_CAPS_OBJECT_SECRET
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 -
41 files changed, 2 insertions(+), 42 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 63516c3d8e..7f39a7d595 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -369,7 +369,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 215 */
"debug-threads", /* X_QEMU_CAPS_NAME_DEBUG_THREADS */
- "secret", /* QEMU_CAPS_OBJECT_SECRET */
+ "secret", /* X_QEMU_CAPS_OBJECT_SECRET */
"pxb", /* QEMU_CAPS_DEVICE_PXB */
"pxb-pcie", /* QEMU_CAPS_DEVICE_PXB_PCIE */
"device-tray-moved-event", /* X_QEMU_CAPS_DEVICE_TRAY_MOVED */
@@ -1267,7 +1267,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "virtio-input-host-device", QEMU_CAPS_VIRTIO_INPUT_HOST },
{ "virtio-input-host-pci", QEMU_CAPS_VIRTIO_INPUT_HOST },
{ "mptsas1068", QEMU_CAPS_SCSI_MPTSAS1068 },
- { "secret", QEMU_CAPS_OBJECT_SECRET },
{ "pxb", QEMU_CAPS_DEVICE_PXB },
{ "pxb-pcie", QEMU_CAPS_DEVICE_PXB_PCIE },
{ "tls-creds-x509", QEMU_CAPS_OBJECT_TLS_CREDS_X509 },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 23aa434f2c..b415b82a82 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -349,7 +349,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 215 */
X_QEMU_CAPS_NAME_DEBUG_THREADS, /* Is -name debug-threads= available */
- QEMU_CAPS_OBJECT_SECRET, /* -object secret */
+ X_QEMU_CAPS_OBJECT_SECRET, /* -object secret */
QEMU_CAPS_DEVICE_PXB, /* -device pxb */
QEMU_CAPS_DEVICE_PXB_PCIE, /* -device pxb-pcie */
X_QEMU_CAPS_DEVICE_TRAY_MOVED, /* DEVICE_TRAY_MOVED event */
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index bb68c1376a..e4b7cc9581 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -50,7 +50,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 2f29fdc2b1..71fd465304 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -106,7 +106,6 @@
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 985591024e..aea66d22fa 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -81,7 +81,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index e8eb951434..54e0d83356 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -75,7 +75,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 574fe2369c..cce82f0863 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -50,7 +50,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index f1721d50a7..08da606409 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -104,7 +104,6 @@
<flag name='mptsas1068'/>
<flag name='qxl.vram64_size_mb'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 59a7e25e4c..623f56a9c1 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -74,7 +74,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index 3f64e04e1b..b91af5dedd 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -38,7 +38,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index afe714ad12..039c8c0b07 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -38,7 +38,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index 4ee3b134cb..78fbb7fcbb 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -52,7 +52,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index 8b8a65ecef..6cd80ac9db 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -105,7 +105,6 @@
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index 9b5721b66b..c8098e1b1b 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -75,7 +75,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 0050bcff04..311aeb2345 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -105,7 +105,6 @@
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index bd146d9289..7be3e93766 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -83,7 +83,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index 9f381a265d..625eb66e05 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -80,7 +80,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index 32d61e0789..22def85d8a 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -87,7 +87,6 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='spice-unix'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index 70d17c9bf0..7ca2e8a6ca 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -87,7 +87,6 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='spice-unix'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index d1227a7833..c635c38504 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -52,7 +52,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index d47e6958c5..9c71800987 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -104,7 +104,6 @@
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 83ff479f56..4797f838fe 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -104,7 +104,6 @@
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index c390ab26c7..c5831ed7a0 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -84,7 +84,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index ee4d7d0b9b..88a931167c 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -80,7 +80,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 8374c93c92..4cc73436d0 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -52,7 +52,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 9ca4c35850..cb7c27b8f4 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -105,7 +105,6 @@
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index e8bb8b0ecc..d67956f2d0 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -86,7 +86,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 115826c46c..0358971510 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -81,7 +81,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 7cefe095f0..95ab677abc 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -87,7 +87,6 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='spice-unix'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 9cbcd20cf9..c894cba8d2 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -105,7 +105,6 @@
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index ff223d3d85..4d1eeea008 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -32,7 +32,6 @@
<flag name='vserport-change-event'/>
<flag name='spice-gl'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 364526a971..05da126589 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -105,7 +105,6 @@
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 941b3f9999..d77ba09bec 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -85,7 +85,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 057d1db4a7..0d67439b8e 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -80,7 +80,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index d46dae0cd1..b7889c8b49 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -86,7 +86,6 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='spice-unix'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 02e608da2e..9e34ee78d9 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -51,7 +51,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 2df847c7d7..d79bb8f747 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -105,7 +105,6 @@
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index e982b83b86..3e6347c546 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -84,7 +84,6 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 3cc6041f95..bfc5c6c5f1 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -51,7 +51,6 @@
<flag name='vserport-change-event'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='virtio-scsi-pci.iothread'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 0fb1b4538d..5558d14b15 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -104,7 +104,6 @@
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 31a5223c40..047920e424 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -103,7 +103,6 @@
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
<flag name='chardev-logfile'/>
- <flag name='secret'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='nec-usb-xhci-ports'/>
--
2.31.1
6:35 a.m.
New subject: [PATCH 04/12] qemu: domain: Remove qemuDomainSupportsEncryptedSecret
The answer is now always 'true', so we can remove the function and
simplify the logic in places where it's called.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_domain.c | 25 ++-----------------------
src/qemu/qemu_domain.h | 2 --
2 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 1340ed0d29..903e86f8dc 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1154,12 +1154,6 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivate *priv,
g_autofree uint8_t *ciphertext = NULL;
size_t ciphertextlen = 0;
- if (!qemuDomainSupportsEncryptedSecret(priv)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("encrypted secrets are not supported"));
- return NULL;
- }
-
secinfo = g_new0(qemuDomainSecretInfo, 1);
secinfo->type = VIR_DOMAIN_SECRET_INFO_TYPE_AES;
@@ -1235,20 +1229,6 @@ qemuDomainSecretAESSetupFromSecret(qemuDomainObjPrivate *priv,
}
-/**
- * qemuDomainSupportsEncryptedSecret:
- * @priv: qemu domain private data
- *
- * Returns true if libvirt can use encrypted 'secret' objects with VM which
- * @priv belongs to.
- */
-bool
-qemuDomainSupportsEncryptedSecret(qemuDomainObjPrivate *priv)
-{
- return !!priv->masterKey;
-}
-
-
/* qemuDomainSecretInfoNewPlain:
* @usageType: Secret usage type
* @username: username
@@ -1404,8 +1384,7 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivate *priv,
if (src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD)
usageType = VIR_SECRET_USAGE_TYPE_CEPH;
- if (!qemuDomainSupportsEncryptedSecret(priv) ||
- (src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI && !iscsiHasPS))
{
+ if (src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI && !iscsiHasPS) {
srcPriv->secinfo = qemuDomainSecretInfoNewPlain(usageType,
src->auth->username,
&src->auth->seclookupdef);
@@ -10888,7 +10867,7 @@ qemuDomainPrepareHostdev(virDomainHostdevDef *hostdev,
virSecretUsageType usageType = VIR_SECRET_USAGE_TYPE_ISCSI;
qemuDomainStorageSourcePrivate *srcPriv =
qemuDomainStorageSourcePrivateFetch(src);
- if (!qemuDomainSupportsEncryptedSecret(priv) || !iscsiHasPS) {
+ if (!iscsiHasPS) {
srcPriv->secinfo = qemuDomainSecretInfoNewPlain(usageType,
src->auth->username,
&src->auth->seclookupdef);
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index ae9d76ec4a..08f33f0f9e 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -853,8 +853,6 @@ int qemuDomainMasterKeyCreate(virDomainObj *vm);
void qemuDomainMasterKeyRemove(qemuDomainObjPrivate *priv);
-bool qemuDomainSupportsEncryptedSecret(qemuDomainObjPrivate *priv);
-
void qemuDomainSecretInfoFree(qemuDomainSecretInfo *secinfo)
ATTRIBUTE_NONNULL(1);
--
2.31.1
6:35 a.m.
New subject: [PATCH 05/12] qemu: domain: Always assume QEMU_CAPS_ISCSI_PASSWORD_SECRET
QEMU supports the 'password-secret' parameter to pass a QCryptoSecret
since 2.9. Remove the alternate plaintext logic.
Unfortunately this had a ripple effect of removing qemuCaps from a lot
of functions.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 23 ++-
src/qemu/qemu_domain.c | 131 ++----------------
.../qemuxml2argvdata/disk-network-iscsi.args | 12 +-
.../disk-network-source-auth.args | 3 +-
.../disk-source-pool-mode.args | 4 +-
.../luks-disks-source-qcow2.args | 5 +-
tests/qemuxml2argvdata/luks-disks-source.args | 5 +-
tests/qemuxml2argvdata/name-escape.args | 2 +-
tests/qemuxml2argvtest.c | 3 +-
9 files changed, 43 insertions(+), 145 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 7a441b4a04..39659fe4f6 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1194,8 +1194,7 @@ qemuDiskBusIsSD(int bus)
* the legacy representation.
*/
static bool
-qemuDiskSourceNeedsProps(virStorageSource *src,
- virQEMUCaps *qemuCaps)
+qemuDiskSourceNeedsProps(virStorageSource *src)
{
int actualType = virStorageSourceGetActualType(src);
@@ -1209,8 +1208,7 @@ qemuDiskSourceNeedsProps(virStorageSource *src,
return true;
if (actualType == VIR_STORAGE_TYPE_NETWORK &&
- src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_ISCSI_PASSWORD_SECRET))
+ src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI)
return true;
if (actualType == VIR_STORAGE_TYPE_NETWORK &&
@@ -1272,7 +1270,6 @@ qemuBuildDriveSourcePR(virBuffer *buf,
static int
qemuBuildDriveSourceStr(virDomainDiskDef *disk,
- virQEMUCaps *qemuCaps,
virBuffer *buf)
{
int actualType = virStorageSourceGetActualType(disk->src);
@@ -1288,7 +1285,7 @@ qemuBuildDriveSourceStr(virDomainDiskDef *disk,
encinfo = srcpriv->encinfo;
}
- if (qemuDiskSourceNeedsProps(disk->src, qemuCaps) &&
+ if (qemuDiskSourceNeedsProps(disk->src) &&
!(srcprops = qemuDiskSourceGetProps(disk->src)))
return -1;
@@ -1469,7 +1466,7 @@ qemuBuildDriveStr(virDomainDiskDef *disk,
int detect_zeroes = virDomainDiskGetDetectZeroesMode(disk->discard,
disk->detect_zeroes);
- if (qemuBuildDriveSourceStr(disk, qemuCaps, &opt) < 0)
+ if (qemuBuildDriveSourceStr(disk, &opt) < 0)
return NULL;
if (!qemuDiskBusIsSD(disk->bus)) {
@@ -4556,8 +4553,7 @@ qemuBuildHubCommandLine(virCommand *cmd,
static char *
-qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDef *dev,
- virQEMUCaps *qemuCaps)
+qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDef *dev)
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
g_autofree char *netsource = NULL;
@@ -4567,7 +4563,7 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDef *dev,
qemuDomainStorageSourcePrivate *srcPriv =
QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(iscsisrc->src);
- if (qemuDiskSourceNeedsProps(iscsisrc->src, qemuCaps)) {
+ if (qemuDiskSourceNeedsProps(iscsisrc->src)) {
if (!(srcprops = qemuDiskSourceGetProps(iscsisrc->src)))
return NULL;
if (!(netsource = virQEMUBuildDriveCommandlineFromJSON(srcprops)))
@@ -4612,8 +4608,7 @@ qemuBuildSCSIVHostHostdevDevStr(const virDomainDef *def,
}
static char *
-qemuBuildSCSIHostdevDrvStr(virDomainHostdevDef *dev,
- virQEMUCaps *qemuCaps)
+qemuBuildSCSIHostdevDrvStr(virDomainHostdevDef *dev)
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
g_autofree char *source = NULL;
@@ -4621,7 +4616,7 @@ qemuBuildSCSIHostdevDrvStr(virDomainHostdevDef *dev,
virDomainHostdevSubsysSCSI *scsisrc = &dev->source.subsys.u.scsi;
if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) {
- if (!(source = qemuBuildSCSIiSCSIHostdevDrvStr(dev, qemuCaps)))
+ if (!(source = qemuBuildSCSIiSCSIHostdevDrvStr(dev)))
return NULL;
virBufferAdd(&buf, source, -1);
} else {
@@ -5170,7 +5165,7 @@ qemuBuildHostdevSCSIAttachPrepare(virDomainHostdevDef *hostdev,
} else {
if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI)
src = scsisrc->u.iscsi.src;
- ret->driveCmd = qemuBuildSCSIHostdevDrvStr(hostdev, qemuCaps);
+ ret->driveCmd = qemuBuildSCSIHostdevDrvStr(hostdev);
ret->driveAlias = qemuAliasFromHostdev(hostdev);
*backendAlias = ret->driveAlias;
}
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 903e86f8dc..73e69d1558 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1093,43 +1093,6 @@ qemuDomainVideoPrivateDispose(void *obj)
}
-/* qemuDomainSecretPlainSetup:
- * @secinfo: Pointer to secret info
- * @usageType: The virSecretUsageType
- * @username: username to use for authentication (may be NULL)
- * @seclookupdef: Pointer to seclookupdef data
- *
- * Taking a secinfo, fill in the plaintext information
- *
- * Returns 0 on success, -1 on failure with error message
- */
-static int
-qemuDomainSecretPlainSetup(qemuDomainSecretInfo *secinfo,
- virSecretUsageType usageType,
- const char *username,
- virSecretLookupTypeDef *seclookupdef)
-{
- VIR_IDENTITY_AUTORESTORE virIdentity *oldident = virIdentityElevateCurrent();
- g_autoptr(virConnect) conn = virGetConnectSecret();
- int ret = -1;
-
- if (!oldident)
- return -1;
-
- if (!conn)
- return -1;
-
- secinfo->type = VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN;
- secinfo->s.plain.username = g_strdup(username);
-
- ret = virSecretGetSecretString(conn, seclookupdef, usageType,
- &secinfo->s.plain.secret,
- &secinfo->s.plain.secretlen);
-
- return ret;
-}
-
-
/* qemuDomainSecretAESSetup:
* @priv: pointer to domain private object
* @alias: alias of the secret
@@ -1229,35 +1192,6 @@ qemuDomainSecretAESSetupFromSecret(qemuDomainObjPrivate *priv,
}
-/* qemuDomainSecretInfoNewPlain:
- * @usageType: Secret usage type
- * @username: username
- * @lookupDef: lookup def describing secret
- *
- * Helper function to create a secinfo to be used for secinfo consumers. This
- * sets up a 'plain' (unencrypted) secret for legacy consumers.
- *
- * Returns @secinfo on success, NULL on failure. Caller is responsible
- * to eventually free @secinfo.
- */
-static qemuDomainSecretInfo *
-qemuDomainSecretInfoNewPlain(virSecretUsageType usageType,
- const char *username,
- virSecretLookupTypeDef *lookupDef)
-{
- qemuDomainSecretInfo *secinfo = NULL;
-
- secinfo = g_new0(qemuDomainSecretInfo, 1);
-
- if (qemuDomainSecretPlainSetup(secinfo, usageType, username, lookupDef) < 0) {
- g_clear_pointer(&secinfo, qemuDomainSecretInfoFree);
- return NULL;
- }
-
- return secinfo;
-}
-
-
/**
* qemuDomainSecretInfoTLSNew:
* @priv: pointer to domain private object
@@ -1366,7 +1300,6 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivate *priv,
const char *aliasformat)
{
qemuDomainStorageSourcePrivate *srcPriv;
- bool iscsiHasPS = virQEMUCapsGet(priv->qemuCaps,
QEMU_CAPS_ISCSI_PASSWORD_SECRET);
bool hasAuth = qemuDomainStorageSourceHasAuth(src);
bool hasEnc = qemuDomainDiskHasEncryptionSecret(src);
@@ -1384,19 +1317,11 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivate *priv,
if (src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD)
usageType = VIR_SECRET_USAGE_TYPE_CEPH;
- if (src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI && !iscsiHasPS) {
- srcPriv->secinfo = qemuDomainSecretInfoNewPlain(usageType,
- src->auth->username,
-
&src->auth->seclookupdef);
- } else {
- srcPriv->secinfo = qemuDomainSecretAESSetupFromSecret(priv,
aliasprotocol,
- "auth",
- usageType,
-
src->auth->username,
-
&src->auth->seclookupdef);
- }
-
- if (!srcPriv->secinfo)
+ if (!(srcPriv->secinfo = qemuDomainSecretAESSetupFromSecret(priv,
aliasprotocol,
+ "auth",
+ usageType,
+
src->auth->username,
+
&src->auth->seclookupdef)))
return -1;
}
@@ -4777,15 +4702,6 @@ qemuDomainValidateStorageSource(virStorageSource *src,
return -1;
}
- /* Use QEMU_CAPS_ISCSI_PASSWORD_SECRET as witness that iscsi
'initiator-name'
- * option is available, it was introduced at the same time. */
- if (src->initiator.iqn &&
- !virQEMUCapsGet(qemuCaps, QEMU_CAPS_ISCSI_PASSWORD_SECRET)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("iSCSI initiator IQN not supported with this QEMU
binary"));
- return -1;
- }
-
if (src->sliceStorage) {
/* In pre-blockdev era we can't configure the slice so we can allow them
* only for detected backing store entries as they are populated
@@ -5322,7 +5238,6 @@ qemuDomainChrDefPostParse(virDomainChrDef *chr,
*/
static int
qemuDomainDeviceDiskDefPostParseRestoreSecAlias(virDomainDiskDef *disk,
- virQEMUCaps *qemuCaps,
unsigned int parseFlags)
{
qemuDomainStorageSourcePrivate *priv =
QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(disk->src);
@@ -5344,8 +5259,7 @@ qemuDomainDeviceDiskDefPostParseRestoreSecAlias(virDomainDiskDef
*disk,
* status XML */
if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_NETWORK
&&
(disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD ||
- (disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_ISCSI_PASSWORD_SECRET))))
+ disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI))
restoreAuthSecret = true;
}
@@ -5385,7 +5299,6 @@ qemuDomainDeviceDiskDefPostParseRestoreSecAlias(virDomainDiskDef
*disk,
static int
qemuDomainDeviceDiskDefPostParse(virDomainDiskDef *disk,
- virQEMUCaps *qemuCaps,
unsigned int parseFlags)
{
/* set default disk types and drivers */
@@ -5402,8 +5315,7 @@ qemuDomainDeviceDiskDefPostParse(virDomainDiskDef *disk,
disk->mirror->format == VIR_STORAGE_FILE_NONE)
disk->mirror->format = VIR_STORAGE_FILE_RAW;
- if (qemuDomainDeviceDiskDefPostParseRestoreSecAlias(disk, qemuCaps,
- parseFlags) < 0)
+ if (qemuDomainDeviceDiskDefPostParseRestoreSecAlias(disk, parseFlags) < 0)
return -1;
/* regenerate TLS alias for old status XMLs */
@@ -5507,7 +5419,6 @@ qemuDomainVsockDefPostParse(virDomainVsockDef *vsock)
*/
static int
qemuDomainDeviceHostdevDefPostParseRestoreSecAlias(virDomainHostdevDef *hostdev,
- virQEMUCaps *qemuCaps,
unsigned int parseFlags)
{
qemuDomainStorageSourcePrivate *priv;
@@ -5521,7 +5432,6 @@
qemuDomainDeviceHostdevDefPostParseRestoreSecAlias(virDomainHostdevDef *hostdev,
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI ||
scsisrc->protocol != VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI ||
- !virQEMUCapsGet(qemuCaps, QEMU_CAPS_ISCSI_PASSWORD_SECRET) ||
!qemuDomainStorageSourceHasAuth(iscsisrc->src))
return 0;
@@ -5611,8 +5521,7 @@ qemuDomainHostdevDefPostParse(virDomainHostdevDef *hostdev,
{
virDomainHostdevSubsys *subsys = &hostdev->source.subsys;
- if (qemuDomainDeviceHostdevDefPostParseRestoreSecAlias(hostdev, qemuCaps,
- parseFlags) < 0)
+ if (qemuDomainDeviceHostdevDefPostParseRestoreSecAlias(hostdev, parseFlags) < 0)
return -1;
if (qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias(hostdev, qemuCaps,
@@ -5732,8 +5641,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDef *dev,
break;
case VIR_DOMAIN_DEVICE_DISK:
- ret = qemuDomainDeviceDiskDefPostParse(dev->data.disk, qemuCaps,
- parseFlags);
+ ret = qemuDomainDeviceDiskDefPostParse(dev->data.disk, parseFlags);
break;
case VIR_DOMAIN_DEVICE_VIDEO:
@@ -10863,24 +10771,15 @@ qemuDomainPrepareHostdev(virDomainHostdevDef *hostdev,
}
if (src->auth) {
- bool iscsiHasPS = virQEMUCapsGet(priv->qemuCaps,
QEMU_CAPS_ISCSI_PASSWORD_SECRET);
virSecretUsageType usageType = VIR_SECRET_USAGE_TYPE_ISCSI;
qemuDomainStorageSourcePrivate *srcPriv =
qemuDomainStorageSourcePrivateFetch(src);
- if (!iscsiHasPS) {
- srcPriv->secinfo = qemuDomainSecretInfoNewPlain(usageType,
-
src->auth->username,
-
&src->auth->seclookupdef);
- } else {
- srcPriv->secinfo = qemuDomainSecretAESSetupFromSecret(priv,
- backendalias,
- NULL,
- usageType,
-
src->auth->username,
-
&src->auth->seclookupdef);
- }
-
- if (!srcPriv->secinfo)
+ if (!(srcPriv->secinfo = qemuDomainSecretAESSetupFromSecret(priv,
+
backendalias,
+ NULL,
+ usageType,
+
src->auth->username,
+
&src->auth->seclookupdef)))
return -1;
}
}
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.args
b/tests/qemuxml2argvdata/disk-network-iscsi.args
index 4e6d920c88..e63f2f073f 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.args
@@ -27,14 +27,16 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
-usb \
--drive
file=iscsi://example.org:6000/iqn.1992-01.com.example/0,format=raw,if=none,id=drive-virtio-disk0
\
+-drive
file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example,file.lun=0,file.transport=tcp,format=raw,if=none,id=drive-virtio-disk0
\
-device
virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--drive
file=iscsi://example.org:6000/iqn.1992-01.com.example/1,format=raw,if=none,id=drive-virtio-disk1
\
+-drive
file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example,file.lun=1,file.transport=tcp,format=raw,if=none,id=drive-virtio-disk1
\
-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
--drive
file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=none,id=drive-virtio-disk2
\
+-object
secret,id=virtio-disk2-auth-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
+-drive
file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example:storage,file.lun=1,file.transport=tcp,file.user=myname,file.password-secret=virtio-disk2-auth-secret0,format=raw,if=none,id=drive-virtio-disk2
\
-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,id=virtio-disk2 \
--drive
file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:6000/iqn.1992-01.com.example%3Astorage/2,format=raw,if=none,id=drive-virtio-disk3
\
+-object
secret,id=virtio-disk3-auth-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
+-drive
file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example:storage,file.lun=2,file.transport=tcp,file.user=myname,file.password-secret=virtio-disk3-auth-secret0,format=raw,if=none,id=drive-virtio-disk3
\
-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,id=virtio-disk3 \
--drive
file=iscsi://example.org:3260/iqn.1992-01.com.example/0,format=raw,if=none,id=drive-scsi0-0-0-0
\
+-drive
file.driver=iscsi,file.portal=example.org:3260,file.target=iqn.1992-01.com.example,file.lun=0,file.transport=tcp,format=raw,if=none,id=drive-scsi0-0-0-0
\
-device
scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.args
b/tests/qemuxml2argvdata/disk-network-source-auth.args
index 9c58a9c8c0..0a040ac4ea 100644
--- a/tests/qemuxml2argvdata/disk-network-source-auth.args
+++ b/tests/qemuxml2argvdata/disk-network-source-auth.args
@@ -26,7 +26,8 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
--drive
file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=none,id=drive-virtio-disk0
\
+-object
secret,id=virtio-disk0-auth-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
+-drive
file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example:storage,file.lun=1,file.transport=tcp,file.user=myname,file.password-secret=virtio-disk0-auth-secret0,format=raw,if=none,id=drive-virtio-disk0
\
-device
virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-object
secret,id=virtio-disk1-auth-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
'file=rbd:pool/image:id=myname:auth_supported=cephx\;none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,file.password-secret=virtio-disk1-auth-secret0,format=raw,if=none,id=drive-virtio-disk1'
\
diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.args
b/tests/qemuxml2argvdata/disk-source-pool-mode.args
index d78637613e..f4f4a72a2a 100644
--- a/tests/qemuxml2argvdata/disk-source-pool-mode.args
+++ b/tests/qemuxml2argvdata/disk-source-pool-mode.args
@@ -28,11 +28,11 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive
file=/some/block/device/unit:0:0:1,format=raw,if=none,id=drive-ide0-0-1,readonly=on \
-device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
--drive
file=iscsi://iscsi.example.com:3260/demo-target/2,format=raw,if=none,id=drive-ide0-0-2,readonly=on
\
+-drive
file.driver=iscsi,file.portal=iscsi.example.com:3260,file.target=demo-target,file.lun=2,file.transport=tcp,format=raw,if=none,id=drive-ide0-0-2,readonly=on
\
-device ide-cd,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \
-drive file=/tmp/idedisk.img,format=raw,if=none,id=drive-ide0-0-3 \
-device ide-hd,bus=ide.0,unit=3,drive=drive-ide0-0-3,id=ide0-0-3,bootindex=1 \
--drive
file=iscsi://iscsi.example.com:3260/demo-target/3,format=raw,if=none,id=drive-ide0-0-4,readonly=on
\
+-drive
file.driver=iscsi,file.portal=iscsi.example.com:3260,file.target=demo-target,file.lun=3,file.transport=tcp,format=raw,if=none,id=drive-ide0-0-4,readonly=on
\
-device ide-cd,bus=ide.0,unit=4,drive=drive-ide0-0-4,id=ide0-0-4 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
index 881fa5c1ca..a0aa131ca5 100644
--- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
+++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
@@ -32,11 +32,12 @@ QEMU_AUDIO_DRV=none \
-object
secret,id=virtio-disk1-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
file=/storage/guest_disks/encryptdisk2,encrypt.format=luks,encrypt.key-secret=virtio-disk1-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk1
\
-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
+-object
secret,id=virtio-disk2-auth-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-object
secret,id=virtio-disk2-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
--drive
file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:6000/iqn.1992-01.com.example%3Astorage/1,encrypt.format=luks,encrypt.key-secret=virtio-disk2-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk2
\
+-drive
file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example:storage,file.lun=1,file.transport=tcp,file.user=myname,file.password-secret=virtio-disk2-auth-secret0,encrypt.format=luks,encrypt.key-secret=virtio-disk2-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk2
\
-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk2,id=virtio-disk2 \
-object
secret,id=virtio-disk3-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
--drive
file=iscsi://iscsi.example.com:3260/demo-target/3,encrypt.format=luks,encrypt.key-secret=virtio-disk3-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk3
\
+-drive
file.driver=iscsi,file.portal=iscsi.example.com:3260,file.target=demo-target,file.lun=3,file.transport=tcp,encrypt.format=luks,encrypt.key-secret=virtio-disk3-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk3
\
-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,id=virtio-disk3 \
-object
secret,id=virtio-disk4-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,encrypt.format=luks,encrypt.key-secret=virtio-disk4-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk4'
\
diff --git a/tests/qemuxml2argvdata/luks-disks-source.args
b/tests/qemuxml2argvdata/luks-disks-source.args
index 5854f3b153..4d056da220 100644
--- a/tests/qemuxml2argvdata/luks-disks-source.args
+++ b/tests/qemuxml2argvdata/luks-disks-source.args
@@ -32,11 +32,12 @@ QEMU_AUDIO_DRV=none \
-object
secret,id=virtio-disk1-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
file=/storage/guest_disks/encryptdisk2,key-secret=virtio-disk1-encryption-secret0,format=luks,if=none,id=drive-virtio-disk1
\
-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
+-object
secret,id=virtio-disk2-auth-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-object
secret,id=virtio-disk2-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
--drive
file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:6000/iqn.1992-01.com.example%3Astorage/1,key-secret=virtio-disk2-encryption-secret0,format=luks,if=none,id=drive-virtio-disk2
\
+-drive
file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example:storage,file.lun=1,file.transport=tcp,file.user=myname,file.password-secret=virtio-disk2-auth-secret0,key-secret=virtio-disk2-encryption-secret0,format=luks,if=none,id=drive-virtio-disk2
\
-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk2,id=virtio-disk2 \
-object
secret,id=virtio-disk3-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
--drive
file=iscsi://iscsi.example.com:3260/demo-target/3,key-secret=virtio-disk3-encryption-secret0,format=luks,if=none,id=drive-virtio-disk3
\
+-drive
file.driver=iscsi,file.portal=iscsi.example.com:3260,file.target=demo-target,file.lun=3,file.transport=tcp,key-secret=virtio-disk3-encryption-secret0,format=luks,if=none,id=drive-virtio-disk3
\
-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk3,id=virtio-disk3 \
-object
secret,id=virtio-disk4-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64
\
-drive
'file=rbd:pool/image:auth_supported=none:mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:6322,key-secret=virtio-disk4-encryption-secret0,format=luks,if=none,id=drive-virtio-disk4'
\
diff --git a/tests/qemuxml2argvdata/name-escape.args
b/tests/qemuxml2argvdata/name-escape.args
index 028b6efbbd..449244a082 100644
--- a/tests/qemuxml2argvdata/name-escape.args
+++ b/tests/qemuxml2argvdata/name-escape.args
@@ -39,7 +39,7 @@ QEMU_AUDIO_DRV=spice \
-vnc unix:/tmp/lib/domain--1-foo=1,,bar=2/vnc.sock \
-spice
unix,addr=/tmp/lib/domain--1-foo=1,,bar=2/spice.sock,gl=on,rendernode=/dev/dri/foo,,bar,seamless-migration=on
\
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
--drive
file=iscsi://example.foo.org:3260/iqn.1992-01.com.example%3Amy,,storage/1,if=none,format=raw,id=drive-hostdev0
\
+-drive
file.driver=iscsi,file.portal=example.foo.org:3260,file.target=iqn.1992-01.com.example:my,,storage,file.lun=1,file.transport=tcp,if=none,format=raw,id=drive-hostdev0
\
-device
scsi-generic,bus=scsi0.0,channel=0,scsi-id=0,lun=4,drive=drive-hostdev0,id=hostdev0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 8c068b4a4f..f0cfca014c 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1353,8 +1353,7 @@ mymain(void)
DO_TEST("disk-network-iscsi", QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_SCSI_BLOCK);
DO_TEST("disk-network-iscsi-modern",
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_SCSI_BLOCK,
- QEMU_CAPS_ISCSI_PASSWORD_SECRET);
+ QEMU_CAPS_SCSI_BLOCK);
DO_TEST_CAPS_VER("disk-network-iscsi", "2.12.0");
DO_TEST_CAPS_LATEST("disk-network-iscsi");
DO_TEST_PARSE_ERROR_NOCAPS("disk-network-iscsi-auth-secrettype-invalid");
--
2.31.1
6:35 a.m.
New subject: [PATCH 06/12] qemu: capabilities: Retire QEMU_CAPS_ISCSI_PASSWORD_SECRET
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 -
41 files changed, 2 insertions(+), 42 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 7f39a7d595..2842666d2e 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -453,7 +453,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 275 */
"disk-share-rw", /* QEMU_CAPS_DISK_SHARE_RW */
- "iscsi.password-secret", /* QEMU_CAPS_ISCSI_PASSWORD_SECRET */
+ "iscsi.password-secret", /* X_QEMU_CAPS_ISCSI_PASSWORD_SECRET */
"isa-serial", /* QEMU_CAPS_DEVICE_ISA_SERIAL */
"pl011", /* QEMU_CAPS_DEVICE_PL011 */
"machine.pseries.max-cpu-compat", /*
QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT */
@@ -1554,7 +1554,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] =
{
{ "blockdev-add/arg-type/options/+gluster/debug-level",
QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
{ "blockdev-add/arg-type/+gluster/debug", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
{ "blockdev-add/arg-type/+vxhs", QEMU_CAPS_VXHS},
- { "blockdev-add/arg-type/+iscsi/password-secret",
QEMU_CAPS_ISCSI_PASSWORD_SECRET },
{ "blockdev-add/arg-type/+qcow2/encrypt/+luks/key-secret",
QEMU_CAPS_QCOW2_LUKS },
{ "blockdev-add/arg-type/+file/drop-cache",
QEMU_CAPS_MIGRATION_FILE_DROP_CACHE },
{ "blockdev-add/arg-type/+file/$dynamic-auto-read-only",
QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index b415b82a82..ea2b3b0ccd 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -433,7 +433,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 275 */
QEMU_CAPS_DISK_SHARE_RW, /* share-rw=on for concurrent disk access */
- QEMU_CAPS_ISCSI_PASSWORD_SECRET, /* -drive file.driver=iscsi,...,password-secret= */
+ X_QEMU_CAPS_ISCSI_PASSWORD_SECRET, /* -drive file.driver=iscsi,...,password-secret=
*/
QEMU_CAPS_DEVICE_ISA_SERIAL, /* -device isa-serial */
QEMU_CAPS_DEVICE_PL011, /* -device pl011 (not user-instantiable) */
QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, /* -machine pseries,max-cpu-compat= */
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index e4b7cc9581..bfc68aa9a7 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -75,7 +75,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>
<flag name='virtio-gpu-ccw'/>
<flag name='virtio-keyboard-ccw'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 71fd465304..702ee5160c 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -148,7 +148,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index aea66d22fa..1a5284fc4c 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -109,7 +109,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='pl011'/>
<flag name='dump-completed'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 54e0d83356..d3d4ee00fa 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -106,7 +106,6 @@
<flag name='machine.pseries.resize-hpt'/>
<flag name='spapr-vty'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='machine.pseries.max-cpu-compat'/>
<flag name='dump-completed'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index cce82f0863..1c3eaf63e5 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -75,7 +75,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>
<flag name='virtio-gpu-ccw'/>
<flag name='virtio-keyboard-ccw'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 08da606409..de5e0de181 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -145,7 +145,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 623f56a9c1..9a638e7527 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -105,7 +105,6 @@
<flag name='machine.pseries.resize-hpt'/>
<flag name='spapr-vty'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='machine.pseries.max-cpu-compat'/>
<flag name='dump-completed'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index b91af5dedd..765027cba2 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -52,7 +52,6 @@
<flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
<flag name='seccomp-blacklist'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index 039c8c0b07..57ded29ba7 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -52,7 +52,6 @@
<flag name='virtio-gpu.max_outputs'/>
<flag name='vxhs'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
<flag name='seccomp-blacklist'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index 78fbb7fcbb..2148c46bc2 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -77,7 +77,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>
<flag name='virtio-gpu-ccw'/>
<flag name='virtio-keyboard-ccw'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index 6cd80ac9db..386607dc41 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -147,7 +147,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index c8098e1b1b..95c309f3d0 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -106,7 +106,6 @@
<flag name='machine.pseries.resize-hpt'/>
<flag name='spapr-vty'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='machine.pseries.max-cpu-compat'/>
<flag name='dump-completed'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 311aeb2345..71cfd86a69 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -147,7 +147,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index 7be3e93766..aa9cf21d21 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -111,7 +111,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='pl011'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index 625eb66e05..a198fd261d 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -112,7 +112,6 @@
<flag name='machine.pseries.resize-hpt'/>
<flag name='spapr-vty'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='machine.pseries.max-cpu-compat'/>
<flag name='dump-completed'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index 22def85d8a..4c8c9bdd82 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -115,7 +115,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
<flag name='pcie-pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index 7ca2e8a6ca..3f4bf4dfe8 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -115,7 +115,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
<flag name='pcie-pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index c635c38504..74eb8d89fe 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -77,7 +77,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>
<flag name='virtio-gpu-ccw'/>
<flag name='virtio-keyboard-ccw'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 9c71800987..3b5dcfc8d2 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -146,7 +146,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 4797f838fe..d5463952f2 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -146,7 +146,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index c5831ed7a0..562d082681 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -113,7 +113,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='pl011'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 88a931167c..c9ee56014c 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -112,7 +112,6 @@
<flag name='machine.pseries.resize-hpt'/>
<flag name='spapr-vty'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='machine.pseries.max-cpu-compat'/>
<flag name='dump-completed'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 4cc73436d0..1fa1ceb827 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -77,7 +77,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>
<flag name='virtio-gpu-ccw'/>
<flag name='virtio-keyboard-ccw'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index cb7c27b8f4..f96027feb5 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -147,7 +147,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index d67956f2d0..e1d3b1c831 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -115,7 +115,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='pl011'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 0358971510..28d494a7fd 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -114,7 +114,6 @@
<flag name='machine.pseries.resize-hpt'/>
<flag name='spapr-vty'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='machine.pseries.max-cpu-compat'/>
<flag name='dump-completed'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 95ab677abc..23ada9ac91 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -115,7 +115,6 @@
<flag name='vxhs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
<flag name='pcie-pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index c894cba8d2..43e0d4b661 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -147,7 +147,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 4d1eeea008..7d4d2edd7c 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -44,7 +44,6 @@
<flag name='vnc-multi-servers'/>
<flag name='chardev-reconnect'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 05da126589..aae3346e5d 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -146,7 +146,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index d77ba09bec..e4eb9c2316 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -114,7 +114,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='pl011'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 0d67439b8e..253188797c 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -112,7 +112,6 @@
<flag name='machine.pseries.resize-hpt'/>
<flag name='spapr-vty'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='machine.pseries.max-cpu-compat'/>
<flag name='dump-completed'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index b7889c8b49..fcfbbb6cb5 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -113,7 +113,6 @@
<flag name='virtio-gpu.max_outputs'/>
<flag name='virtio-blk.num-queues'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
<flag name='pcie-pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 9e34ee78d9..1720c9f885 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -75,7 +75,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>
<flag name='virtio-gpu-ccw'/>
<flag name='virtio-keyboard-ccw'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index d79bb8f747..f07e21ada9 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -146,7 +146,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 3e6347c546..4348f54516 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -115,7 +115,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='pl011'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index bfc5c6c5f1..7334b17b22 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -75,7 +75,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='sclplmconsole'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='dump-completed'/>
<flag name='virtio-gpu-ccw'/>
<flag name='virtio-keyboard-ccw'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 5558d14b15..4ed12cf316 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -145,7 +145,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 047920e424..f727efcff1 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -144,7 +144,6 @@
<flag name='virtio-blk.num-queues'/>
<flag name='vmcoreinfo'/>
<flag name='disk-share-rw'/>
- <flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
<flag name='dump-completed'/>
<flag name='qcow2-luks'/>
--
2.31.1
6:35 a.m.
New subject: [PATCH 07/12] qemu: Remove VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN and associated code
There's no code which could set it any more so we can remove the
generators.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 29 +----------------------------
src/qemu/qemu_domain.c | 13 -------------
src/qemu/qemu_domain.h | 9 ---------
3 files changed, 1 insertion(+), 50 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 39659fe4f6..6e8699a3c6 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -760,28 +760,13 @@ qemuBuildObjectSecretCommandLine(virCommand *cmd,
* -1 and error message if fail to add secret information
*/
static int
-qemuBuildGeneralSecinfoURI(virURI *uri,
+qemuBuildGeneralSecinfoURI(virURI *uri G_GNUC_UNUSED,
qemuDomainSecretInfo *secinfo)
{
if (!secinfo)
return 0;
switch ((qemuDomainSecretInfoType) secinfo->type) {
- case VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN:
- if (secinfo->s.plain.secret) {
- if (!virStringBufferIsPrintable(secinfo->s.plain.secret,
- secinfo->s.plain.secretlen)) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("found non printable characters in secret"));
- return -1;
- }
- uri->user = g_strdup_printf("%s:%s",
secinfo->s.plain.username,
- secinfo->s.plain.secret);
- } else {
- uri->user = g_strdup(secinfo->s.plain.username);
- }
- break;
-
case VIR_DOMAIN_SECRET_INFO_TYPE_AES:
case VIR_DOMAIN_SECRET_INFO_TYPE_LAST:
return -1;
@@ -806,24 +791,12 @@ static int
qemuBuildRBDSecinfoURI(virBuffer *buf,
qemuDomainSecretInfo *secinfo)
{
- g_autofree char *base64secret = NULL;
-
if (!secinfo) {
virBufferAddLit(buf, ":auth_supported=none");
return 0;
}
switch ((qemuDomainSecretInfoType) secinfo->type) {
- case VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN:
- base64secret = g_base64_encode(secinfo->s.plain.secret,
- secinfo->s.plain.secretlen);
- virBufferEscape(buf, '\\', ":", ":id=%s",
secinfo->s.plain.username);
- virBufferEscape(buf, '\\', ":",
- ":key=%s:auth_supported=cephx\\;none",
- base64secret);
- virSecureEraseString(base64secret);
- break;
-
case VIR_DOMAIN_SECRET_INFO_TYPE_AES:
virBufferEscape(buf, '\\', ":",
":id=%s:auth_supported=cephx\\;none",
secinfo->s.aes.username);
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 73e69d1558..e9c1f3eacb 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -657,15 +657,6 @@ qemuDomainMasterKeyCreate(virDomainObj *vm)
}
-static void
-qemuDomainSecretPlainClear(struct _qemuDomainSecretPlain *secret)
-{
- VIR_FREE(secret->username);
- virSecureErase(secret->secret, secret->secretlen);
- g_clear_pointer(&secret->secret, g_free);
-}
-
-
static void
qemuDomainSecretAESClear(struct _qemuDomainSecretAES *secret,
bool keepAlias)
@@ -687,10 +678,6 @@ qemuDomainSecretInfoClear(qemuDomainSecretInfo *secinfo,
return;
switch ((qemuDomainSecretInfoType) secinfo->type) {
- case VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN:
- qemuDomainSecretPlainClear(&secinfo->s.plain);
- break;
-
case VIR_DOMAIN_SECRET_INFO_TYPE_AES:
qemuDomainSecretAESClear(&secinfo->s.aes, keepAlias);
break;
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 08f33f0f9e..cb5c665766 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -92,19 +92,11 @@ struct _qemuDomainUnpluggingDevice {
/* Type of domain secret */
typedef enum {
- VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN = 0,
VIR_DOMAIN_SECRET_INFO_TYPE_AES, /* utilize GNUTLS_CIPHER_AES_256_CBC */
VIR_DOMAIN_SECRET_INFO_TYPE_LAST
} qemuDomainSecretInfoType;
-typedef struct _qemuDomainSecretPlain qemuDomainSecretPlain;
-struct _qemuDomainSecretPlain {
- char *username;
- uint8_t *secret;
- size_t secretlen;
-};
-
#define QEMU_DOMAIN_AES_IV_LEN 16 /* 16 bytes for 128 bit random */
/* initialization vector */
typedef struct _qemuDomainSecretAES qemuDomainSecretAES;
@@ -119,7 +111,6 @@ typedef struct _qemuDomainSecretInfo qemuDomainSecretInfo;
struct _qemuDomainSecretInfo {
qemuDomainSecretInfoType type;
union {
- qemuDomainSecretPlain plain;
qemuDomainSecretAES aes;
} s;
};
--
2.31.1
6:35 a.m.
New subject: [PATCH 08/12] qemu: command: Remove qemuBuildGeneralSecinfoURI
After removal of plaintext secrets this function is a noop.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 38 +++-----------------------------------
1 file changed, 3 insertions(+), 35 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 6e8699a3c6..60b47573d5 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -748,34 +748,6 @@ qemuBuildObjectSecretCommandLine(virCommand *cmd,
}
-/* qemuBuildGeneralSecinfoURI:
- * @uri: Pointer to the URI structure to add to
- * @secinfo: Pointer to the secret info data (if present)
- *
- * If we have a secinfo, then build the command line options for
- * the secret info for the "general" case (somewhat a misnomer since
- * an iscsi disk is the only one with a secinfo).
- *
- * Returns 0 on success or if no secinfo,
- * -1 and error message if fail to add secret information
- */
-static int
-qemuBuildGeneralSecinfoURI(virURI *uri G_GNUC_UNUSED,
- qemuDomainSecretInfo *secinfo)
-{
- if (!secinfo)
- return 0;
-
- switch ((qemuDomainSecretInfoType) secinfo->type) {
- case VIR_DOMAIN_SECRET_INFO_TYPE_AES:
- case VIR_DOMAIN_SECRET_INFO_TYPE_LAST:
- return -1;
- }
-
- return 0;
-}
-
-
/* qemuBuildRBDSecinfoURI:
* @uri: Pointer to the URI structure to add to
* @secinfo: Pointer to the secret info data (if present)
@@ -891,8 +863,7 @@ qemuBuildTLSx509CommandLine(virCommand *cmd,
static char *
-qemuBuildNetworkDriveURI(virStorageSource *src,
- qemuDomainSecretInfo *secinfo)
+qemuBuildNetworkDriveURI(virStorageSource *src)
{
g_autoptr(virURI) uri = NULL;
@@ -902,9 +873,6 @@ qemuBuildNetworkDriveURI(virStorageSource *src,
if (src->hosts->socket)
uri->query = g_strdup_printf("socket=%s",
src->hosts->socket);
- if (qemuBuildGeneralSecinfoURI(uri, secinfo) < 0)
- return NULL;
-
return virURIFormat(uri);
}
@@ -965,7 +933,7 @@ qemuBuildNetworkDriveStr(virStorageSource *src,
return virBufferContentAndReset(&buf);
}
/* NBD code uses URI formatting scheme as others in some cases */
- ret = qemuBuildNetworkDriveURI(src, secinfo);
+ ret = qemuBuildNetworkDriveURI(src);
break;
case VIR_STORAGE_NET_PROTOCOL_HTTP:
@@ -975,7 +943,7 @@ qemuBuildNetworkDriveStr(virStorageSource *src,
case VIR_STORAGE_NET_PROTOCOL_TFTP:
case VIR_STORAGE_NET_PROTOCOL_ISCSI:
case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
- ret = qemuBuildNetworkDriveURI(src, secinfo);
+ ret = qemuBuildNetworkDriveURI(src);
break;
case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
--
2.31.1
6:35 a.m.
New subject: [PATCH 09/12] qemuBuildSCSIiSCSIHostdevDrvStr: Don't call qemuDiskSourceNeedsProps
It always returns true for iSCSI, so we can remove the fallback logic.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 60b47573d5..0b87719f75 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4501,24 +4501,12 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDef *dev)
g_autoptr(virJSONValue) srcprops = NULL;
virDomainHostdevSubsysSCSI *scsisrc = &dev->source.subsys.u.scsi;
virDomainHostdevSubsysSCSIiSCSI *iscsisrc = &scsisrc->u.iscsi;
- qemuDomainStorageSourcePrivate *srcPriv =
- QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(iscsisrc->src);
- if (qemuDiskSourceNeedsProps(iscsisrc->src)) {
- if (!(srcprops = qemuDiskSourceGetProps(iscsisrc->src)))
- return NULL;
- if (!(netsource = virQEMUBuildDriveCommandlineFromJSON(srcprops)))
- return NULL;
- virBufferAsprintf(&buf, "%s,if=none,format=raw", netsource);
- } else {
- /* Rather than pull what we think we want - use the network disk code */
- if (!(netsource = qemuBuildNetworkDriveStr(iscsisrc->src, srcPriv ?
- srcPriv->secinfo : NULL)))
- return NULL;
- virBufferAddLit(&buf, "file=");
- virQEMUBuildBufferEscapeComma(&buf, netsource);
- virBufferAddLit(&buf, ",if=none,format=raw");
- }
+ if (!(srcprops = qemuDiskSourceGetProps(iscsisrc->src)))
+ return NULL;
+ if (!(netsource = virQEMUBuildDriveCommandlineFromJSON(srcprops)))
+ return NULL;
+ virBufferAsprintf(&buf, "%s,if=none,format=raw", netsource);
return virBufferContentAndReset(&buf);
}
--
2.31.1
6:35 a.m.
New subject: [PATCH 10/12] qemu: Simplify qemuDomainSecretInfo
Now that we've removed support for plaintext secrets qemuDomainSecretInfo
can be simplified by removing the 'type' field and merging in all the
fields from 'qemuDomainSecretAES'.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_backup.c | 2 +-
src/qemu/qemu_block.c | 40 ++++++++++++----------------
src/qemu/qemu_command.c | 41 +++++++++++------------------
src/qemu/qemu_domain.c | 45 +++++++++-----------------------
src/qemu/qemu_domain.h | 20 +++-----------
src/qemu/qemu_hotplug.c | 4 +--
src/qemu/qemu_migration_params.c | 2 +-
tests/qemublocktest.c | 13 ++++-----
8 files changed, 56 insertions(+), 111 deletions(-)
diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
index 4f1e3b7bad..d7583e7399 100644
--- a/src/qemu/qemu_backup.c
+++ b/src/qemu/qemu_backup.c
@@ -723,7 +723,7 @@ qemuBackupBeginPrepareTLS(virDomainObj *vm,
if (qemuBuildSecretInfoProps(secinfo, tlsSecretProps) < 0)
return -1;
- tlsKeySecretAlias = secinfo->s.aes.alias;
+ tlsKeySecretAlias = secinfo->alias;
}
if (qemuBuildTLSx509BackendProps(cfg->backupTLSx509certdir, true,
diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 0bc92f6a23..393d3f44d7 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -746,12 +746,12 @@ qemuBlockStorageSourceGetCURLProps(virStorageSource *src,
if (!onlytarget) {
if (src->auth) {
username = src->auth->username;
- passwordalias = srcPriv->secinfo->s.aes.alias;
+ passwordalias = srcPriv->secinfo->alias;
}
if (srcPriv &&
srcPriv->httpcookie)
- cookiealias = srcPriv->httpcookie->s.aes.alias;
+ cookiealias = srcPriv->httpcookie->alias;
} else {
/* format target string along with cookies */
cookiestr = qemuBlockStorageSourceGetCookieString(src);
@@ -819,7 +819,7 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSource *src,
if (!onlytarget && src->auth) {
username = src->auth->username;
- objalias = srcPriv->secinfo->s.aes.alias;
+ objalias = srcPriv->secinfo->alias;
}
ignore_value(virJSONValueObjectCreate(&ret,
@@ -885,8 +885,8 @@ qemuBlockStorageSourceGetRBDProps(virStorageSource *src,
return NULL;
if (!onlytarget && src->auth) {
- username = srcPriv->secinfo->s.aes.username;
- keysecret = srcPriv->secinfo->s.aes.alias;
+ username = srcPriv->secinfo->username;
+ keysecret = srcPriv->secinfo->alias;
/* the auth modes are modelled after our old command line generator */
authmodes = virJSONValueNewArray();
@@ -1267,7 +1267,7 @@ qemuBlockStorageSourceGetFormatLUKSProps(virStorageSource *src,
{
qemuDomainStorageSourcePrivate *srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src);
- if (!srcPriv || !srcPriv->encinfo || !srcPriv->encinfo->s.aes.alias) {
+ if (!srcPriv || !srcPriv->encinfo || !srcPriv->encinfo->alias) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing secret info for 'luks' driver"));
return -1;
@@ -1275,7 +1275,7 @@ qemuBlockStorageSourceGetFormatLUKSProps(virStorageSource *src,
if (virJSONValueObjectAdd(props,
"s:driver", "luks",
- "s:key-secret",
srcPriv->encinfo->s.aes.alias,
+ "s:key-secret", srcPriv->encinfo->alias,
NULL) < 0)
return -1;
@@ -1313,14 +1313,9 @@ qemuBlockStorageSourceGetCryptoProps(virStorageSource *src,
*encprops = NULL;
- /* qemu requires encrypted secrets regardless of encryption method used when
- * passed using the blockdev infrastructure, thus only
- * VIR_DOMAIN_SECRET_INFO_TYPE_AES works here. The correct type needs to be
- * instantiated elsewhere. */
if (!src->encryption ||
!srcpriv ||
- !srcpriv->encinfo ||
- srcpriv->encinfo->type != VIR_DOMAIN_SECRET_INFO_TYPE_AES)
+ !srcpriv->encinfo)
return 0;
switch ((virStorageEncryptionFormatType) src->encryption->format) {
@@ -1342,7 +1337,7 @@ qemuBlockStorageSourceGetCryptoProps(virStorageSource *src,
return virJSONValueObjectCreate(encprops,
"s:format", encformat,
- "s:key-secret",
srcpriv->encinfo->s.aes.alias,
+ "s:key-secret",
srcpriv->encinfo->alias,
NULL);
}
@@ -1906,17 +1901,17 @@ qemuBlockStorageSourceDetachPrepare(virStorageSource *src,
data->tlsAlias = g_strdup(src->tlsAlias);
if (srcpriv) {
- if (srcpriv->secinfo && srcpriv->secinfo->type ==
VIR_DOMAIN_SECRET_INFO_TYPE_AES)
- data->authsecretAlias = g_strdup(srcpriv->secinfo->s.aes.alias);
+ if (srcpriv->secinfo)
+ data->authsecretAlias = g_strdup(srcpriv->secinfo->alias);
- if (srcpriv->encinfo && srcpriv->encinfo->type ==
VIR_DOMAIN_SECRET_INFO_TYPE_AES)
- data->encryptsecretAlias = g_strdup(srcpriv->encinfo->s.aes.alias);
+ if (srcpriv->encinfo)
+ data->encryptsecretAlias = g_strdup(srcpriv->encinfo->alias);
if (srcpriv->httpcookie)
- data->httpcookiesecretAlias =
g_strdup(srcpriv->httpcookie->s.aes.alias);
+ data->httpcookiesecretAlias = g_strdup(srcpriv->httpcookie->alias);
if (srcpriv->tlsKeySecret)
- data->tlsKeySecretAlias =
g_strdup(srcpriv->tlsKeySecret->s.aes.alias);
+ data->tlsKeySecretAlias = g_strdup(srcpriv->tlsKeySecret->alias);
}
return g_steal_pointer(&data);
@@ -2319,9 +2314,8 @@ qemuBlockStorageSourceCreateGetEncryptionLUKS(virStorageSource
*src,
const char *keysecret = NULL;
if (srcpriv &&
- srcpriv->encinfo &&
- srcpriv->encinfo->type == VIR_DOMAIN_SECRET_INFO_TYPE_AES)
- keysecret = srcpriv->encinfo->s.aes.alias;
+ srcpriv->encinfo)
+ keysecret = srcpriv->encinfo->alias;
if (virJSONValueObjectCreate(&props,
"s:key-secret", keysecret,
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 0b87719f75..5b738b230e 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -707,9 +707,9 @@ qemuBuildSecretInfoProps(qemuDomainSecretInfo *secinfo,
return -1;
return qemuMonitorCreateObjectProps(propsret, "secret",
- secinfo->s.aes.alias, "s:data",
- secinfo->s.aes.ciphertext,
"s:keyid",
- keyid, "s:iv", secinfo->s.aes.iv,
+ secinfo->alias, "s:data",
+ secinfo->ciphertext, "s:keyid",
+ keyid, "s:iv", secinfo->iv,
"s:format", "base64", NULL);
}
@@ -763,20 +763,11 @@ static int
qemuBuildRBDSecinfoURI(virBuffer *buf,
qemuDomainSecretInfo *secinfo)
{
- if (!secinfo) {
+ if (!secinfo)
virBufferAddLit(buf, ":auth_supported=none");
- return 0;
- }
-
- switch ((qemuDomainSecretInfoType) secinfo->type) {
- case VIR_DOMAIN_SECRET_INFO_TYPE_AES:
+ else
virBufferEscape(buf, '\\', ":",
":id=%s:auth_supported=cephx\\;none",
- secinfo->s.aes.username);
- break;
-
- case VIR_DOMAIN_SECRET_INFO_TYPE_LAST:
- return -1;
- }
+ secinfo->username);
return 0;
}
@@ -1264,8 +1255,8 @@ qemuBuildDriveSourceStr(virDomainDiskDef *disk,
virQEMUBuildBufferEscapeComma(buf, source);
- if (secinfo && secinfo->type == VIR_DOMAIN_SECRET_INFO_TYPE_AES)
- virBufferAsprintf(buf, ",file.password-secret=%s",
secinfo->s.aes.alias);
+ if (secinfo)
+ virBufferAsprintf(buf, ",file.password-secret=%s",
secinfo->alias);
if (disk->src->debug)
virBufferAsprintf(buf, ",file.debug=%d",
disk->src->debugLevel);
@@ -1282,12 +1273,12 @@ qemuBuildDriveSourceStr(virDomainDiskDef *disk,
if (encinfo) {
if (disk->src->format == VIR_STORAGE_FILE_RAW) {
- virBufferAsprintf(buf, "key-secret=%s,", encinfo->s.aes.alias);
+ virBufferAsprintf(buf, "key-secret=%s,", encinfo->alias);
rawluks = true;
} else if (disk->src->format == VIR_STORAGE_FILE_QCOW2 &&
disk->src->encryption->format ==
VIR_STORAGE_ENCRYPTION_FORMAT_LUKS) {
virBufferAddLit(buf, "encrypt.format=luks,");
- virBufferAsprintf(buf, "encrypt.key-secret=%s,",
encinfo->s.aes.alias);
+ virBufferAsprintf(buf, "encrypt.key-secret=%s,",
encinfo->alias);
}
}
@@ -4886,7 +4877,7 @@ qemuBuildChrChardevStr(virLogManager *logManager,
qemuCaps) < 0)
return NULL;
- tlsCertEncSecAlias = chrSourcePriv->secinfo->s.aes.alias;
+ tlsCertEncSecAlias = chrSourcePriv->secinfo->alias;
}
if (!(objalias = qemuAliasTLSObjFromSrcAlias(charAlias)))
@@ -5046,9 +5037,8 @@ qemuBuildHostdevSCSIDetachPrepare(virDomainHostdevDef *hostdev,
ret->storageNodeName = src->nodestorage;
ret->storageAttached = true;
- if (srcpriv && srcpriv->secinfo &&
- srcpriv->secinfo->type == VIR_DOMAIN_SECRET_INFO_TYPE_AES)
- ret->authsecretAlias = g_strdup(srcpriv->secinfo->s.aes.alias);
+ if (srcpriv && srcpriv->secinfo)
+ ret->authsecretAlias = g_strdup(srcpriv->secinfo->alias);
} else {
ret->driveAlias = qemuAliasFromHostdev(hostdev);
@@ -8012,7 +8002,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig *cfg,
gfxPriv->secinfo,
qemuCaps) < 0)
return -1;
- secretAlias = gfxPriv->secinfo->s.aes.alias;
+ secretAlias = gfxPriv->secinfo->alias;
}
if (qemuBuildTLSx509CommandLine(cmd,
@@ -10898,7 +10888,6 @@ qemuBuildStorageSourceAttachPrepareCommon(virStorageSource *src,
if (srcpriv) {
if (srcpriv->secinfo &&
- srcpriv->secinfo->type == VIR_DOMAIN_SECRET_INFO_TYPE_AES &&
qemuBuildSecretInfoProps(srcpriv->secinfo, &data->authsecretProps)
< 0)
return -1;
@@ -10914,7 +10903,7 @@ qemuBuildStorageSourceAttachPrepareCommon(virStorageSource *src,
if (qemuBuildSecretInfoProps(srcpriv->tlsKeySecret,
&data->tlsKeySecretProps) < 0)
return -1;
- tlsKeySecretAlias = srcpriv->tlsKeySecret->s.aes.alias;
+ tlsKeySecretAlias = srcpriv->tlsKeySecret->alias;
}
}
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index e9c1f3eacb..befe6bd476 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -657,19 +657,6 @@ qemuDomainMasterKeyCreate(virDomainObj *vm)
}
-static void
-qemuDomainSecretAESClear(struct _qemuDomainSecretAES *secret,
- bool keepAlias)
-{
- if (!keepAlias)
- VIR_FREE(secret->alias);
-
- VIR_FREE(secret->username);
- VIR_FREE(secret->iv);
- VIR_FREE(secret->ciphertext);
-}
-
-
static void
qemuDomainSecretInfoClear(qemuDomainSecretInfo *secinfo,
bool keepAlias)
@@ -677,14 +664,12 @@ qemuDomainSecretInfoClear(qemuDomainSecretInfo *secinfo,
if (!secinfo)
return;
- switch ((qemuDomainSecretInfoType) secinfo->type) {
- case VIR_DOMAIN_SECRET_INFO_TYPE_AES:
- qemuDomainSecretAESClear(&secinfo->s.aes, keepAlias);
- break;
+ if (!keepAlias)
+ VIR_FREE(secinfo->alias);
- case VIR_DOMAIN_SECRET_INFO_TYPE_LAST:
- break;
- }
+ VIR_FREE(secinfo->username);
+ VIR_FREE(secinfo->iv);
+ VIR_FREE(secinfo->ciphertext);
}
@@ -1106,9 +1091,8 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivate *priv,
secinfo = g_new0(qemuDomainSecretInfo, 1);
- secinfo->type = VIR_DOMAIN_SECRET_INFO_TYPE_AES;
- secinfo->s.aes.alias = g_strdup(alias);
- secinfo->s.aes.username = g_strdup(username);
+ secinfo->alias = g_strdup(alias);
+ secinfo->username = g_strdup(username);
raw_iv = g_new0(uint8_t, ivlen);
@@ -1117,7 +1101,7 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivate *priv,
return NULL;
/* Encode the IV and save that since qemu will need it */
- secinfo->s.aes.iv = g_base64_encode(raw_iv, ivlen);
+ secinfo->iv = g_base64_encode(raw_iv, ivlen);
if (virCryptoEncryptData(VIR_CRYPTO_CIPHER_AES256CBC,
priv->masterKey, QEMU_DOMAIN_MASTER_KEY_LEN,
@@ -1126,8 +1110,7 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivate *priv,
return NULL;
/* Now encode the ciphertext and store to be passed to qemu */
- secinfo->s.aes.ciphertext = g_base64_encode(ciphertext,
- ciphertextlen);
+ secinfo->ciphertext = g_base64_encode(ciphertext, ciphertextlen);
return g_steal_pointer(&secinfo);
}
@@ -1809,11 +1792,9 @@ qemuStorageSourcePrivateDataAssignSecinfo(qemuDomainSecretInfo
**secinfo,
if (!*secinfo) {
*secinfo = g_new0(qemuDomainSecretInfo, 1);
- (*secinfo)->type = VIR_DOMAIN_SECRET_INFO_TYPE_AES;
}
- if ((*secinfo)->type == VIR_DOMAIN_SECRET_INFO_TYPE_AES)
- (*secinfo)->s.aes.alias = g_steal_pointer(&*alias);
+ (*secinfo)->alias = g_steal_pointer(&*alias);
return 0;
}
@@ -1881,13 +1862,11 @@ qemuStorageSourcePrivateDataFormatSecinfo(virBuffer *buf,
qemuDomainSecretInfo *secinfo,
const char *type)
{
- if (!secinfo ||
- secinfo->type != VIR_DOMAIN_SECRET_INFO_TYPE_AES ||
- !secinfo->s.aes.alias)
+ if (!secinfo || !secinfo->alias)
return;
virBufferAsprintf(buf, "<secret type='%s'
alias='%s'/>\n",
- type, secinfo->s.aes.alias);
+ type, secinfo->alias);
}
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index cb5c665766..f8004efbb1 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -90,31 +90,17 @@ struct _qemuDomainUnpluggingDevice {
#define QEMU_DEVICE_MAPPER_CONTROL_PATH "/dev/mapper/control"
-/* Type of domain secret */
-typedef enum {
- VIR_DOMAIN_SECRET_INFO_TYPE_AES, /* utilize GNUTLS_CIPHER_AES_256_CBC */
-
- VIR_DOMAIN_SECRET_INFO_TYPE_LAST
-} qemuDomainSecretInfoType;
-
#define QEMU_DOMAIN_AES_IV_LEN 16 /* 16 bytes for 128 bit random */
/* initialization vector */
-typedef struct _qemuDomainSecretAES qemuDomainSecretAES;
-struct _qemuDomainSecretAES {
+
+typedef struct _qemuDomainSecretInfo qemuDomainSecretInfo;
+struct _qemuDomainSecretInfo {
char *username;
char *alias; /* generated alias for secret */
char *iv; /* base64 encoded initialization vector */
char *ciphertext; /* encoded/encrypted secret */
};
-typedef struct _qemuDomainSecretInfo qemuDomainSecretInfo;
-struct _qemuDomainSecretInfo {
- qemuDomainSecretInfoType type;
- union {
- qemuDomainSecretAES aes;
- } s;
-};
-
typedef struct _qemuDomainObjPrivate qemuDomainObjPrivate;
struct _qemuDomainObjPrivate {
virQEMUDriver *driver;
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 9c16ab4567..9b0dcf2629 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1846,7 +1846,7 @@ qemuDomainGetTLSObjects(virQEMUCaps *qemuCaps,
if (qemuBuildSecretInfoProps(secinfo, secProps) < 0)
return -1;
- secAlias = secinfo->s.aes.alias;
+ secAlias = secinfo->alias;
}
if (qemuBuildTLSx509BackendProps(tlsCertdir, tlsListen, tlsVerify,
@@ -1890,7 +1890,7 @@ qemuDomainAddChardevTLSObjects(virQEMUDriver *driver,
secinfo = chrSourcePriv->secinfo;
if (secinfo)
- *secAlias = secinfo->s.aes.alias;
+ *secAlias = secinfo->alias;
if (!(*tlsAlias = qemuAliasTLSObjFromSrcAlias(charAlias)))
goto cleanup;
diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index 018e62cf6e..88dba3b999 100644
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -955,7 +955,7 @@ qemuMigrationParamsEnableTLS(virQEMUDriver *driver,
qemuDomainSecretInfoTLSNew(priv, QEMU_MIGRATION_TLS_ALIAS_BASE,
cfg->migrateTLSx509secretUUID)))
return -1;
- secAlias = priv->migSecinfo->s.aes.alias;
+ secAlias = priv->migSecinfo->alias;
}
if (!(*tlsAlias = qemuAliasTLSObjFromSrcAlias(QEMU_MIGRATION_TLS_ALIAS_BASE)))
diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index 4af8862c5b..3e61e923a9 100644
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -235,19 +235,16 @@ testQemuDiskXMLToJSONFakeSecrets(virStorageSource *src)
if (src->auth) {
srcpriv->secinfo = g_new0(qemuDomainSecretInfo, 1);
- srcpriv->secinfo->type = VIR_DOMAIN_SECRET_INFO_TYPE_AES;
- srcpriv->secinfo->s.aes.username = g_strdup(src->auth->username);
-
- srcpriv->secinfo->s.aes.alias = g_strdup_printf("%s-secalias",
- NULLSTR(src->nodestorage));
+ srcpriv->secinfo->username = g_strdup(src->auth->username);
+ srcpriv->secinfo->alias = g_strdup_printf("%s-secalias",
+ NULLSTR(src->nodestorage));
}
if (src->encryption) {
srcpriv->encinfo = g_new0(qemuDomainSecretInfo, 1);
- srcpriv->encinfo->type = VIR_DOMAIN_SECRET_INFO_TYPE_AES;
- srcpriv->encinfo->s.aes.alias = g_strdup_printf("%s-encalias",
- NULLSTR(src->nodeformat));
+ srcpriv->encinfo->alias = g_strdup_printf("%s-encalias",
+ NULLSTR(src->nodeformat));
}
return 0;
--
2.31.1
6:35 a.m.
New subject: [PATCH 11/12] qemu: domain: Rename secrets setup function
Since there's just one type left, we can change the name to a more
generic one.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_domain.c | 70 +++++++++++++++++++++---------------------
1 file changed, 35 insertions(+), 35 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index befe6bd476..9a20938417 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1065,7 +1065,7 @@ qemuDomainVideoPrivateDispose(void *obj)
}
-/* qemuDomainSecretAESSetup:
+/* qemuDomainSecretInfoSetup:
* @priv: pointer to domain private object
* @alias: alias of the secret
* @username: username to use (may be NULL)
@@ -1077,11 +1077,11 @@ qemuDomainVideoPrivateDispose(void *obj)
* Returns qemuDomainSecretInfo *filled with the necessary information.
*/
static qemuDomainSecretInfo *
-qemuDomainSecretAESSetup(qemuDomainObjPrivate *priv,
- const char *alias,
- const char *username,
- uint8_t *secret,
- size_t secretlen)
+qemuDomainSecretInfoSetup(qemuDomainObjPrivate *priv,
+ const char *alias,
+ const char *username,
+ uint8_t *secret,
+ size_t secretlen)
{
g_autoptr(qemuDomainSecretInfo) secinfo = NULL;
g_autofree uint8_t *raw_iv = NULL;
@@ -1117,7 +1117,7 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivate *priv,
/**
- * qemuDomainSecretAESSetupFromSecret:
+ * qemuDomainSecretInfoSetupFromSecret:
* @priv: pointer to domain private object
* @srcalias: Alias of the disk/hostdev used to generate the secret alias
* @secretuse: specific usage for the secret (may be NULL if main object is using it)
@@ -1130,12 +1130,12 @@ qemuDomainSecretAESSetup(qemuDomainObjPrivate *priv,
* secret in case if @srcalias requires more secrets for various usage cases.
*/
static qemuDomainSecretInfo *
-qemuDomainSecretAESSetupFromSecret(qemuDomainObjPrivate *priv,
- const char *srcalias,
- const char *secretuse,
- virSecretUsageType usageType,
- const char *username,
- virSecretLookupTypeDef *seclookupdef)
+qemuDomainSecretInfoSetupFromSecret(qemuDomainObjPrivate *priv,
+ const char *srcalias,
+ const char *secretuse,
+ virSecretUsageType usageType,
+ const char *username,
+ virSecretLookupTypeDef *seclookupdef)
{
qemuDomainSecretInfo *secinfo;
g_autofree char *alias = qemuAliasForSecret(srcalias, secretuse);
@@ -1154,7 +1154,7 @@ qemuDomainSecretAESSetupFromSecret(qemuDomainObjPrivate *priv,
&secret, &secretlen) < 0)
return NULL;
- secinfo = qemuDomainSecretAESSetup(priv, alias, username, secret, secretlen);
+ secinfo = qemuDomainSecretInfoSetup(priv, alias, username, secret, secretlen);
virSecureErase(secret, secretlen);
@@ -1188,9 +1188,9 @@ qemuDomainSecretInfoTLSNew(qemuDomainObjPrivate *priv,
}
seclookupdef.type = VIR_SECRET_LOOKUP_TYPE_UUID;
- return qemuDomainSecretAESSetupFromSecret(priv, srcAlias, NULL,
- VIR_SECRET_USAGE_TYPE_TLS,
- NULL, &seclookupdef);
+ return qemuDomainSecretInfoSetupFromSecret(priv, srcAlias, NULL,
+ VIR_SECRET_USAGE_TYPE_TLS,
+ NULL, &seclookupdef);
}
@@ -1244,8 +1244,8 @@ qemuDomainSecretStorageSourcePrepareCookies(qemuDomainObjPrivate
*priv,
g_autofree char *secretalias = qemuAliasForSecret(aliasprotocol,
"httpcookie");
g_autofree char *cookies = qemuBlockStorageSourceGetCookieString(src);
- return qemuDomainSecretAESSetup(priv, secretalias, NULL,
- (uint8_t *) cookies, strlen(cookies));
+ return qemuDomainSecretInfoSetup(priv, secretalias, NULL,
+ (uint8_t *) cookies, strlen(cookies));
}
@@ -1287,20 +1287,20 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivate *priv,
if (src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD)
usageType = VIR_SECRET_USAGE_TYPE_CEPH;
- if (!(srcPriv->secinfo = qemuDomainSecretAESSetupFromSecret(priv,
aliasprotocol,
- "auth",
- usageType,
-
src->auth->username,
-
&src->auth->seclookupdef)))
+ if (!(srcPriv->secinfo = qemuDomainSecretInfoSetupFromSecret(priv,
aliasprotocol,
+ "auth",
+ usageType,
+
src->auth->username,
+
&src->auth->seclookupdef)))
return -1;
}
if (hasEnc) {
- if (!(srcPriv->encinfo = qemuDomainSecretAESSetupFromSecret(priv,
aliasformat,
-
"encryption",
-
VIR_SECRET_USAGE_TYPE_VOLUME,
- NULL,
-
&src->encryption->secrets[0]->seclookupdef)))
+ if (!(srcPriv->encinfo = qemuDomainSecretInfoSetupFromSecret(priv,
aliasformat,
+
"encryption",
+
VIR_SECRET_USAGE_TYPE_VOLUME,
+ NULL,
+
&src->encryption->secrets[0]->seclookupdef)))
return -1;
}
@@ -10740,12 +10740,12 @@ qemuDomainPrepareHostdev(virDomainHostdevDef *hostdev,
virSecretUsageType usageType = VIR_SECRET_USAGE_TYPE_ISCSI;
qemuDomainStorageSourcePrivate *srcPriv =
qemuDomainStorageSourcePrivateFetch(src);
- if (!(srcPriv->secinfo = qemuDomainSecretAESSetupFromSecret(priv,
-
backendalias,
- NULL,
- usageType,
-
src->auth->username,
-
&src->auth->seclookupdef)))
+ if (!(srcPriv->secinfo = qemuDomainSecretInfoSetupFromSecret(priv,
+
backendalias,
+ NULL,
+ usageType,
+
src->auth->username,
+
&src->auth->seclookupdef)))
return -1;
}
}
--
2.31.1
6:35 a.m.
New subject: [PATCH 12/12] qemu: command: Remove qemuBuildRBDSecinfoURI
Merge the code into the only caller.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 32 +++++---------------------------
1 file changed, 5 insertions(+), 27 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 5b738b230e..a051e5a4e8 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -748,31 +748,6 @@ qemuBuildObjectSecretCommandLine(virCommand *cmd,
}
-/* qemuBuildRBDSecinfoURI:
- * @uri: Pointer to the URI structure to add to
- * @secinfo: Pointer to the secret info data (if present)
- *
- * If we have a secinfo, then build the command line options for
- * the secret info for the RBD network storage. Assumption for this
- * is both username and secret exist for plaintext
- *
- * Returns 0 on success or if no secinfo,
- * -1 and error message if fail to add secret information
- */
-static int
-qemuBuildRBDSecinfoURI(virBuffer *buf,
- qemuDomainSecretInfo *secinfo)
-{
- if (!secinfo)
- virBufferAddLit(buf, ":auth_supported=none");
- else
- virBufferEscape(buf, '\\', ":",
":id=%s:auth_supported=cephx\\;none",
- secinfo->username);
-
- return 0;
-}
-
-
/* qemuBuildTLSx509BackendProps:
* @tlspath: path to the TLS credentials
* @listen: boolean listen for client or server setting
@@ -970,8 +945,11 @@ qemuBuildNetworkDriveStr(virStorageSource *src,
if (src->snapshot)
virBufferEscape(&buf, '\\', ":", "@%s",
src->snapshot);
- if (qemuBuildRBDSecinfoURI(&buf, secinfo) < 0)
- return NULL;
+ if (!secinfo)
+ virBufferAddLit(&buf, ":auth_supported=none");
+ else
+ virBufferEscape(&buf, '\\', ":",
":id=%s:auth_supported=cephx\\;none",
+ secinfo->username);
if (src->nhosts > 0) {
virBufferAddLit(&buf, ":mon_host=");
--
2.31.1
7:12 a.m.
On a Wednesday in 2021, Peter Krempa wrote:
We are at the point where we can remove all the code to pass secrets
(RBD/iSCSI authentication passwords) on the commandline in plaintext
as all supported versions of qemu now support -object secret and the
corresponding methods to pass the secrets securely.
Peter Krempa (12):
util: Remove use of virCryptoHaveCipher(VIR_CRYPTO_CIPHER_AES256CBC)
qemu: Always assume presence of QEMU_CAPS_OBJECT_SECRET
qemu: capabilities: Retire QEMU_CAPS_OBJECT_SECRET
qemu: domain: Remove qemuDomainSupportsEncryptedSecret
qemu: domain: Always assume QEMU_CAPS_ISCSI_PASSWORD_SECRET
qemu: capabilities: Retire QEMU_CAPS_ISCSI_PASSWORD_SECRET
qemu: Remove VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN and associated code
qemu: command: Remove qemuBuildGeneralSecinfoURI
qemuBuildSCSIiSCSIHostdevDrvStr: Don't call qemuDiskSourceNeedsProps
qemu: Simplify qemuDomainSecretInfo
qemu: domain: Rename secrets setup function
qemu: command: Remove qemuBuildRBDSecinfoURI
src/libvirt_private.syms | 1 -
src/qemu/qemu_backup.c | 2 +-
src/qemu/qemu_block.c | 40 ++-
src/qemu/qemu_capabilities.c | 6 +-
src/qemu/qemu_capabilities.h | 4 +-
src/qemu/qemu_command.c | 184 +++---------
src/qemu/qemu_domain.c | 274 ++++--------------
[...]
tests/qemuxml2argvdata/watchdog.args | 1 +
tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 1 +
tests/qemuxml2argvtest.c | 23 +-
tests/vircryptotest.c | 5 -
611 files changed, 710 insertions(+), 591 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
1157
days inactive
1157
days old
13 comments
2 participants
participants (2)
-
Ján Tomko -
Peter Krempa