8:41 a.m.
So, according to this report [1], Mesa enabled on-disk cache for its shaders
which it tries to create either under XDG_CACHE_HOME/mesa_shader_cache or under
HOME/.cache/mesa_shader_cache. Since libvirt doesn't set XDGs and HOME is only
passed iff the QEMU process isn't run with SUID, Mesa will default to the home
directory specified in /etc/passwd.
Because of this, Mesa will fail to create the cache and QEMU refuses to start
the VM (interestingly enough, Intel reports the problem too, but Mesa disables
the cache and the VM starts). This series proposes usage of XDG variables to
fix the problem by pointing XDG variables to hypervisor specific directory
under libvirt's libDir. Additionally, HOME is also enforced for all VM
processes and points to the base hypervisor libDir directory.
To illustrate this further:
system qemu:
HOME=/var/lib/libvirt/qemu/domain-5-f-live \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain-5-f-live/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain-5-f-live/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain-5-f-live/.config \
session qemu:
HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live \
XDG_DATA_HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live/.local/share \
XDG_CACHE_HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live/.cache \
XDG_CONFIG_HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live/.config \
[1] https://bugzilla.redhat.com/show_bug.cgi?id=1659484
Erik Skultety (3):
qemu: command: Introduce virCommandAddEnvXDG helper
qemu: Introduce qemuCommandEnvSetup helper
qemu: command: Override HOME variable for QEMU processes
src/libvirt_private.syms | 1 +
src/qemu/qemu_command.c | 26 ++++++++++++++++++-
src/qemu/qemu_command.h | 3 +++
src/util/vircommand.c | 21 +++++++++++++++
src/util/vircommand.h | 2 ++
.../aarch64-aavmf-virtio-mmio.args | 5 +++-
tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 5 +++-
.../aarch64-cpu-passthrough.args | 5 +++-
tests/qemuxml2argvdata/aarch64-gic-host.args | 5 +++-
.../aarch64-gic-none-tcg.args | 5 +++-
tests/qemuxml2argvdata/aarch64-gic-v2.args | 5 +++-
tests/qemuxml2argvdata/aarch64-gic-v3.args | 5 +++-
.../aarch64-kvm-32-on-64.args | 5 +++-
.../aarch64-noacpi-nouefi.args | 5 +++-
.../qemuxml2argvdata/aarch64-noacpi-uefi.args | 5 +++-
.../qemuxml2argvdata/aarch64-pci-serial.args | 5 +++-
.../aarch64-traditional-pci.args | 5 +++-
.../aarch64-usb-controller-nec-xhci.args | 5 +++-
.../aarch64-usb-controller-qemu-xhci.args | 5 +++-
.../aarch64-video-default.args | 5 +++-
.../aarch64-video-virtio-gpu-pci.args | 5 +++-
.../aarch64-virt-2.6-virtio-pci-default.args | 5 +++-
.../aarch64-virt-default-nic.args | 5 +++-
.../aarch64-virt-headless.aarch64-latest.args | 5 +++-
.../qemuxml2argvdata/aarch64-virt-virtio.args | 5 +++-
.../aarch64-virtio-pci-default.args | 5 +++-
.../aarch64-virtio-pci-manual-addresses.args | 5 +++-
tests/qemuxml2argvdata/acpi-table.args | 5 +++-
.../arm-vexpressa9-basic.args | 5 +++-
.../arm-vexpressa9-nodevs.args | 5 +++-
.../arm-vexpressa9-virtio.args | 5 +++-
tests/qemuxml2argvdata/arm-virt-virtio.args | 5 +++-
tests/qemuxml2argvdata/autoindex.args | 5 +++-
.../qemuxml2argvdata/balloon-ccw-deflate.args | 5 +++-
.../qemuxml2argvdata/balloon-device-auto.args | 5 +++-
.../balloon-device-deflate-off.args | 5 +++-
.../balloon-device-deflate.args | 5 +++-
.../balloon-device-period.args | 5 +++-
tests/qemuxml2argvdata/balloon-device.args | 5 +++-
.../balloon-mmio-deflate.args | 5 +++-
tests/qemuxml2argvdata/bios-nvram-secure.args | 5 +++-
tests/qemuxml2argvdata/bios-nvram.args | 5 +++-
tests/qemuxml2argvdata/bios.args | 5 +++-
.../blkdeviotune-group-num.args | 5 +++-
.../blkdeviotune-max-length.args | 5 +++-
tests/qemuxml2argvdata/blkdeviotune-max.args | 5 +++-
tests/qemuxml2argvdata/blkiotune-device.args | 5 +++-
tests/qemuxml2argvdata/blkiotune.args | 5 +++-
tests/qemuxml2argvdata/boot-cdrom.args | 5 +++-
tests/qemuxml2argvdata/boot-complex.args | 5 +++-
tests/qemuxml2argvdata/boot-floppy-q35.args | 5 +++-
tests/qemuxml2argvdata/boot-floppy.args | 5 +++-
.../boot-menu-disable-drive.args | 5 +++-
tests/qemuxml2argvdata/boot-menu-disable.args | 5 +++-
.../boot-menu-enable-with-timeout.args | 5 +++-
tests/qemuxml2argvdata/boot-menu-enable.args | 5 +++-
tests/qemuxml2argvdata/boot-multi.args | 5 +++-
tests/qemuxml2argvdata/boot-network.args | 5 +++-
tests/qemuxml2argvdata/boot-order.args | 5 +++-
tests/qemuxml2argvdata/boot-strict.args | 5 +++-
tests/qemuxml2argvdata/channel-guestfwd.args | 5 +++-
tests/qemuxml2argvdata/channel-spicevmc.args | 5 +++-
.../channel-unix-guestfwd.x86_64-2.5.0.args | 5 +++-
.../channel-unix-guestfwd.x86_64-latest.args | 5 +++-
.../qemuxml2argvdata/channel-virtio-auto.args | 5 +++-
.../channel-virtio-autoadd.args | 5 +++-
.../channel-virtio-autoassign.args | 5 +++-
.../channel-virtio-default.args | 5 +++-
.../channel-virtio-state.args | 5 +++-
.../qemuxml2argvdata/channel-virtio-unix.args | 5 +++-
tests/qemuxml2argvdata/channel-virtio.args | 5 +++-
tests/qemuxml2argvdata/chardev-reconnect.args | 5 +++-
tests/qemuxml2argvdata/clock-catchup.args | 5 +++-
tests/qemuxml2argvdata/clock-france.args | 5 +++-
tests/qemuxml2argvdata/clock-hpet-off.args | 5 +++-
.../clock-localtime-basis-localtime.args | 5 +++-
tests/qemuxml2argvdata/clock-localtime.args | 5 +++-
.../clock-timer-hyperv-rtc.args | 5 +++-
tests/qemuxml2argvdata/clock-utc.args | 5 +++-
tests/qemuxml2argvdata/clock-variable.args | 5 +++-
.../qemuxml2argvdata/console-compat-auto.args | 5 +++-
.../console-compat-chardev.args | 5 +++-
tests/qemuxml2argvdata/console-compat.args | 5 +++-
tests/qemuxml2argvdata/console-sclp.args | 5 +++-
.../qemuxml2argvdata/console-virtio-ccw.args | 5 +++-
.../qemuxml2argvdata/console-virtio-many.args | 5 +++-
.../qemuxml2argvdata/console-virtio-s390.args | 5 +++-
.../console-virtio-unix.x86_64-2.5.0.args | 5 +++-
.../console-virtio-unix.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/console-virtio.args | 5 +++-
tests/qemuxml2argvdata/controller-order.args | 5 +++-
.../controller-virtio-scsi.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 5 +++-
tests/qemuxml2argvdata/cpu-Haswell.args | 5 +++-
tests/qemuxml2argvdata/cpu-Haswell2.args | 5 +++-
tests/qemuxml2argvdata/cpu-Haswell3.args | 5 +++-
tests/qemuxml2argvdata/cpu-cache-disable.args | 5 +++-
.../qemuxml2argvdata/cpu-cache-disable2.args | 5 +++-
.../qemuxml2argvdata/cpu-cache-disable3.args | 5 +++-
.../cpu-cache-emulate-l3.args | 5 +++-
.../cpu-cache-passthrough.args | 5 +++-
.../cpu-cache-passthrough2.args | 5 +++-
.../cpu-check-default-none.args | 5 +++-
.../cpu-check-default-none2.args | 5 +++-
.../cpu-check-default-partial.args | 5 +++-
.../cpu-check-default-partial2.args | 5 +++-
tests/qemuxml2argvdata/cpu-check-none.args | 5 +++-
tests/qemuxml2argvdata/cpu-eoi-disabled.args | 5 +++-
tests/qemuxml2argvdata/cpu-eoi-enabled.args | 5 +++-
tests/qemuxml2argvdata/cpu-exact1.args | 5 +++-
.../cpu-exact2-nofallback.args | 5 +++-
tests/qemuxml2argvdata/cpu-exact2.args | 5 +++-
tests/qemuxml2argvdata/cpu-fallback.args | 5 +++-
tests/qemuxml2argvdata/cpu-host-kvmclock.args | 5 +++-
.../qemuxml2argvdata/cpu-host-model-cmt.args | 5 +++-
.../cpu-host-model-fallback.args | 5 +++-
.../cpu-host-model-vendor.args | 5 +++-
tests/qemuxml2argvdata/cpu-host-model.args | 5 +++-
.../cpu-host-passthrough-features.args | 5 +++-
.../cpu-host-passthrough.args | 5 +++-
.../qemuxml2argvdata/cpu-hotplug-startup.args | 5 +++-
tests/qemuxml2argvdata/cpu-kvmclock.args | 5 +++-
tests/qemuxml2argvdata/cpu-minimum1.args | 5 +++-
tests/qemuxml2argvdata/cpu-minimum2.args | 5 +++-
tests/qemuxml2argvdata/cpu-numa-disjoint.args | 5 +++-
.../qemuxml2argvdata/cpu-numa-memshared.args | 5 +++-
.../cpu-numa-no-memory-element.args | 5 +++-
tests/qemuxml2argvdata/cpu-numa1.args | 5 +++-
tests/qemuxml2argvdata/cpu-numa2.args | 5 +++-
tests/qemuxml2argvdata/cpu-s390-features.args | 5 +++-
tests/qemuxml2argvdata/cpu-s390-zEC12.args | 5 +++-
tests/qemuxml2argvdata/cpu-strict1.args | 5 +++-
tests/qemuxml2argvdata/cpu-topology1.args | 5 +++-
tests/qemuxml2argvdata/cpu-topology2.args | 5 +++-
tests/qemuxml2argvdata/cpu-topology3.args | 5 +++-
tests/qemuxml2argvdata/cpu-tsc-frequency.args | 5 +++-
tests/qemuxml2argvdata/cputune-numatune.args | 5 +++-
.../qemuxml2argvdata/cputune-zero-shares.args | 5 +++-
tests/qemuxml2argvdata/cputune.args | 5 +++-
tests/qemuxml2argvdata/debug-threads.args | 5 +++-
.../default-kvm-host-arch.args | 5 +++-
.../default-qemu-host-arch.args | 5 +++-
tests/qemuxml2argvdata/disk-aio.args | 5 +++-
.../disk-aio.x86_64-2.12.0.args | 5 +++-
.../disk-aio.x86_64-latest.args | 5 +++-
...-backing-chains-noindex.x86_64-2.12.0.args | 5 +++-
...-backing-chains-noindex.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-blockio.args | 5 +++-
tests/qemuxml2argvdata/disk-boot-cdrom.args | 5 +++-
tests/qemuxml2argvdata/disk-boot-disk.args | 5 +++-
.../disk-cache.x86_64-1.5.3.args | 5 +++-
.../disk-cache.x86_64-2.12.0.args | 5 +++-
.../disk-cache.x86_64-2.6.0.args | 5 +++-
.../disk-cache.x86_64-2.7.0.args | 5 +++-
.../disk-cache.x86_64-latest.args | 5 +++-
.../disk-cdrom-bus-other.x86_64-latest.args | 5 +++-
.../qemuxml2argvdata/disk-cdrom-network.args | 5 +++-
.../disk-cdrom-network.x86_64-2.12.0.args | 5 +++-
.../disk-cdrom-network.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-cdrom-tray.args | 5 +++-
.../disk-cdrom-tray.x86_64-2.12.0.args | 5 +++-
.../disk-cdrom-tray.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-cdrom.args | 5 +++-
.../disk-cdrom.x86_64-2.12.0.args | 5 +++-
.../disk-cdrom.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-copy_on_read.args | 5 +++-
.../disk-copy_on_read.x86_64-2.12.0.args | 5 +++-
.../disk-copy_on_read.x86_64-latest.args | 5 +++-
.../qemuxml2argvdata/disk-detect-zeroes.args | 5 +++-
.../disk-detect-zeroes.x86_64-2.12.0.args | 5 +++-
.../disk-detect-zeroes.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-discard.args | 5 +++-
tests/qemuxml2argvdata/disk-error-policy.args | 5 +++-
.../disk-error-policy.x86_64-2.12.0.args | 5 +++-
.../disk-error-policy.x86_64-latest.args | 5 +++-
.../disk-floppy-q35-2_11.x86_64-2.12.0.args | 5 +++-
.../disk-floppy-q35-2_11.x86_64-latest.args | 5 +++-
.../disk-floppy-q35-2_9.x86_64-2.12.0.args | 5 +++-
.../disk-floppy-q35-2_9.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-floppy-tray.args | 5 +++-
tests/qemuxml2argvdata/disk-floppy.args | 5 +++-
.../disk-floppy.x86_64-2.12.0.args | 5 +++-
.../disk-floppy.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-fmt-qcow.args | 5 +++-
tests/qemuxml2argvdata/disk-geometry.args | 5 +++-
...sk-hostdev-scsi-virtio-iscsi-auth-AES.args | 5 +++-
tests/qemuxml2argvdata/disk-ide-split.args | 5 +++-
tests/qemuxml2argvdata/disk-ide-wwn.args | 5 +++-
tests/qemuxml2argvdata/disk-ioeventfd.args | 5 +++-
tests/qemuxml2argvdata/disk-iscsi.args | 5 +++-
.../disk-network-gluster.args | 5 +++-
.../disk-network-gluster.x86_64-2.12.0.args | 5 +++-
.../disk-network-gluster.x86_64-latest.args | 5 +++-
.../disk-network-iscsi-modern.args | 5 +++-
.../qemuxml2argvdata/disk-network-iscsi.args | 5 +++-
.../disk-network-iscsi.x86_64-2.12.0.args | 5 +++-
.../disk-network-iscsi.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-network-nbd.args | 5 +++-
.../disk-network-nbd.x86_64-2.12.0.args | 5 +++-
.../disk-network-nbd.x86_64-latest.args | 5 +++-
.../disk-network-rbd.x86_64-2.12.0.args | 5 +++-
.../disk-network-rbd.x86_64-2.5.0.args | 5 +++-
.../disk-network-rbd.x86_64-latest.args | 5 +++-
.../disk-network-sheepdog.args | 5 +++-
.../disk-network-sheepdog.x86_64-2.12.0.args | 5 +++-
.../disk-network-sheepdog.x86_64-latest.args | 5 +++-
.../disk-network-source-auth.args | 5 +++-
...isk-network-source-auth.x86_64-2.12.0.args | 5 +++-
...isk-network-source-auth.x86_64-latest.args | 5 +++-
.../disk-network-tlsx509.args | 5 +++-
.../disk-network-tlsx509.x86_64-2.12.0.args | 5 +++-
.../disk-network-tlsx509.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-network-vxhs.args | 5 +++-
tests/qemuxml2argvdata/disk-no-boot.args | 5 +++-
tests/qemuxml2argvdata/disk-order.args | 5 +++-
.../qemuxml2argvdata/disk-readonly-disk.args | 5 +++-
.../disk-readonly-disk.x86_64-2.12.0.args | 5 +++-
.../disk-readonly-disk.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-sata-device.args | 5 +++-
.../disk-scsi-device-auto.x86_64-1.5.3.args | 5 +++-
.../disk-scsi-device-auto.x86_64-latest.args | 5 +++-
.../disk-scsi-disk-split.args | 5 +++-
.../qemuxml2argvdata/disk-scsi-disk-vpd.args | 5 +++-
.../qemuxml2argvdata/disk-scsi-disk-wwn.args | 5 +++-
.../disk-scsi-lun-passthrough.args | 5 +++-
.../disk-scsi.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-serial.args | 5 +++-
.../disk-shared.x86_64-2.12.0.args | 5 +++-
.../disk-shared.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-snapshot.args | 5 +++-
.../disk-source-pool-mode.args | 5 +++-
tests/qemuxml2argvdata/disk-source-pool.args | 5 +++-
.../disk-usb-device-removable.args | 5 +++-
tests/qemuxml2argvdata/disk-usb-device.args | 5 +++-
.../disk-virtio-ccw-many.args | 5 +++-
tests/qemuxml2argvdata/disk-virtio-ccw.args | 5 +++-
.../qemuxml2argvdata/disk-virtio-queues.args | 5 +++-
.../disk-virtio-s390-zpci.args | 5 +++-
tests/qemuxml2argvdata/disk-virtio-s390.args | 5 +++-
...irtio-scsi-reservations.x86_64-2.12.0.args | 5 +++-
...irtio-scsi-reservations.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-virtio.args | 5 +++-
.../encrypted-disk-usage.args | 5 +++-
tests/qemuxml2argvdata/encrypted-disk.args | 5 +++-
tests/qemuxml2argvdata/eoi-disabled.args | 5 +++-
tests/qemuxml2argvdata/eoi-enabled.args | 5 +++-
tests/qemuxml2argvdata/event_idx.args | 5 +++-
.../fd-memory-no-numa-topology.args | 5 +++-
.../fd-memory-numa-topology.args | 5 +++-
.../fd-memory-numa-topology2.args | 5 +++-
.../fd-memory-numa-topology3.args | 5 +++-
tests/qemuxml2argvdata/fips-enabled.args | 5 +++-
tests/qemuxml2argvdata/floppy-drive-fat.args | 5 +++-
.../floppy-drive-fat.x86_64-2.12.0.args | 5 +++-
.../floppy-drive-fat.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/fs9p-ccw.args | 5 +++-
tests/qemuxml2argvdata/fs9p.args | 5 +++-
.../genid-auto.x86_64-latest.args | 5 +++-
.../qemuxml2argvdata/genid.x86_64-latest.args | 5 +++-
...egl-headless-rendernode.x86_64-latest.args | 5 +++-
.../graphics-egl-headless.args | 5 +++-
.../graphics-egl-headless.x86_64-latest.args | 5 +++-
.../graphics-sdl-fullscreen.args | 5 +++-
tests/qemuxml2argvdata/graphics-sdl.args | 5 +++-
.../graphics-spice-agent-file-xfer.args | 5 +++-
.../graphics-spice-agentmouse.args | 5 +++-
.../graphics-spice-auto-socket-cfg.args | 5 +++-
.../graphics-spice-auto-socket.args | 5 +++-
.../graphics-spice-compression.args | 5 +++-
.../graphics-spice-egl-headless.args | 5 +++-
...pice-gl-auto-rendernode.x86_64-latest.args | 5 +++-
.../graphics-spice-no-args.args | 5 +++-
.../graphics-spice-qxl-vga.args | 5 +++-
.../qemuxml2argvdata/graphics-spice-sasl.args | 5 +++-
.../graphics-spice-socket.args | 5 +++-
.../graphics-spice-timeout.args | 5 +++-
.../graphics-spice-usb-redir.args | 5 +++-
tests/qemuxml2argvdata/graphics-spice.args | 5 +++-
.../graphics-vnc-auto-socket-cfg.args | 5 +++-
.../graphics-vnc-auto-socket.args | 5 +++-
.../graphics-vnc-egl-headless.args | 5 +++-
.../graphics-vnc-no-listen-attr.args | 5 +++-
tests/qemuxml2argvdata/graphics-vnc-none.args | 5 +++-
.../qemuxml2argvdata/graphics-vnc-policy.args | 5 +++-
.../graphics-vnc-remove-generated-socket.args | 5 +++-
tests/qemuxml2argvdata/graphics-vnc-sasl.args | 5 +++-
.../graphics-vnc-socket-new-cmdline.args | 5 +++-
.../qemuxml2argvdata/graphics-vnc-socket.args | 5 +++-
...graphics-vnc-tls-secret.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/graphics-vnc-tls.args | 5 +++-
.../graphics-vnc-tls.x86_64-2.4.0.args | 5 +++-
.../graphics-vnc-tls.x86_64-latest.args | 5 +++-
.../graphics-vnc-websocket.args | 5 +++-
tests/qemuxml2argvdata/graphics-vnc.args | 5 +++-
...play-spice-egl-headless.x86_64-latest.args | 5 +++-
...ev-display-spice-opengl.x86_64-latest.args | 5 +++-
...isplay-vnc-egl-headless.x86_64-latest.args | 5 +++-
...ostdev-mdev-display-vnc.x86_64-latest.args | 5 +++-
.../hostdev-mdev-precreated.args | 5 +++-
.../hostdev-pci-address-device.args | 5 +++-
.../qemuxml2argvdata/hostdev-pci-address.args | 5 +++-
.../hostdev-scsi-lsi-iscsi-auth.args | 5 +++-
.../hostdev-scsi-lsi-iscsi.args | 5 +++-
tests/qemuxml2argvdata/hostdev-scsi-lsi.args | 5 +++-
.../hostdev-scsi-readonly.args | 5 +++-
.../hostdev-scsi-vhost-scsi-ccw.args | 5 +++-
.../hostdev-scsi-vhost-scsi-pci.args | 5 +++-
.../hostdev-scsi-vhost-scsi-pcie.args | 5 +++-
.../hostdev-scsi-virtio-iscsi-auth.args | 5 +++-
.../hostdev-scsi-virtio-iscsi.args | 5 +++-
.../hostdev-scsi-virtio-scsi.args | 5 +++-
.../hostdev-subsys-mdev-vfio-ccw.args | 5 +++-
.../hostdev-usb-address-device-boot.args | 5 +++-
.../hostdev-usb-address-device.args | 5 +++-
.../qemuxml2argvdata/hostdev-usb-address.args | 5 +++-
.../hostdev-vfio-multidomain.args | 5 +++-
.../hostdev-vfio-zpci-autogenerate.args | 5 +++-
.../hostdev-vfio-zpci-boundaries.args | 5 +++-
.../hostdev-vfio-zpci-multidomain-many.args | 5 +++-
tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 5 +++-
tests/qemuxml2argvdata/hostdev-vfio.args | 5 +++-
tests/qemuxml2argvdata/hotplug-base.args | 5 +++-
.../hugepages-default-2M.args | 5 +++-
.../hugepages-default-system-size.args | 5 +++-
tests/qemuxml2argvdata/hugepages-default.args | 5 +++-
.../qemuxml2argvdata/hugepages-memaccess.args | 5 +++-
.../hugepages-memaccess2.args | 5 +++-
tests/qemuxml2argvdata/hugepages-nodeset.args | 5 +++-
.../hugepages-numa-default-2M.args | 5 +++-
.../hugepages-numa-default-dimm.args | 5 +++-
.../hugepages-numa-default.args | 5 +++-
.../hugepages-numa-nodeset-part.args | 5 +++-
.../hugepages-numa-nodeset.args | 5 +++-
.../hugepages-nvdimm.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/hugepages-shared.args | 5 +++-
tests/qemuxml2argvdata/hyperv-off.args | 5 +++-
tests/qemuxml2argvdata/hyperv-panic.args | 5 +++-
tests/qemuxml2argvdata/hyperv.args | 5 +++-
.../qemuxml2argvdata/input-usbmouse-addr.args | 5 +++-
tests/qemuxml2argvdata/input-usbmouse.args | 5 +++-
tests/qemuxml2argvdata/input-usbtablet.args | 5 +++-
tests/qemuxml2argvdata/input-virtio-ccw.args | 5 +++-
.../intel-iommu-caching-mode.args | 5 +++-
.../intel-iommu-device-iotlb.args | 5 +++-
tests/qemuxml2argvdata/intel-iommu-eim.args | 5 +++-
.../qemuxml2argvdata/intel-iommu-machine.args | 5 +++-
tests/qemuxml2argvdata/intel-iommu.args | 5 +++-
.../iothreads-disk-virtio-ccw.args | 5 +++-
tests/qemuxml2argvdata/iothreads-disk.args | 5 +++-
.../iothreads-ids-partial.args | 5 +++-
tests/qemuxml2argvdata/iothreads-ids.args | 5 +++-
...othreads-virtio-scsi-ccw.s390x-latest.args | 5 +++-
...threads-virtio-scsi-pci.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/iothreads.args | 5 +++-
tests/qemuxml2argvdata/kvm-features-off.args | 5 +++-
tests/qemuxml2argvdata/kvm-features.args | 5 +++-
tests/qemuxml2argvdata/kvm-pit-delay.args | 5 +++-
tests/qemuxml2argvdata/kvm-pit-discard.args | 5 +++-
.../kvmclock+eoi-disabled.args | 5 +++-
tests/qemuxml2argvdata/kvmclock.args | 5 +++-
.../launch-security-sev.x86_64-2.12.0.args | 5 +++-
.../luks-disks-source-qcow2.args | 5 +++-
tests/qemuxml2argvdata/luks-disks-source.args | 5 +++-
tests/qemuxml2argvdata/luks-disks.args | 5 +++-
.../mach-virt-console-virtio.args | 5 +++-
.../mach-virt-serial-native.args | 5 +++-
.../mach-virt-serial-pci.args | 5 +++-
.../mach-virt-serial-usb.args | 5 +++-
.../machine-aeskeywrap-off-cap.args | 5 +++-
.../machine-aeskeywrap-off-caps.args | 5 +++-
.../machine-aeskeywrap-on-cap.args | 5 +++-
.../machine-aeskeywrap-on-caps.args | 5 +++-
tests/qemuxml2argvdata/machine-aliases1.args | 5 +++-
tests/qemuxml2argvdata/machine-aliases2.args | 5 +++-
tests/qemuxml2argvdata/machine-core-off.args | 5 +++-
tests/qemuxml2argvdata/machine-core-on.args | 5 +++-
.../machine-deakeywrap-off-cap.args | 5 +++-
.../machine-deakeywrap-off-caps.args | 5 +++-
.../machine-deakeywrap-on-cap.args | 5 +++-
.../machine-deakeywrap-on-caps.args | 5 +++-
.../machine-keywrap-none-caps.args | 5 +++-
.../machine-keywrap-none.args | 5 +++-
...ine-loadparm-multiple-disks-nets-s390.args | 5 +++-
.../machine-loadparm-net-s390.args | 5 +++-
.../machine-loadparm-s390.args | 5 +++-
tests/qemuxml2argvdata/machine-smm-opt.args | 5 +++-
.../qemuxml2argvdata/machine-vmport-opt.args | 5 +++-
tests/qemuxml2argvdata/master-key.args | 5 +++-
.../memfd-memory-numa.x86_64-latest.args | 5 +++-
.../memory-hotplug-dimm-addr.args | 5 +++-
.../qemuxml2argvdata/memory-hotplug-dimm.args | 5 +++-
...y-hotplug-nvdimm-access.x86_64-latest.args | 5 +++-
...ry-hotplug-nvdimm-align.x86_64-latest.args | 5 +++-
...ry-hotplug-nvdimm-label.x86_64-latest.args | 5 +++-
...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 5 +++-
...hotplug-nvdimm-readonly.x86_64-latest.args | 5 +++-
.../memory-hotplug-nvdimm.x86_64-latest.args | 5 +++-
.../memory-hotplug-ppc64-nonuma.args | 5 +++-
tests/qemuxml2argvdata/memory-hotplug.args | 5 +++-
tests/qemuxml2argvdata/memtune-unlimited.args | 5 +++-
tests/qemuxml2argvdata/memtune.args | 5 +++-
.../migrate-numa-unaligned.args | 5 +++-
tests/qemuxml2argvdata/migrate.args | 5 +++-
.../minimal-msg-timestamp.args | 5 +++-
tests/qemuxml2argvdata/minimal-sandbox.args | 5 +++-
tests/qemuxml2argvdata/minimal.args | 5 +++-
tests/qemuxml2argvdata/misc-acpi.args | 5 +++-
tests/qemuxml2argvdata/misc-disable-s3.args | 5 +++-
.../misc-disable-suspends.args | 5 +++-
tests/qemuxml2argvdata/misc-enable-s4.args | 5 +++-
tests/qemuxml2argvdata/misc-no-reboot.args | 5 +++-
tests/qemuxml2argvdata/misc-uuid.args | 5 +++-
tests/qemuxml2argvdata/mlock-off.args | 5 +++-
tests/qemuxml2argvdata/mlock-on.args | 5 +++-
tests/qemuxml2argvdata/mlock-unsupported.args | 5 +++-
tests/qemuxml2argvdata/monitor-json.args | 5 +++-
.../multifunction-pci-device.args | 5 +++-
tests/qemuxml2argvdata/name-escape.args | 5 +++-
tests/qemuxml2argvdata/net-client.args | 5 +++-
tests/qemuxml2argvdata/net-eth-hostip.args | 5 +++-
tests/qemuxml2argvdata/net-eth-ifname.args | 5 +++-
tests/qemuxml2argvdata/net-eth-names.args | 5 +++-
tests/qemuxml2argvdata/net-eth.args | 5 +++-
.../net-hostdev-bootorder.args | 5 +++-
.../net-hostdev-multidomain.args | 5 +++-
.../net-hostdev-vfio-multidomain.args | 5 +++-
tests/qemuxml2argvdata/net-hostdev-vfio.args | 5 +++-
tests/qemuxml2argvdata/net-hostdev.args | 5 +++-
tests/qemuxml2argvdata/net-mcast.args | 5 +++-
tests/qemuxml2argvdata/net-server.args | 5 +++-
tests/qemuxml2argvdata/net-udp.args | 5 +++-
tests/qemuxml2argvdata/net-user-addr.args | 5 +++-
tests/qemuxml2argvdata/net-user.args | 5 +++-
.../net-vhostuser-multiq.args | 5 +++-
tests/qemuxml2argvdata/net-vhostuser.args | 5 +++-
.../net-vhostuser.x86_64-2.5.0.args | 5 +++-
.../net-vhostuser.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/net-virtio-ccw.args | 5 +++-
tests/qemuxml2argvdata/net-virtio-device.args | 5 +++-
.../net-virtio-disable-offloads.args | 5 +++-
tests/qemuxml2argvdata/net-virtio-netdev.args | 5 +++-
.../net-virtio-rxtxqueuesize.args | 5 +++-
tests/qemuxml2argvdata/net-virtio-s390.args | 5 +++-
tests/qemuxml2argvdata/net-virtio.args | 5 +++-
tests/qemuxml2argvdata/nosharepages.args | 5 +++-
.../numad-auto-memory-vcpu-cpuset.args | 5 +++-
...o-memory-vcpu-no-cpuset-and-placement.args | 5 +++-
.../numad-auto-vcpu-static-numatune.args | 5 +++-
.../numad-static-memory-auto-vcpu.args | 5 +++-
tests/qemuxml2argvdata/numad.args | 5 +++-
.../numatune-auto-nodeset-invalid.args | 5 +++-
.../numatune-auto-prefer.args | 5 +++-
.../qemuxml2argvdata/numatune-distances.args | 5 +++-
.../numatune-memnode-no-memory.args | 5 +++-
tests/qemuxml2argvdata/numatune-memnode.args | 5 +++-
tests/qemuxml2argvdata/numatune-memory.args | 5 +++-
.../qemuxml2argvdata/pages-dimm-discard.args | 5 +++-
.../pages-discard-hugepages.args | 5 +++-
tests/qemuxml2argvdata/pages-discard.args | 5 +++-
tests/qemuxml2argvdata/panic-double.args | 5 +++-
tests/qemuxml2argvdata/panic-no-address.args | 5 +++-
tests/qemuxml2argvdata/panic.args | 5 +++-
.../parallel-parport-chardev.args | 5 +++-
.../parallel-tcp-chardev.args | 5 +++-
.../parallel-unix-chardev.x86_64-2.5.0.args | 5 +++-
.../parallel-unix-chardev.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/pci-autoadd-addr.args | 5 +++-
tests/qemuxml2argvdata/pci-autoadd-idx.args | 5 +++-
tests/qemuxml2argvdata/pci-autofill-addr.args | 5 +++-
.../pci-bridge-many-disks.args | 5 +++-
tests/qemuxml2argvdata/pci-bridge.args | 5 +++-
tests/qemuxml2argvdata/pci-expander-bus.args | 5 +++-
tests/qemuxml2argvdata/pci-many.args | 5 +++-
tests/qemuxml2argvdata/pci-rom-disabled.args | 5 +++-
tests/qemuxml2argvdata/pci-rom.args | 5 +++-
.../pci-serial-dev-chardev.args | 5 +++-
tests/qemuxml2argvdata/pcie-expander-bus.args | 5 +++-
.../pcie-root-port-model-generic.args | 5 +++-
.../pcie-root-port-model-ioh3420.args | 5 +++-
tests/qemuxml2argvdata/pcie-root-port.args | 5 +++-
tests/qemuxml2argvdata/pcie-root.args | 5 +++-
.../pcie-switch-downstream-port.args | 5 +++-
.../pcie-switch-upstream-port.args | 5 +++-
tests/qemuxml2argvdata/pcihole64-q35.args | 5 +++-
tests/qemuxml2argvdata/pcihole64.args | 5 +++-
tests/qemuxml2argvdata/pmu-feature-off.args | 5 +++-
tests/qemuxml2argvdata/pmu-feature.args | 5 +++-
tests/qemuxml2argvdata/ppc-dtb.args | 5 +++-
.../ppc64-pseries-headless.ppc64-latest.args | 5 +++-
.../ppc64-usb-controller-legacy.args | 5 +++-
.../ppc64-usb-controller-qemu-xhci.args | 5 +++-
.../ppc64-usb-controller.args | 5 +++-
tests/qemuxml2argvdata/ppce500-serial.args | 5 +++-
tests/qemuxml2argvdata/pseries-basic.args | 5 +++-
.../pseries-console-virtio.args | 5 +++-
.../pseries-cpu-compat-power9.args | 5 +++-
.../qemuxml2argvdata/pseries-cpu-compat.args | 5 +++-
tests/qemuxml2argvdata/pseries-cpu-exact.args | 5 +++-
tests/qemuxml2argvdata/pseries-cpu-le.args | 5 +++-
tests/qemuxml2argvdata/pseries-features.args | 5 +++-
.../qemuxml2argvdata/pseries-hostdevs-1.args | 5 +++-
.../qemuxml2argvdata/pseries-hostdevs-2.args | 5 +++-
.../qemuxml2argvdata/pseries-hostdevs-3.args | 5 +++-
.../pseries-machine-max-cpu-compat.args | 5 +++-
.../pseries-many-buses-1.args | 5 +++-
.../pseries-many-buses-2.args | 5 +++-
.../pseries-many-devices.args | 5 +++-
tests/qemuxml2argvdata/pseries-nvram.args | 5 +++-
.../pseries-panic-missing.args | 5 +++-
.../pseries-panic-no-address.args | 5 +++-
.../pseries-phb-default-missing.args | 5 +++-
.../pseries-phb-numa-node.args | 5 +++-
.../qemuxml2argvdata/pseries-phb-simple.args | 5 +++-
.../pseries-serial-native.args | 5 +++-
.../qemuxml2argvdata/pseries-serial-pci.args | 5 +++-
.../qemuxml2argvdata/pseries-serial-usb.args | 5 +++-
.../qemuxml2argvdata/pseries-usb-default.args | 5 +++-
tests/qemuxml2argvdata/pseries-usb-kbd.args | 5 +++-
tests/qemuxml2argvdata/pseries-usb-multi.args | 5 +++-
.../pseries-vio-user-assigned.args | 5 +++-
tests/qemuxml2argvdata/pseries-vio.args | 5 +++-
.../pv-spinlock-disabled.args | 5 +++-
.../qemuxml2argvdata/pv-spinlock-enabled.args | 5 +++-
tests/qemuxml2argvdata/q35-acpi-nouefi.args | 5 +++-
tests/qemuxml2argvdata/q35-acpi-uefi.args | 5 +++-
.../q35-default-devices-only.args | 5 +++-
tests/qemuxml2argvdata/q35-multifunction.args | 5 +++-
tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 5 +++-
.../q35-pci-force-address.args | 5 +++-
tests/qemuxml2argvdata/q35-pcie-autoadd.args | 5 +++-
tests/qemuxml2argvdata/q35-pcie.args | 5 +++-
.../q35-pm-disable-fallback.args | 5 +++-
tests/qemuxml2argvdata/q35-pm-disable.args | 5 +++-
tests/qemuxml2argvdata/q35-usb2-multi.args | 5 +++-
tests/qemuxml2argvdata/q35-usb2-reorder.args | 5 +++-
tests/qemuxml2argvdata/q35-usb2.args | 5 +++-
.../q35-virt-manager-basic.args | 5 +++-
tests/qemuxml2argvdata/q35-virtio-pci.args | 5 +++-
tests/qemuxml2argvdata/q35.args | 5 +++-
tests/qemuxml2argvdata/qemu-ns-alt.args | 5 +++-
.../qemu-ns-commandline-ns0.args | 5 +++-
.../qemu-ns-commandline-ns1.args | 5 +++-
.../qemuxml2argvdata/qemu-ns-commandline.args | 5 +++-
.../qemu-ns-domain-commandline-ns0.args | 5 +++-
.../qemu-ns-domain-commandline.args | 5 +++-
.../qemuxml2argvdata/qemu-ns-domain-ns0.args | 5 +++-
tests/qemuxml2argvdata/qemu-ns-no-env.args | 5 +++-
tests/qemuxml2argvdata/qemu-ns.args | 5 +++-
.../reboot-timeout-disabled.args | 5 +++-
.../reboot-timeout-enabled.args | 5 +++-
tests/qemuxml2argvdata/restore-v2-fd.args | 5 +++-
tests/qemuxml2argvdata/restore-v2.args | 5 +++-
.../riscv64-virt-headless.riscv64-latest.args | 5 +++-
tests/qemuxml2argvdata/riscv64-virt-pci.args | 5 +++-
tests/qemuxml2argvdata/riscv64-virt.args | 5 +++-
.../s390-allow-bogus-usb-controller.args | 5 +++-
.../s390-allow-bogus-usb-none.args | 5 +++-
.../qemuxml2argvdata/s390-panic-missing.args | 5 +++-
.../s390-panic-no-address.args | 5 +++-
tests/qemuxml2argvdata/s390-serial-2.args | 5 +++-
.../qemuxml2argvdata/s390-serial-console.args | 5 +++-
tests/qemuxml2argvdata/s390-serial.args | 5 +++-
.../s390x-ccw-headless.s390x-latest.args | 5 +++-
tests/qemuxml2argvdata/seclabel-dac-none.args | 5 +++-
.../seclabel-dynamic-baselabel.args | 5 +++-
.../seclabel-dynamic-labelskip.args | 5 +++-
.../seclabel-dynamic-override.args | 5 +++-
.../seclabel-dynamic-relabel.args | 5 +++-
tests/qemuxml2argvdata/seclabel-dynamic.args | 5 +++-
tests/qemuxml2argvdata/seclabel-none.args | 5 +++-
.../seclabel-static-labelskip.args | 5 +++-
.../seclabel-static-relabel.args | 5 +++-
tests/qemuxml2argvdata/seclabel-static.args | 5 +++-
.../serial-dev-chardev-iobase.args | 5 +++-
.../qemuxml2argvdata/serial-dev-chardev.args | 5 +++-
.../qemuxml2argvdata/serial-file-chardev.args | 5 +++-
tests/qemuxml2argvdata/serial-file-log.args | 5 +++-
.../qemuxml2argvdata/serial-many-chardev.args | 5 +++-
.../qemuxml2argvdata/serial-pty-chardev.args | 5 +++-
.../serial-spiceport-nospice.args | 5 +++-
tests/qemuxml2argvdata/serial-spiceport.args | 5 +++-
.../qemuxml2argvdata/serial-tcp-chardev.args | 5 +++-
.../serial-tcp-telnet-chardev.args | 5 +++-
.../serial-tcp-tlsx509-chardev-notls.args | 5 +++-
.../serial-tcp-tlsx509-chardev-verify.args | 5 +++-
.../serial-tcp-tlsx509-chardev.args | 5 +++-
.../serial-tcp-tlsx509-secret-chardev.args | 5 +++-
.../qemuxml2argvdata/serial-udp-chardev.args | 5 +++-
.../qemuxml2argvdata/serial-unix-chardev.args | 5 +++-
.../serial-unix-chardev.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/serial-vc-chardev.args | 5 +++-
.../shmem-plain-doorbell.args | 5 +++-
tests/qemuxml2argvdata/shmem.args | 5 +++-
.../smartcard-controller.args | 5 +++-
.../smartcard-host-certificates-database.args | 5 +++-
.../smartcard-host-certificates.args | 5 +++-
tests/qemuxml2argvdata/smartcard-host.args | 5 +++-
.../smartcard-passthrough-spicevmc.args | 5 +++-
.../smartcard-passthrough-tcp.args | 5 +++-
...artcard-passthrough-unix.x86_64-2.5.0.args | 5 +++-
...rtcard-passthrough-unix.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/smbios.args | 5 +++-
tests/qemuxml2argvdata/smp.args | 5 +++-
tests/qemuxml2argvdata/sound-device.args | 5 +++-
tests/qemuxml2argvdata/sound.args | 5 +++-
.../tpm-emulator-tpm2.x86_64-latest.args | 5 +++-
.../tpm-emulator.x86_64-latest.args | 5 +++-
.../qemuxml2argvdata/tpm-passthrough-crb.args | 5 +++-
tests/qemuxml2argvdata/tpm-passthrough.args | 5 +++-
.../tseg-explicit-size.x86_64-latest.args | 5 +++-
.../usb-controller-default-q35.args | 5 +++-
.../usb-controller-explicit-q35.args | 5 +++-
.../usb-controller-qemu-xhci.args | 5 +++-
.../qemuxml2argvdata/usb-controller-xhci.args | 5 +++-
tests/qemuxml2argvdata/usb-controller.args | 5 +++-
.../usb-hub-autoadd-deluxe.args | 5 +++-
tests/qemuxml2argvdata/usb-hub-autoadd.args | 5 +++-
tests/qemuxml2argvdata/usb-hub.args | 5 +++-
.../qemuxml2argvdata/usb-ich9-autoassign.args | 5 +++-
.../qemuxml2argvdata/usb-ich9-companion.args | 5 +++-
.../qemuxml2argvdata/usb-ich9-ehci-addr.args | 5 +++-
.../qemuxml2argvdata/usb-long-port-path.args | 5 +++-
tests/qemuxml2argvdata/usb-none.args | 5 +++-
.../usb-piix3-controller.args | 5 +++-
.../qemuxml2argvdata/usb-port-autoassign.args | 5 +++-
tests/qemuxml2argvdata/usb-port-missing.args | 5 +++-
tests/qemuxml2argvdata/usb-ports.args | 5 +++-
tests/qemuxml2argvdata/usb-redir-boot.args | 5 +++-
.../usb-redir-filter-version.args | 5 +++-
tests/qemuxml2argvdata/usb-redir-filter.args | 5 +++-
.../usb-redir-unix.x86_64-2.5.0.args | 5 +++-
.../usb-redir-unix.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/usb-redir.args | 5 +++-
.../qemuxml2argvdata/usb-xhci-autoassign.args | 5 +++-
tests/qemuxml2argvdata/usb1-usb2.args | 5 +++-
tests/qemuxml2argvdata/user-aliases-usb.args | 5 +++-
tests/qemuxml2argvdata/user-aliases.args | 5 +++-
.../vcpu-placement-static.args | 5 +++-
.../vhost-vsock-auto.x86_64-latest.args | 5 +++-
.../vhost-vsock-ccw-auto.s390x-latest.args | 5 +++-
.../vhost-vsock-ccw.s390x-latest.args | 5 +++-
.../vhost-vsock.x86_64-latest.args | 5 +++-
.../video-device-pciaddr-default.args | 5 +++-
tests/qemuxml2argvdata/video-none-device.args | 5 +++-
.../video-qxl-device-vgamem.args | 5 +++-
...video-qxl-device-vram64.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/video-qxl-device.args | 5 +++-
tests/qemuxml2argvdata/video-qxl-heads.args | 5 +++-
.../qemuxml2argvdata/video-qxl-nodevice.args | 5 +++-
tests/qemuxml2argvdata/video-qxl-noheads.args | 5 +++-
.../video-qxl-sec-device-vgamem.args | 5 +++-
...o-qxl-sec-device-vram64.x86_64-latest.args | 5 +++-
.../video-qxl-sec-device.args | 5 +++-
.../video-vga-device-vgamem.args | 5 +++-
tests/qemuxml2argvdata/video-vga-device.args | 5 +++-
.../qemuxml2argvdata/video-vga-nodevice.args | 5 +++-
.../qemuxml2argvdata/video-vga-qxl-heads.args | 5 +++-
.../video-virtio-gpu-ccw.args | 5 +++-
.../video-virtio-gpu-device.args | 5 +++-
.../video-virtio-gpu-sdl-gl.args | 5 +++-
.../video-virtio-gpu-secondary.args | 5 +++-
.../video-virtio-gpu-spice-gl.args | 5 +++-
.../video-virtio-gpu-virgl.args | 5 +++-
tests/qemuxml2argvdata/video-virtio-vga.args | 5 +++-
.../virtio-input-passthrough.args | 5 +++-
tests/qemuxml2argvdata/virtio-input.args | 5 +++-
tests/qemuxml2argvdata/virtio-lun.args | 5 +++-
.../virtio-non-transitional.x86_64-3.1.0.args | 5 +++-
...virtio-non-transitional.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/virtio-options.args | 5 +++-
tests/qemuxml2argvdata/virtio-rng-ccw.args | 5 +++-
.../qemuxml2argvdata/virtio-rng-default.args | 5 +++-
.../virtio-rng-egd-unix.x86_64-2.5.0.args | 5 +++-
.../virtio-rng-egd-unix.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/virtio-rng-egd.args | 5 +++-
.../qemuxml2argvdata/virtio-rng-multiple.args | 5 +++-
tests/qemuxml2argvdata/virtio-rng-random.args | 5 +++-
.../virtio-transitional.x86_64-3.1.0.args | 5 +++-
.../virtio-transitional.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/vmcoreinfo.args | 5 +++-
tests/qemuxml2argvdata/watchdog-device.args | 5 +++-
tests/qemuxml2argvdata/watchdog-diag288.args | 5 +++-
tests/qemuxml2argvdata/watchdog-dump.args | 5 +++-
.../qemuxml2argvdata/watchdog-injectnmi.args | 5 +++-
tests/qemuxml2argvdata/watchdog.args | 5 +++-
tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 5 +++-
.../x86_64-pc-headless.x86_64-latest.args | 5 +++-
.../x86_64-q35-headless.x86_64-latest.args | 5 +++-
688 files changed, 2784 insertions(+), 684 deletions(-)
--
2.20.1
8:41 a.m.
New subject: [libvirt] [PATCH 1/3] qemu: command: Introduce virCommandAddEnvXDG helper
Some modules/libraries within QEMU could make use of the XDG_ vars when
writing their data to the disk. Define the most common XDG variables
and point them to the specific driver's libDir, i.e.
XDG_CACHE_HOME -> /var/lib/libvirt/<driver>/.cache
XDG_DATA_HOME -> /var/lib/libvirt/<driver>/.local/share
XDG_CONFIG_HOME -> /var/lib/libvirt/<driver>/.config
Signed-off-by: Erik Skultety <eskultet(a)redhat.com>
---
src/libvirt_private.syms | 1 +
src/qemu/qemu_command.c | 1 +
src/util/vircommand.c | 21 +++++++++++++++++++
src/util/vircommand.h | 2 ++
.../aarch64-aavmf-virtio-mmio.args | 3 +++
tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 3 +++
.../aarch64-cpu-passthrough.args | 3 +++
tests/qemuxml2argvdata/aarch64-gic-host.args | 3 +++
.../aarch64-gic-none-tcg.args | 3 +++
tests/qemuxml2argvdata/aarch64-gic-v2.args | 3 +++
tests/qemuxml2argvdata/aarch64-gic-v3.args | 3 +++
.../aarch64-kvm-32-on-64.args | 3 +++
.../aarch64-noacpi-nouefi.args | 3 +++
.../qemuxml2argvdata/aarch64-noacpi-uefi.args | 3 +++
.../qemuxml2argvdata/aarch64-pci-serial.args | 3 +++
.../aarch64-traditional-pci.args | 3 +++
.../aarch64-usb-controller-nec-xhci.args | 3 +++
.../aarch64-usb-controller-qemu-xhci.args | 3 +++
.../aarch64-video-default.args | 3 +++
.../aarch64-video-virtio-gpu-pci.args | 3 +++
.../aarch64-virt-2.6-virtio-pci-default.args | 3 +++
.../aarch64-virt-default-nic.args | 3 +++
.../aarch64-virt-headless.aarch64-latest.args | 3 +++
.../qemuxml2argvdata/aarch64-virt-virtio.args | 3 +++
.../aarch64-virtio-pci-default.args | 3 +++
.../aarch64-virtio-pci-manual-addresses.args | 3 +++
tests/qemuxml2argvdata/acpi-table.args | 3 +++
.../arm-vexpressa9-basic.args | 3 +++
.../arm-vexpressa9-nodevs.args | 3 +++
.../arm-vexpressa9-virtio.args | 3 +++
tests/qemuxml2argvdata/arm-virt-virtio.args | 3 +++
tests/qemuxml2argvdata/autoindex.args | 3 +++
.../qemuxml2argvdata/balloon-ccw-deflate.args | 3 +++
.../qemuxml2argvdata/balloon-device-auto.args | 3 +++
.../balloon-device-deflate-off.args | 3 +++
.../balloon-device-deflate.args | 3 +++
.../balloon-device-period.args | 3 +++
tests/qemuxml2argvdata/balloon-device.args | 3 +++
.../balloon-mmio-deflate.args | 3 +++
tests/qemuxml2argvdata/bios-nvram-secure.args | 3 +++
tests/qemuxml2argvdata/bios-nvram.args | 3 +++
tests/qemuxml2argvdata/bios.args | 3 +++
.../blkdeviotune-group-num.args | 3 +++
.../blkdeviotune-max-length.args | 3 +++
tests/qemuxml2argvdata/blkdeviotune-max.args | 3 +++
tests/qemuxml2argvdata/blkiotune-device.args | 3 +++
tests/qemuxml2argvdata/blkiotune.args | 3 +++
tests/qemuxml2argvdata/boot-cdrom.args | 3 +++
tests/qemuxml2argvdata/boot-complex.args | 3 +++
tests/qemuxml2argvdata/boot-floppy-q35.args | 3 +++
tests/qemuxml2argvdata/boot-floppy.args | 3 +++
.../boot-menu-disable-drive.args | 3 +++
tests/qemuxml2argvdata/boot-menu-disable.args | 3 +++
.../boot-menu-enable-with-timeout.args | 3 +++
tests/qemuxml2argvdata/boot-menu-enable.args | 3 +++
tests/qemuxml2argvdata/boot-multi.args | 3 +++
tests/qemuxml2argvdata/boot-network.args | 3 +++
tests/qemuxml2argvdata/boot-order.args | 3 +++
tests/qemuxml2argvdata/boot-strict.args | 3 +++
tests/qemuxml2argvdata/channel-guestfwd.args | 3 +++
tests/qemuxml2argvdata/channel-spicevmc.args | 3 +++
.../channel-unix-guestfwd.x86_64-2.5.0.args | 3 +++
.../channel-unix-guestfwd.x86_64-latest.args | 3 +++
.../qemuxml2argvdata/channel-virtio-auto.args | 3 +++
.../channel-virtio-autoadd.args | 3 +++
.../channel-virtio-autoassign.args | 3 +++
.../channel-virtio-default.args | 3 +++
.../channel-virtio-state.args | 3 +++
.../qemuxml2argvdata/channel-virtio-unix.args | 3 +++
tests/qemuxml2argvdata/channel-virtio.args | 3 +++
tests/qemuxml2argvdata/chardev-reconnect.args | 3 +++
tests/qemuxml2argvdata/clock-catchup.args | 3 +++
tests/qemuxml2argvdata/clock-france.args | 3 +++
tests/qemuxml2argvdata/clock-hpet-off.args | 3 +++
.../clock-localtime-basis-localtime.args | 3 +++
tests/qemuxml2argvdata/clock-localtime.args | 3 +++
.../clock-timer-hyperv-rtc.args | 3 +++
tests/qemuxml2argvdata/clock-utc.args | 3 +++
tests/qemuxml2argvdata/clock-variable.args | 3 +++
.../qemuxml2argvdata/console-compat-auto.args | 3 +++
.../console-compat-chardev.args | 3 +++
tests/qemuxml2argvdata/console-compat.args | 3 +++
tests/qemuxml2argvdata/console-sclp.args | 3 +++
.../qemuxml2argvdata/console-virtio-ccw.args | 3 +++
.../qemuxml2argvdata/console-virtio-many.args | 3 +++
.../qemuxml2argvdata/console-virtio-s390.args | 3 +++
.../console-virtio-unix.x86_64-2.5.0.args | 3 +++
.../console-virtio-unix.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/console-virtio.args | 3 +++
tests/qemuxml2argvdata/controller-order.args | 3 +++
.../controller-virtio-scsi.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 3 +++
tests/qemuxml2argvdata/cpu-Haswell.args | 3 +++
tests/qemuxml2argvdata/cpu-Haswell2.args | 3 +++
tests/qemuxml2argvdata/cpu-Haswell3.args | 3 +++
tests/qemuxml2argvdata/cpu-cache-disable.args | 3 +++
.../qemuxml2argvdata/cpu-cache-disable2.args | 3 +++
.../qemuxml2argvdata/cpu-cache-disable3.args | 3 +++
.../cpu-cache-emulate-l3.args | 3 +++
.../cpu-cache-passthrough.args | 3 +++
.../cpu-cache-passthrough2.args | 3 +++
.../cpu-check-default-none.args | 3 +++
.../cpu-check-default-none2.args | 3 +++
.../cpu-check-default-partial.args | 3 +++
.../cpu-check-default-partial2.args | 3 +++
tests/qemuxml2argvdata/cpu-check-none.args | 3 +++
tests/qemuxml2argvdata/cpu-eoi-disabled.args | 3 +++
tests/qemuxml2argvdata/cpu-eoi-enabled.args | 3 +++
tests/qemuxml2argvdata/cpu-exact1.args | 3 +++
.../cpu-exact2-nofallback.args | 3 +++
tests/qemuxml2argvdata/cpu-exact2.args | 3 +++
tests/qemuxml2argvdata/cpu-fallback.args | 3 +++
tests/qemuxml2argvdata/cpu-host-kvmclock.args | 3 +++
.../qemuxml2argvdata/cpu-host-model-cmt.args | 3 +++
.../cpu-host-model-fallback.args | 3 +++
.../cpu-host-model-vendor.args | 3 +++
tests/qemuxml2argvdata/cpu-host-model.args | 3 +++
.../cpu-host-passthrough-features.args | 3 +++
.../cpu-host-passthrough.args | 3 +++
.../qemuxml2argvdata/cpu-hotplug-startup.args | 3 +++
tests/qemuxml2argvdata/cpu-kvmclock.args | 3 +++
tests/qemuxml2argvdata/cpu-minimum1.args | 3 +++
tests/qemuxml2argvdata/cpu-minimum2.args | 3 +++
tests/qemuxml2argvdata/cpu-numa-disjoint.args | 3 +++
.../qemuxml2argvdata/cpu-numa-memshared.args | 3 +++
.../cpu-numa-no-memory-element.args | 3 +++
tests/qemuxml2argvdata/cpu-numa1.args | 3 +++
tests/qemuxml2argvdata/cpu-numa2.args | 3 +++
tests/qemuxml2argvdata/cpu-s390-features.args | 3 +++
tests/qemuxml2argvdata/cpu-s390-zEC12.args | 3 +++
tests/qemuxml2argvdata/cpu-strict1.args | 3 +++
tests/qemuxml2argvdata/cpu-topology1.args | 3 +++
tests/qemuxml2argvdata/cpu-topology2.args | 3 +++
tests/qemuxml2argvdata/cpu-topology3.args | 3 +++
tests/qemuxml2argvdata/cpu-tsc-frequency.args | 3 +++
tests/qemuxml2argvdata/cputune-numatune.args | 3 +++
.../qemuxml2argvdata/cputune-zero-shares.args | 3 +++
tests/qemuxml2argvdata/cputune.args | 3 +++
tests/qemuxml2argvdata/debug-threads.args | 3 +++
.../default-kvm-host-arch.args | 3 +++
.../default-qemu-host-arch.args | 3 +++
tests/qemuxml2argvdata/disk-aio.args | 3 +++
.../disk-aio.x86_64-2.12.0.args | 3 +++
.../disk-aio.x86_64-latest.args | 3 +++
...-backing-chains-noindex.x86_64-2.12.0.args | 3 +++
...-backing-chains-noindex.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/disk-blockio.args | 3 +++
tests/qemuxml2argvdata/disk-boot-cdrom.args | 3 +++
tests/qemuxml2argvdata/disk-boot-disk.args | 3 +++
.../disk-cache.x86_64-1.5.3.args | 3 +++
.../disk-cache.x86_64-2.12.0.args | 3 +++
.../disk-cache.x86_64-2.6.0.args | 3 +++
.../disk-cache.x86_64-2.7.0.args | 3 +++
.../disk-cache.x86_64-latest.args | 3 +++
.../disk-cdrom-bus-other.x86_64-latest.args | 3 +++
.../qemuxml2argvdata/disk-cdrom-network.args | 3 +++
.../disk-cdrom-network.x86_64-2.12.0.args | 3 +++
.../disk-cdrom-network.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/disk-cdrom-tray.args | 3 +++
.../disk-cdrom-tray.x86_64-2.12.0.args | 3 +++
.../disk-cdrom-tray.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/disk-cdrom.args | 3 +++
.../disk-cdrom.x86_64-2.12.0.args | 3 +++
.../disk-cdrom.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/disk-copy_on_read.args | 3 +++
.../disk-copy_on_read.x86_64-2.12.0.args | 3 +++
.../disk-copy_on_read.x86_64-latest.args | 3 +++
.../qemuxml2argvdata/disk-detect-zeroes.args | 3 +++
.../disk-detect-zeroes.x86_64-2.12.0.args | 3 +++
.../disk-detect-zeroes.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/disk-discard.args | 3 +++
tests/qemuxml2argvdata/disk-error-policy.args | 3 +++
.../disk-error-policy.x86_64-2.12.0.args | 3 +++
.../disk-error-policy.x86_64-latest.args | 3 +++
.../disk-floppy-q35-2_11.x86_64-2.12.0.args | 3 +++
.../disk-floppy-q35-2_11.x86_64-latest.args | 3 +++
.../disk-floppy-q35-2_9.x86_64-2.12.0.args | 3 +++
.../disk-floppy-q35-2_9.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/disk-floppy-tray.args | 3 +++
tests/qemuxml2argvdata/disk-floppy.args | 3 +++
.../disk-floppy.x86_64-2.12.0.args | 3 +++
.../disk-floppy.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/disk-fmt-qcow.args | 3 +++
tests/qemuxml2argvdata/disk-geometry.args | 3 +++
...sk-hostdev-scsi-virtio-iscsi-auth-AES.args | 3 +++
tests/qemuxml2argvdata/disk-ide-split.args | 3 +++
tests/qemuxml2argvdata/disk-ide-wwn.args | 3 +++
tests/qemuxml2argvdata/disk-ioeventfd.args | 3 +++
tests/qemuxml2argvdata/disk-iscsi.args | 3 +++
.../disk-network-gluster.args | 3 +++
.../disk-network-gluster.x86_64-2.12.0.args | 3 +++
.../disk-network-gluster.x86_64-latest.args | 3 +++
.../disk-network-iscsi-modern.args | 3 +++
.../qemuxml2argvdata/disk-network-iscsi.args | 3 +++
.../disk-network-iscsi.x86_64-2.12.0.args | 3 +++
.../disk-network-iscsi.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/disk-network-nbd.args | 3 +++
.../disk-network-nbd.x86_64-2.12.0.args | 3 +++
.../disk-network-nbd.x86_64-latest.args | 3 +++
.../disk-network-rbd.x86_64-2.12.0.args | 3 +++
.../disk-network-rbd.x86_64-2.5.0.args | 3 +++
.../disk-network-rbd.x86_64-latest.args | 3 +++
.../disk-network-sheepdog.args | 3 +++
.../disk-network-sheepdog.x86_64-2.12.0.args | 3 +++
.../disk-network-sheepdog.x86_64-latest.args | 3 +++
.../disk-network-source-auth.args | 3 +++
...isk-network-source-auth.x86_64-2.12.0.args | 3 +++
...isk-network-source-auth.x86_64-latest.args | 3 +++
.../disk-network-tlsx509.args | 3 +++
.../disk-network-tlsx509.x86_64-2.12.0.args | 3 +++
.../disk-network-tlsx509.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/disk-network-vxhs.args | 3 +++
tests/qemuxml2argvdata/disk-no-boot.args | 3 +++
tests/qemuxml2argvdata/disk-order.args | 3 +++
.../qemuxml2argvdata/disk-readonly-disk.args | 3 +++
.../disk-readonly-disk.x86_64-2.12.0.args | 3 +++
.../disk-readonly-disk.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/disk-sata-device.args | 3 +++
.../disk-scsi-device-auto.x86_64-1.5.3.args | 3 +++
.../disk-scsi-device-auto.x86_64-latest.args | 3 +++
.../disk-scsi-disk-split.args | 3 +++
.../qemuxml2argvdata/disk-scsi-disk-vpd.args | 3 +++
.../qemuxml2argvdata/disk-scsi-disk-wwn.args | 3 +++
.../disk-scsi-lun-passthrough.args | 3 +++
.../disk-scsi.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/disk-serial.args | 3 +++
.../disk-shared.x86_64-2.12.0.args | 3 +++
.../disk-shared.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/disk-snapshot.args | 3 +++
.../disk-source-pool-mode.args | 3 +++
tests/qemuxml2argvdata/disk-source-pool.args | 3 +++
.../disk-usb-device-removable.args | 3 +++
tests/qemuxml2argvdata/disk-usb-device.args | 3 +++
.../disk-virtio-ccw-many.args | 3 +++
tests/qemuxml2argvdata/disk-virtio-ccw.args | 3 +++
.../qemuxml2argvdata/disk-virtio-queues.args | 3 +++
.../disk-virtio-s390-zpci.args | 3 +++
tests/qemuxml2argvdata/disk-virtio-s390.args | 3 +++
...irtio-scsi-reservations.x86_64-2.12.0.args | 3 +++
...irtio-scsi-reservations.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/disk-virtio.args | 3 +++
.../encrypted-disk-usage.args | 3 +++
tests/qemuxml2argvdata/encrypted-disk.args | 3 +++
tests/qemuxml2argvdata/eoi-disabled.args | 3 +++
tests/qemuxml2argvdata/eoi-enabled.args | 3 +++
tests/qemuxml2argvdata/event_idx.args | 3 +++
.../fd-memory-no-numa-topology.args | 3 +++
.../fd-memory-numa-topology.args | 3 +++
.../fd-memory-numa-topology2.args | 3 +++
.../fd-memory-numa-topology3.args | 3 +++
tests/qemuxml2argvdata/fips-enabled.args | 3 +++
tests/qemuxml2argvdata/floppy-drive-fat.args | 3 +++
.../floppy-drive-fat.x86_64-2.12.0.args | 3 +++
.../floppy-drive-fat.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/fs9p-ccw.args | 3 +++
tests/qemuxml2argvdata/fs9p.args | 3 +++
.../genid-auto.x86_64-latest.args | 3 +++
.../qemuxml2argvdata/genid.x86_64-latest.args | 3 +++
...egl-headless-rendernode.x86_64-latest.args | 3 +++
.../graphics-egl-headless.args | 3 +++
.../graphics-egl-headless.x86_64-latest.args | 3 +++
.../graphics-sdl-fullscreen.args | 3 +++
tests/qemuxml2argvdata/graphics-sdl.args | 3 +++
.../graphics-spice-agent-file-xfer.args | 3 +++
.../graphics-spice-agentmouse.args | 3 +++
.../graphics-spice-auto-socket-cfg.args | 3 +++
.../graphics-spice-auto-socket.args | 3 +++
.../graphics-spice-compression.args | 3 +++
.../graphics-spice-egl-headless.args | 3 +++
...pice-gl-auto-rendernode.x86_64-latest.args | 3 +++
.../graphics-spice-no-args.args | 3 +++
.../graphics-spice-qxl-vga.args | 3 +++
.../qemuxml2argvdata/graphics-spice-sasl.args | 3 +++
.../graphics-spice-socket.args | 3 +++
.../graphics-spice-timeout.args | 3 +++
.../graphics-spice-usb-redir.args | 3 +++
tests/qemuxml2argvdata/graphics-spice.args | 3 +++
.../graphics-vnc-auto-socket-cfg.args | 3 +++
.../graphics-vnc-auto-socket.args | 3 +++
.../graphics-vnc-egl-headless.args | 3 +++
.../graphics-vnc-no-listen-attr.args | 3 +++
tests/qemuxml2argvdata/graphics-vnc-none.args | 3 +++
.../qemuxml2argvdata/graphics-vnc-policy.args | 3 +++
.../graphics-vnc-remove-generated-socket.args | 3 +++
tests/qemuxml2argvdata/graphics-vnc-sasl.args | 3 +++
.../graphics-vnc-socket-new-cmdline.args | 3 +++
.../qemuxml2argvdata/graphics-vnc-socket.args | 3 +++
...graphics-vnc-tls-secret.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/graphics-vnc-tls.args | 3 +++
.../graphics-vnc-tls.x86_64-2.4.0.args | 3 +++
.../graphics-vnc-tls.x86_64-latest.args | 3 +++
.../graphics-vnc-websocket.args | 3 +++
tests/qemuxml2argvdata/graphics-vnc.args | 3 +++
...play-spice-egl-headless.x86_64-latest.args | 3 +++
...ev-display-spice-opengl.x86_64-latest.args | 3 +++
...isplay-vnc-egl-headless.x86_64-latest.args | 3 +++
...ostdev-mdev-display-vnc.x86_64-latest.args | 3 +++
.../hostdev-mdev-precreated.args | 3 +++
.../hostdev-pci-address-device.args | 3 +++
.../qemuxml2argvdata/hostdev-pci-address.args | 3 +++
.../hostdev-scsi-lsi-iscsi-auth.args | 3 +++
.../hostdev-scsi-lsi-iscsi.args | 3 +++
tests/qemuxml2argvdata/hostdev-scsi-lsi.args | 3 +++
.../hostdev-scsi-readonly.args | 3 +++
.../hostdev-scsi-vhost-scsi-ccw.args | 3 +++
.../hostdev-scsi-vhost-scsi-pci.args | 3 +++
.../hostdev-scsi-vhost-scsi-pcie.args | 3 +++
.../hostdev-scsi-virtio-iscsi-auth.args | 3 +++
.../hostdev-scsi-virtio-iscsi.args | 3 +++
.../hostdev-scsi-virtio-scsi.args | 3 +++
.../hostdev-subsys-mdev-vfio-ccw.args | 3 +++
.../hostdev-usb-address-device-boot.args | 3 +++
.../hostdev-usb-address-device.args | 3 +++
.../qemuxml2argvdata/hostdev-usb-address.args | 3 +++
.../hostdev-vfio-multidomain.args | 3 +++
.../hostdev-vfio-zpci-autogenerate.args | 3 +++
.../hostdev-vfio-zpci-boundaries.args | 3 +++
.../hostdev-vfio-zpci-multidomain-many.args | 3 +++
tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 3 +++
tests/qemuxml2argvdata/hostdev-vfio.args | 3 +++
tests/qemuxml2argvdata/hotplug-base.args | 3 +++
.../hugepages-default-2M.args | 3 +++
.../hugepages-default-system-size.args | 3 +++
tests/qemuxml2argvdata/hugepages-default.args | 3 +++
.../qemuxml2argvdata/hugepages-memaccess.args | 3 +++
.../hugepages-memaccess2.args | 3 +++
tests/qemuxml2argvdata/hugepages-nodeset.args | 3 +++
.../hugepages-numa-default-2M.args | 3 +++
.../hugepages-numa-default-dimm.args | 3 +++
.../hugepages-numa-default.args | 3 +++
.../hugepages-numa-nodeset-part.args | 3 +++
.../hugepages-numa-nodeset.args | 3 +++
.../hugepages-nvdimm.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/hugepages-shared.args | 3 +++
tests/qemuxml2argvdata/hyperv-off.args | 3 +++
tests/qemuxml2argvdata/hyperv-panic.args | 3 +++
tests/qemuxml2argvdata/hyperv.args | 3 +++
.../qemuxml2argvdata/input-usbmouse-addr.args | 3 +++
tests/qemuxml2argvdata/input-usbmouse.args | 3 +++
tests/qemuxml2argvdata/input-usbtablet.args | 3 +++
tests/qemuxml2argvdata/input-virtio-ccw.args | 3 +++
.../intel-iommu-caching-mode.args | 3 +++
.../intel-iommu-device-iotlb.args | 3 +++
tests/qemuxml2argvdata/intel-iommu-eim.args | 3 +++
.../qemuxml2argvdata/intel-iommu-machine.args | 3 +++
tests/qemuxml2argvdata/intel-iommu.args | 3 +++
.../iothreads-disk-virtio-ccw.args | 3 +++
tests/qemuxml2argvdata/iothreads-disk.args | 3 +++
.../iothreads-ids-partial.args | 3 +++
tests/qemuxml2argvdata/iothreads-ids.args | 3 +++
...othreads-virtio-scsi-ccw.s390x-latest.args | 3 +++
...threads-virtio-scsi-pci.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/iothreads.args | 3 +++
tests/qemuxml2argvdata/kvm-features-off.args | 3 +++
tests/qemuxml2argvdata/kvm-features.args | 3 +++
tests/qemuxml2argvdata/kvm-pit-delay.args | 3 +++
tests/qemuxml2argvdata/kvm-pit-discard.args | 3 +++
.../kvmclock+eoi-disabled.args | 3 +++
tests/qemuxml2argvdata/kvmclock.args | 3 +++
.../launch-security-sev.x86_64-2.12.0.args | 3 +++
.../luks-disks-source-qcow2.args | 3 +++
tests/qemuxml2argvdata/luks-disks-source.args | 3 +++
tests/qemuxml2argvdata/luks-disks.args | 3 +++
.../mach-virt-console-virtio.args | 3 +++
.../mach-virt-serial-native.args | 3 +++
.../mach-virt-serial-pci.args | 3 +++
.../mach-virt-serial-usb.args | 3 +++
.../machine-aeskeywrap-off-cap.args | 3 +++
.../machine-aeskeywrap-off-caps.args | 3 +++
.../machine-aeskeywrap-on-cap.args | 3 +++
.../machine-aeskeywrap-on-caps.args | 3 +++
tests/qemuxml2argvdata/machine-aliases1.args | 3 +++
tests/qemuxml2argvdata/machine-aliases2.args | 3 +++
tests/qemuxml2argvdata/machine-core-off.args | 3 +++
tests/qemuxml2argvdata/machine-core-on.args | 3 +++
.../machine-deakeywrap-off-cap.args | 3 +++
.../machine-deakeywrap-off-caps.args | 3 +++
.../machine-deakeywrap-on-cap.args | 3 +++
.../machine-deakeywrap-on-caps.args | 3 +++
.../machine-keywrap-none-caps.args | 3 +++
.../machine-keywrap-none.args | 3 +++
...ine-loadparm-multiple-disks-nets-s390.args | 3 +++
.../machine-loadparm-net-s390.args | 3 +++
.../machine-loadparm-s390.args | 3 +++
tests/qemuxml2argvdata/machine-smm-opt.args | 3 +++
.../qemuxml2argvdata/machine-vmport-opt.args | 3 +++
tests/qemuxml2argvdata/master-key.args | 3 +++
.../memfd-memory-numa.x86_64-latest.args | 3 +++
.../memory-hotplug-dimm-addr.args | 3 +++
.../qemuxml2argvdata/memory-hotplug-dimm.args | 3 +++
...y-hotplug-nvdimm-access.x86_64-latest.args | 3 +++
...ry-hotplug-nvdimm-align.x86_64-latest.args | 3 +++
...ry-hotplug-nvdimm-label.x86_64-latest.args | 3 +++
...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 3 +++
...hotplug-nvdimm-readonly.x86_64-latest.args | 3 +++
.../memory-hotplug-nvdimm.x86_64-latest.args | 3 +++
.../memory-hotplug-ppc64-nonuma.args | 3 +++
tests/qemuxml2argvdata/memory-hotplug.args | 3 +++
tests/qemuxml2argvdata/memtune-unlimited.args | 3 +++
tests/qemuxml2argvdata/memtune.args | 3 +++
.../migrate-numa-unaligned.args | 3 +++
tests/qemuxml2argvdata/migrate.args | 3 +++
.../minimal-msg-timestamp.args | 3 +++
tests/qemuxml2argvdata/minimal-sandbox.args | 3 +++
tests/qemuxml2argvdata/minimal.args | 3 +++
tests/qemuxml2argvdata/misc-acpi.args | 3 +++
tests/qemuxml2argvdata/misc-disable-s3.args | 3 +++
.../misc-disable-suspends.args | 3 +++
tests/qemuxml2argvdata/misc-enable-s4.args | 3 +++
tests/qemuxml2argvdata/misc-no-reboot.args | 3 +++
tests/qemuxml2argvdata/misc-uuid.args | 3 +++
tests/qemuxml2argvdata/mlock-off.args | 3 +++
tests/qemuxml2argvdata/mlock-on.args | 3 +++
tests/qemuxml2argvdata/mlock-unsupported.args | 3 +++
tests/qemuxml2argvdata/monitor-json.args | 3 +++
.../multifunction-pci-device.args | 3 +++
tests/qemuxml2argvdata/name-escape.args | 3 +++
tests/qemuxml2argvdata/net-client.args | 3 +++
tests/qemuxml2argvdata/net-eth-hostip.args | 3 +++
tests/qemuxml2argvdata/net-eth-ifname.args | 3 +++
tests/qemuxml2argvdata/net-eth-names.args | 3 +++
tests/qemuxml2argvdata/net-eth.args | 3 +++
.../net-hostdev-bootorder.args | 3 +++
.../net-hostdev-multidomain.args | 3 +++
.../net-hostdev-vfio-multidomain.args | 3 +++
tests/qemuxml2argvdata/net-hostdev-vfio.args | 3 +++
tests/qemuxml2argvdata/net-hostdev.args | 3 +++
tests/qemuxml2argvdata/net-mcast.args | 3 +++
tests/qemuxml2argvdata/net-server.args | 3 +++
tests/qemuxml2argvdata/net-udp.args | 3 +++
tests/qemuxml2argvdata/net-user-addr.args | 3 +++
tests/qemuxml2argvdata/net-user.args | 3 +++
.../net-vhostuser-multiq.args | 3 +++
tests/qemuxml2argvdata/net-vhostuser.args | 3 +++
.../net-vhostuser.x86_64-2.5.0.args | 3 +++
.../net-vhostuser.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/net-virtio-ccw.args | 3 +++
tests/qemuxml2argvdata/net-virtio-device.args | 3 +++
.../net-virtio-disable-offloads.args | 3 +++
tests/qemuxml2argvdata/net-virtio-netdev.args | 3 +++
.../net-virtio-rxtxqueuesize.args | 3 +++
tests/qemuxml2argvdata/net-virtio-s390.args | 3 +++
tests/qemuxml2argvdata/net-virtio.args | 3 +++
tests/qemuxml2argvdata/nosharepages.args | 3 +++
.../numad-auto-memory-vcpu-cpuset.args | 3 +++
...o-memory-vcpu-no-cpuset-and-placement.args | 3 +++
.../numad-auto-vcpu-static-numatune.args | 3 +++
.../numad-static-memory-auto-vcpu.args | 3 +++
tests/qemuxml2argvdata/numad.args | 3 +++
.../numatune-auto-nodeset-invalid.args | 3 +++
.../numatune-auto-prefer.args | 3 +++
.../qemuxml2argvdata/numatune-distances.args | 3 +++
.../numatune-memnode-no-memory.args | 3 +++
tests/qemuxml2argvdata/numatune-memnode.args | 3 +++
tests/qemuxml2argvdata/numatune-memory.args | 3 +++
.../qemuxml2argvdata/pages-dimm-discard.args | 3 +++
.../pages-discard-hugepages.args | 3 +++
tests/qemuxml2argvdata/pages-discard.args | 3 +++
tests/qemuxml2argvdata/panic-double.args | 3 +++
tests/qemuxml2argvdata/panic-no-address.args | 3 +++
tests/qemuxml2argvdata/panic.args | 3 +++
.../parallel-parport-chardev.args | 3 +++
.../parallel-tcp-chardev.args | 3 +++
.../parallel-unix-chardev.x86_64-2.5.0.args | 3 +++
.../parallel-unix-chardev.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/pci-autoadd-addr.args | 3 +++
tests/qemuxml2argvdata/pci-autoadd-idx.args | 3 +++
tests/qemuxml2argvdata/pci-autofill-addr.args | 3 +++
.../pci-bridge-many-disks.args | 3 +++
tests/qemuxml2argvdata/pci-bridge.args | 3 +++
tests/qemuxml2argvdata/pci-expander-bus.args | 3 +++
tests/qemuxml2argvdata/pci-many.args | 3 +++
tests/qemuxml2argvdata/pci-rom-disabled.args | 3 +++
tests/qemuxml2argvdata/pci-rom.args | 3 +++
.../pci-serial-dev-chardev.args | 3 +++
tests/qemuxml2argvdata/pcie-expander-bus.args | 3 +++
.../pcie-root-port-model-generic.args | 3 +++
.../pcie-root-port-model-ioh3420.args | 3 +++
tests/qemuxml2argvdata/pcie-root-port.args | 3 +++
tests/qemuxml2argvdata/pcie-root.args | 3 +++
.../pcie-switch-downstream-port.args | 3 +++
.../pcie-switch-upstream-port.args | 3 +++
tests/qemuxml2argvdata/pcihole64-q35.args | 3 +++
tests/qemuxml2argvdata/pcihole64.args | 3 +++
tests/qemuxml2argvdata/pmu-feature-off.args | 3 +++
tests/qemuxml2argvdata/pmu-feature.args | 3 +++
tests/qemuxml2argvdata/ppc-dtb.args | 3 +++
.../ppc64-pseries-headless.ppc64-latest.args | 3 +++
.../ppc64-usb-controller-legacy.args | 3 +++
.../ppc64-usb-controller-qemu-xhci.args | 3 +++
.../ppc64-usb-controller.args | 3 +++
tests/qemuxml2argvdata/ppce500-serial.args | 3 +++
tests/qemuxml2argvdata/pseries-basic.args | 3 +++
.../pseries-console-virtio.args | 3 +++
.../pseries-cpu-compat-power9.args | 3 +++
.../qemuxml2argvdata/pseries-cpu-compat.args | 3 +++
tests/qemuxml2argvdata/pseries-cpu-exact.args | 3 +++
tests/qemuxml2argvdata/pseries-cpu-le.args | 3 +++
tests/qemuxml2argvdata/pseries-features.args | 3 +++
.../qemuxml2argvdata/pseries-hostdevs-1.args | 3 +++
.../qemuxml2argvdata/pseries-hostdevs-2.args | 3 +++
.../qemuxml2argvdata/pseries-hostdevs-3.args | 3 +++
.../pseries-machine-max-cpu-compat.args | 3 +++
.../pseries-many-buses-1.args | 3 +++
.../pseries-many-buses-2.args | 3 +++
.../pseries-many-devices.args | 3 +++
tests/qemuxml2argvdata/pseries-nvram.args | 3 +++
.../pseries-panic-missing.args | 3 +++
.../pseries-panic-no-address.args | 3 +++
.../pseries-phb-default-missing.args | 3 +++
.../pseries-phb-numa-node.args | 3 +++
.../qemuxml2argvdata/pseries-phb-simple.args | 3 +++
.../pseries-serial-native.args | 3 +++
.../qemuxml2argvdata/pseries-serial-pci.args | 3 +++
.../qemuxml2argvdata/pseries-serial-usb.args | 3 +++
.../qemuxml2argvdata/pseries-usb-default.args | 3 +++
tests/qemuxml2argvdata/pseries-usb-kbd.args | 3 +++
tests/qemuxml2argvdata/pseries-usb-multi.args | 3 +++
.../pseries-vio-user-assigned.args | 3 +++
tests/qemuxml2argvdata/pseries-vio.args | 3 +++
.../pv-spinlock-disabled.args | 3 +++
.../qemuxml2argvdata/pv-spinlock-enabled.args | 3 +++
tests/qemuxml2argvdata/q35-acpi-nouefi.args | 3 +++
tests/qemuxml2argvdata/q35-acpi-uefi.args | 3 +++
.../q35-default-devices-only.args | 3 +++
tests/qemuxml2argvdata/q35-multifunction.args | 3 +++
tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 3 +++
.../q35-pci-force-address.args | 3 +++
tests/qemuxml2argvdata/q35-pcie-autoadd.args | 3 +++
tests/qemuxml2argvdata/q35-pcie.args | 3 +++
.../q35-pm-disable-fallback.args | 3 +++
tests/qemuxml2argvdata/q35-pm-disable.args | 3 +++
tests/qemuxml2argvdata/q35-usb2-multi.args | 3 +++
tests/qemuxml2argvdata/q35-usb2-reorder.args | 3 +++
tests/qemuxml2argvdata/q35-usb2.args | 3 +++
.../q35-virt-manager-basic.args | 3 +++
tests/qemuxml2argvdata/q35-virtio-pci.args | 3 +++
tests/qemuxml2argvdata/q35.args | 3 +++
tests/qemuxml2argvdata/qemu-ns-alt.args | 3 +++
.../qemu-ns-commandline-ns0.args | 3 +++
.../qemu-ns-commandline-ns1.args | 3 +++
.../qemuxml2argvdata/qemu-ns-commandline.args | 3 +++
.../qemu-ns-domain-commandline-ns0.args | 3 +++
.../qemu-ns-domain-commandline.args | 3 +++
.../qemuxml2argvdata/qemu-ns-domain-ns0.args | 3 +++
tests/qemuxml2argvdata/qemu-ns-no-env.args | 3 +++
tests/qemuxml2argvdata/qemu-ns.args | 3 +++
.../reboot-timeout-disabled.args | 3 +++
.../reboot-timeout-enabled.args | 3 +++
tests/qemuxml2argvdata/restore-v2-fd.args | 3 +++
tests/qemuxml2argvdata/restore-v2.args | 3 +++
.../riscv64-virt-headless.riscv64-latest.args | 3 +++
tests/qemuxml2argvdata/riscv64-virt-pci.args | 3 +++
tests/qemuxml2argvdata/riscv64-virt.args | 3 +++
.../s390-allow-bogus-usb-controller.args | 3 +++
.../s390-allow-bogus-usb-none.args | 3 +++
.../qemuxml2argvdata/s390-panic-missing.args | 3 +++
.../s390-panic-no-address.args | 3 +++
tests/qemuxml2argvdata/s390-serial-2.args | 3 +++
.../qemuxml2argvdata/s390-serial-console.args | 3 +++
tests/qemuxml2argvdata/s390-serial.args | 3 +++
.../s390x-ccw-headless.s390x-latest.args | 3 +++
tests/qemuxml2argvdata/seclabel-dac-none.args | 3 +++
.../seclabel-dynamic-baselabel.args | 3 +++
.../seclabel-dynamic-labelskip.args | 3 +++
.../seclabel-dynamic-override.args | 3 +++
.../seclabel-dynamic-relabel.args | 3 +++
tests/qemuxml2argvdata/seclabel-dynamic.args | 3 +++
tests/qemuxml2argvdata/seclabel-none.args | 3 +++
.../seclabel-static-labelskip.args | 3 +++
.../seclabel-static-relabel.args | 3 +++
tests/qemuxml2argvdata/seclabel-static.args | 3 +++
.../serial-dev-chardev-iobase.args | 3 +++
.../qemuxml2argvdata/serial-dev-chardev.args | 3 +++
.../qemuxml2argvdata/serial-file-chardev.args | 3 +++
tests/qemuxml2argvdata/serial-file-log.args | 3 +++
.../qemuxml2argvdata/serial-many-chardev.args | 3 +++
.../qemuxml2argvdata/serial-pty-chardev.args | 3 +++
.../serial-spiceport-nospice.args | 3 +++
tests/qemuxml2argvdata/serial-spiceport.args | 3 +++
.../qemuxml2argvdata/serial-tcp-chardev.args | 3 +++
.../serial-tcp-telnet-chardev.args | 3 +++
.../serial-tcp-tlsx509-chardev-notls.args | 3 +++
.../serial-tcp-tlsx509-chardev-verify.args | 3 +++
.../serial-tcp-tlsx509-chardev.args | 3 +++
.../serial-tcp-tlsx509-secret-chardev.args | 3 +++
.../qemuxml2argvdata/serial-udp-chardev.args | 3 +++
.../qemuxml2argvdata/serial-unix-chardev.args | 3 +++
.../serial-unix-chardev.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/serial-vc-chardev.args | 3 +++
.../shmem-plain-doorbell.args | 3 +++
tests/qemuxml2argvdata/shmem.args | 3 +++
.../smartcard-controller.args | 3 +++
.../smartcard-host-certificates-database.args | 3 +++
.../smartcard-host-certificates.args | 3 +++
tests/qemuxml2argvdata/smartcard-host.args | 3 +++
.../smartcard-passthrough-spicevmc.args | 3 +++
.../smartcard-passthrough-tcp.args | 3 +++
...artcard-passthrough-unix.x86_64-2.5.0.args | 3 +++
...rtcard-passthrough-unix.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/smbios.args | 3 +++
tests/qemuxml2argvdata/smp.args | 3 +++
tests/qemuxml2argvdata/sound-device.args | 3 +++
tests/qemuxml2argvdata/sound.args | 3 +++
.../tpm-emulator-tpm2.x86_64-latest.args | 3 +++
.../tpm-emulator.x86_64-latest.args | 3 +++
.../qemuxml2argvdata/tpm-passthrough-crb.args | 3 +++
tests/qemuxml2argvdata/tpm-passthrough.args | 3 +++
.../tseg-explicit-size.x86_64-latest.args | 3 +++
.../usb-controller-default-q35.args | 3 +++
.../usb-controller-explicit-q35.args | 3 +++
.../usb-controller-qemu-xhci.args | 3 +++
.../qemuxml2argvdata/usb-controller-xhci.args | 3 +++
tests/qemuxml2argvdata/usb-controller.args | 3 +++
.../usb-hub-autoadd-deluxe.args | 3 +++
tests/qemuxml2argvdata/usb-hub-autoadd.args | 3 +++
tests/qemuxml2argvdata/usb-hub.args | 3 +++
.../qemuxml2argvdata/usb-ich9-autoassign.args | 3 +++
.../qemuxml2argvdata/usb-ich9-companion.args | 3 +++
.../qemuxml2argvdata/usb-ich9-ehci-addr.args | 3 +++
.../qemuxml2argvdata/usb-long-port-path.args | 3 +++
tests/qemuxml2argvdata/usb-none.args | 3 +++
.../usb-piix3-controller.args | 3 +++
.../qemuxml2argvdata/usb-port-autoassign.args | 3 +++
tests/qemuxml2argvdata/usb-port-missing.args | 3 +++
tests/qemuxml2argvdata/usb-ports.args | 3 +++
tests/qemuxml2argvdata/usb-redir-boot.args | 3 +++
.../usb-redir-filter-version.args | 3 +++
tests/qemuxml2argvdata/usb-redir-filter.args | 3 +++
.../usb-redir-unix.x86_64-2.5.0.args | 3 +++
.../usb-redir-unix.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/usb-redir.args | 3 +++
.../qemuxml2argvdata/usb-xhci-autoassign.args | 3 +++
tests/qemuxml2argvdata/usb1-usb2.args | 3 +++
tests/qemuxml2argvdata/user-aliases-usb.args | 3 +++
tests/qemuxml2argvdata/user-aliases.args | 3 +++
.../vcpu-placement-static.args | 3 +++
.../vhost-vsock-auto.x86_64-latest.args | 3 +++
.../vhost-vsock-ccw-auto.s390x-latest.args | 3 +++
.../vhost-vsock-ccw.s390x-latest.args | 3 +++
.../vhost-vsock.x86_64-latest.args | 3 +++
.../video-device-pciaddr-default.args | 3 +++
tests/qemuxml2argvdata/video-none-device.args | 3 +++
.../video-qxl-device-vgamem.args | 3 +++
...video-qxl-device-vram64.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/video-qxl-device.args | 3 +++
tests/qemuxml2argvdata/video-qxl-heads.args | 3 +++
.../qemuxml2argvdata/video-qxl-nodevice.args | 3 +++
tests/qemuxml2argvdata/video-qxl-noheads.args | 3 +++
.../video-qxl-sec-device-vgamem.args | 3 +++
...o-qxl-sec-device-vram64.x86_64-latest.args | 3 +++
.../video-qxl-sec-device.args | 3 +++
.../video-vga-device-vgamem.args | 3 +++
tests/qemuxml2argvdata/video-vga-device.args | 3 +++
.../qemuxml2argvdata/video-vga-nodevice.args | 3 +++
.../qemuxml2argvdata/video-vga-qxl-heads.args | 3 +++
.../video-virtio-gpu-ccw.args | 3 +++
.../video-virtio-gpu-device.args | 3 +++
.../video-virtio-gpu-sdl-gl.args | 3 +++
.../video-virtio-gpu-secondary.args | 3 +++
.../video-virtio-gpu-spice-gl.args | 3 +++
.../video-virtio-gpu-virgl.args | 3 +++
tests/qemuxml2argvdata/video-virtio-vga.args | 3 +++
.../virtio-input-passthrough.args | 3 +++
tests/qemuxml2argvdata/virtio-input.args | 3 +++
tests/qemuxml2argvdata/virtio-lun.args | 3 +++
.../virtio-non-transitional.x86_64-3.1.0.args | 3 +++
...virtio-non-transitional.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/virtio-options.args | 3 +++
tests/qemuxml2argvdata/virtio-rng-ccw.args | 3 +++
.../qemuxml2argvdata/virtio-rng-default.args | 3 +++
.../virtio-rng-egd-unix.x86_64-2.5.0.args | 3 +++
.../virtio-rng-egd-unix.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/virtio-rng-egd.args | 3 +++
.../qemuxml2argvdata/virtio-rng-multiple.args | 3 +++
tests/qemuxml2argvdata/virtio-rng-random.args | 3 +++
.../virtio-transitional.x86_64-3.1.0.args | 3 +++
.../virtio-transitional.x86_64-latest.args | 3 +++
tests/qemuxml2argvdata/vmcoreinfo.args | 3 +++
tests/qemuxml2argvdata/watchdog-device.args | 3 +++
tests/qemuxml2argvdata/watchdog-diag288.args | 3 +++
tests/qemuxml2argvdata/watchdog-dump.args | 3 +++
.../qemuxml2argvdata/watchdog-injectnmi.args | 3 +++
tests/qemuxml2argvdata/watchdog.args | 3 +++
tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 3 +++
.../x86_64-pc-headless.x86_64-latest.args | 3 +++
.../x86_64-q35-headless.x86_64-latest.args | 3 +++
687 files changed, 2074 insertions(+)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 69643732e0..7b1ba869e0 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1620,6 +1620,7 @@ virCommandAddEnvPassAllowSUID;
virCommandAddEnvPassBlockSUID;
virCommandAddEnvPassCommon;
virCommandAddEnvString;
+virCommandAddEnvXDG;
virCommandAllowCap;
virCommandClearCaps;
virCommandDaemonize;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 853b0932b0..2c6d6188e2 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -10658,6 +10658,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
cmd = virCommandNew(def->emulator);
virCommandAddEnvPassCommon(cmd);
+ virCommandAddEnvXDG(cmd, priv->libDir);
if (qemuBuildNameCommandLine(cmd, cfg, def, qemuCaps) < 0)
goto error;
diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index 84a65a2f6d..15e2f0ef1e 100644
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -1483,6 +1483,27 @@ virCommandAddEnvPassCommon(virCommandPtr cmd)
virCommandAddEnvPassBlockSUID(cmd, "TMPDIR", NULL);
}
+
+void
+virCommandAddEnvXDG(virCommandPtr cmd, const char *baseDir)
+{
+ if (!cmd || cmd->has_error)
+ return;
+
+ if (VIR_RESIZE_N(cmd->env, cmd->maxenv, cmd->nenv, 3) < 0) {
+ cmd->has_error = ENOMEM;
+ return;
+ }
+
+ virCommandAddEnvFormat(cmd, "XDG_DATA_HOME=%s/%s",
+ baseDir, ".local/share");
+ virCommandAddEnvFormat(cmd, "XDG_CACHE_HOME=%s/%s",
+ baseDir, ".cache");
+ virCommandAddEnvFormat(cmd, "XDG_CONFIG_HOME=%s/%s",
+ baseDir, ".config");
+}
+
+
/**
* virCommandAddArg:
* @cmd: the command to modify
diff --git a/src/util/vircommand.h b/src/util/vircommand.h
index 99849051f8..efdc5dd00d 100644
--- a/src/util/vircommand.h
+++ b/src/util/vircommand.h
@@ -122,6 +122,8 @@ void virCommandAddEnvPassAllowSUID(virCommandPtr cmd,
void virCommandAddEnvPassCommon(virCommandPtr cmd);
+void virCommandAddEnvXDG(virCommandPtr cmd, const char *baseDir);
+
void virCommandAddArg(virCommandPtr cmd,
const char *val) ATTRIBUTE_NONNULL(2);
diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index ee6d3783d9..66cc6b9cf3 100644
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
index 4bbeb9cd90..b85c93bd88 100644
--- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
+++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
index 1d61bd784e..a10bbec47c 100644
--- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
+++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.args
b/tests/qemuxml2argvdata/aarch64-gic-host.args
index d93ad833ef..d931d4c7fe 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-host.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-host.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
index acf18cfb20..6c473aa003 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.args
b/tests/qemuxml2argvdata/aarch64-gic-v2.args
index ce64de1206..9b6223db1f 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v2.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args
b/tests/qemuxml2argvdata/aarch64-gic-v3.args
index b775fe3163..50eca4a7f5 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v3.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v3.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
index 5f87a48d2e..b8b3123319 100644
--- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-arm \
-name armtest \
diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
index 2300f57852..17274d4e5f 100644
--- a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
+++ b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
index dc26b5b744..49d000a476 100644
--- a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
+++ b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/aarch64-pci-serial.args
b/tests/qemuxml2argvdata/aarch64-pci-serial.args
index c3e43703cd..06d40c94a0 100644
--- a/tests/qemuxml2argvdata/aarch64-pci-serial.args
+++ b/tests/qemuxml2argvdata/aarch64-pci-serial.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
diff --git a/tests/qemuxml2argvdata/aarch64-traditional-pci.args
b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
index ed8b4f54d7..792b0c7843 100644
--- a/tests/qemuxml2argvdata/aarch64-traditional-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
index d90254c788..4c8de7c399 100644
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
index 17c1955992..f088f0d149 100644
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/aarch64-video-default.args
b/tests/qemuxml2argvdata/aarch64-video-default.args
index 13c5357557..b7c34daa49 100644
--- a/tests/qemuxml2argvdata/aarch64-video-default.args
+++ b/tests/qemuxml2argvdata/aarch64-video-default.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64-vgpu/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64-vgpu/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64-vgpu/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64-vgpu \
diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
index afaf35ca99..22cbe7e3bc 100644
--- a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64-vgpu/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64-vgpu/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64-vgpu/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64-vgpu \
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 89b19dd6b4..e770eb10e4 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
index 35319a6e71..26ead35626 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64-virt-default/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64-virt-default/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64-virt-default/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64-virt-default-nic \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
index 4889e0b303..ed2dd82846 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
index e75c66aea7..9b5c4cbda8 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
index 2cee6b8366..267f94d327 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
index c7218a50ed..ca1ddb9937 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
diff --git a/tests/qemuxml2argvdata/acpi-table.args
b/tests/qemuxml2argvdata/acpi-table.args
index 18644f24cf..32fde223f2 100644
--- a/tests/qemuxml2argvdata/acpi-table.args
+++ b/tests/qemuxml2argvdata/acpi-table.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
index b925baa0e0..da01e88a9d 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-arm \
-name armtest \
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
index 61e65655bc..9703530867 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-arm \
-name armtest \
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
index 83ef482550..69d515f6f6 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-arm \
-name armtest \
diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.args
b/tests/qemuxml2argvdata/arm-virt-virtio.args
index 48a78aa846..e127cf87a6 100644
--- a/tests/qemuxml2argvdata/arm-virt-virtio.args
+++ b/tests/qemuxml2argvdata/arm-virt-virtio.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-arm \
-name armtest \
diff --git a/tests/qemuxml2argvdata/autoindex.args
b/tests/qemuxml2argvdata/autoindex.args
index 56be2d23d4..182af3843a 100644
--- a/tests/qemuxml2argvdata/autoindex.args
+++ b/tests/qemuxml2argvdata/autoindex.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35-test \
diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.args
b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
index b411eb8b1c..5b7ec05a83 100644
--- a/tests/qemuxml2argvdata/balloon-ccw-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args
b/tests/qemuxml2argvdata/balloon-device-auto.args
index 547b9ced44..21d141cb7c 100644
--- a/tests/qemuxml2argvdata/balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/balloon-device-auto.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
index 896bb47afe..39cfa7c2a2 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args
b/tests/qemuxml2argvdata/balloon-device-deflate.args
index 37304d23b1..51d285c6fd 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/balloon-device-period.args
b/tests/qemuxml2argvdata/balloon-device-period.args
index c703c011f4..6321da1e6c 100644
--- a/tests/qemuxml2argvdata/balloon-device-period.args
+++ b/tests/qemuxml2argvdata/balloon-device-period.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/balloon-device.args
b/tests/qemuxml2argvdata/balloon-device.args
index c703c011f4..6321da1e6c 100644
--- a/tests/qemuxml2argvdata/balloon-device.args
+++ b/tests/qemuxml2argvdata/balloon-device.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.args
b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
index 102dce0329..75450df169 100644
--- a/tests/qemuxml2argvdata/balloon-mmio-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args
b/tests/qemuxml2argvdata/bios-nvram-secure.args
index 6d1789aa05..75d13b04b5 100644
--- a/tests/qemuxml2argvdata/bios-nvram-secure.args
+++ b/tests/qemuxml2argvdata/bios-nvram-secure.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name test-bios \
diff --git a/tests/qemuxml2argvdata/bios-nvram.args
b/tests/qemuxml2argvdata/bios-nvram.args
index 731675ae63..4471135925 100644
--- a/tests/qemuxml2argvdata/bios-nvram.args
+++ b/tests/qemuxml2argvdata/bios-nvram.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name test-bios \
diff --git a/tests/qemuxml2argvdata/bios.args b/tests/qemuxml2argvdata/bios.args
index 8ecc696194..c95bdf2820 100644
--- a/tests/qemuxml2argvdata/bios.args
+++ b/tests/qemuxml2argvdata/bios.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name test-bios \
diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.args
b/tests/qemuxml2argvdata/blkdeviotune-group-num.args
index a9e66c430e..b75eb086d2 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-group-num.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.args
b/tests/qemuxml2argvdata/blkdeviotune-max-length.args
index 482220705c..c877dc42b1 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-max-length.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.args
b/tests/qemuxml2argvdata/blkdeviotune-max.args
index c9cd42708b..a342a44afa 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-max.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-max.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/blkiotune-device.args
b/tests/qemuxml2argvdata/blkiotune-device.args
index 547b9ced44..21d141cb7c 100644
--- a/tests/qemuxml2argvdata/blkiotune-device.args
+++ b/tests/qemuxml2argvdata/blkiotune-device.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/blkiotune.args
b/tests/qemuxml2argvdata/blkiotune.args
index 547b9ced44..21d141cb7c 100644
--- a/tests/qemuxml2argvdata/blkiotune.args
+++ b/tests/qemuxml2argvdata/blkiotune.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/boot-cdrom.args
b/tests/qemuxml2argvdata/boot-cdrom.args
index 3b15374ee9..2432806055 100644
--- a/tests/qemuxml2argvdata/boot-cdrom.args
+++ b/tests/qemuxml2argvdata/boot-cdrom.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/boot-complex.args
b/tests/qemuxml2argvdata/boot-complex.args
index 4cdb1452cd..82ae772ac2 100644
--- a/tests/qemuxml2argvdata/boot-complex.args
+++ b/tests/qemuxml2argvdata/boot-complex.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.args
b/tests/qemuxml2argvdata/boot-floppy-q35.args
index 3bd54c82f5..70cb463cad 100644
--- a/tests/qemuxml2argvdata/boot-floppy-q35.args
+++ b/tests/qemuxml2argvdata/boot-floppy-q35.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/boot-floppy.args
b/tests/qemuxml2argvdata/boot-floppy.args
index 3211106512..99d5c177e7 100644
--- a/tests/qemuxml2argvdata/boot-floppy.args
+++ b/tests/qemuxml2argvdata/boot-floppy.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
index 0cf54a786f..8d275f5d3f 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args
b/tests/qemuxml2argvdata/boot-menu-disable.args
index 0cf54a786f..8d275f5d3f 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
index 1fd9977142..c2bf9a8834 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args
b/tests/qemuxml2argvdata/boot-menu-enable.args
index 46494445cc..7061ab6e1d 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/boot-multi.args
b/tests/qemuxml2argvdata/boot-multi.args
index 46494445cc..7061ab6e1d 100644
--- a/tests/qemuxml2argvdata/boot-multi.args
+++ b/tests/qemuxml2argvdata/boot-multi.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/boot-network.args
b/tests/qemuxml2argvdata/boot-network.args
index 6b441dd6b4..47d608306c 100644
--- a/tests/qemuxml2argvdata/boot-network.args
+++ b/tests/qemuxml2argvdata/boot-network.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/boot-order.args
b/tests/qemuxml2argvdata/boot-order.args
index c22ee6fdd4..f7ab464cf7 100644
--- a/tests/qemuxml2argvdata/boot-order.args
+++ b/tests/qemuxml2argvdata/boot-order.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/boot-strict.args
b/tests/qemuxml2argvdata/boot-strict.args
index b062c0d1df..d2a72a1a97 100644
--- a/tests/qemuxml2argvdata/boot-strict.args
+++ b/tests/qemuxml2argvdata/boot-strict.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args
b/tests/qemuxml2argvdata/channel-guestfwd.args
index a5e9a12520..513e63c6d6 100644
--- a/tests/qemuxml2argvdata/channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/channel-guestfwd.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args
b/tests/qemuxml2argvdata/channel-spicevmc.args
index af8f3d55a7..b97d3a26e6 100644
--- a/tests/qemuxml2argvdata/channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/channel-spicevmc.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
index da062968ff..cf70f234d0 100644
--- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args
b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args
index 34a3d33f27..7b3f170b48 100644
--- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args
b/tests/qemuxml2argvdata/channel-virtio-auto.args
index 14c7da0577..e06681af4d 100644
--- a/tests/qemuxml2argvdata/channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/channel-virtio-auto.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
index a0cde544b7..afe5707457 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
index 497f6b09d7..956acefae5 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args
b/tests/qemuxml2argvdata/channel-virtio-default.args
index 88f2a78a55..7dc6688e28 100644
--- a/tests/qemuxml2argvdata/channel-virtio-default.args
+++ b/tests/qemuxml2argvdata/channel-virtio-default.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args
b/tests/qemuxml2argvdata/channel-virtio-state.args
index 2e820dda05..d8d155cf0b 100644
--- a/tests/qemuxml2argvdata/channel-virtio-state.args
+++ b/tests/qemuxml2argvdata/channel-virtio-state.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args
b/tests/qemuxml2argvdata/channel-virtio-unix.args
index 63658e9e87..cf91339631 100644
--- a/tests/qemuxml2argvdata/channel-virtio-unix.args
+++ b/tests/qemuxml2argvdata/channel-virtio-unix.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/channel-virtio.args
b/tests/qemuxml2argvdata/channel-virtio.args
index 4207b6929b..bc92bb514d 100644
--- a/tests/qemuxml2argvdata/channel-virtio.args
+++ b/tests/qemuxml2argvdata/channel-virtio.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args
b/tests/qemuxml2argvdata/chardev-reconnect.args
index baff469c7b..fe06a388ae 100644
--- a/tests/qemuxml2argvdata/chardev-reconnect.args
+++ b/tests/qemuxml2argvdata/chardev-reconnect.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/clock-catchup.args
b/tests/qemuxml2argvdata/clock-catchup.args
index 849ad3a57b..a93eff0ee7 100644
--- a/tests/qemuxml2argvdata/clock-catchup.args
+++ b/tests/qemuxml2argvdata/clock-catchup.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/clock-france.args
b/tests/qemuxml2argvdata/clock-france.args
index c177501f1a..0c62c856b2 100644
--- a/tests/qemuxml2argvdata/clock-france.args
+++ b/tests/qemuxml2argvdata/clock-france.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
TZ=Europe/Paris \
/usr/bin/qemu-system-i686 \
diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args
b/tests/qemuxml2argvdata/clock-hpet-off.args
index ffb24321da..1700cd633d 100644
--- a/tests/qemuxml2argvdata/clock-hpet-off.args
+++ b/tests/qemuxml2argvdata/clock-hpet-off.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
index 7bf5261f52..c861e8bd8d 100644
--- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/clock-localtime.args
b/tests/qemuxml2argvdata/clock-localtime.args
index 6880264ded..8f3329a4ae 100644
--- a/tests/qemuxml2argvdata/clock-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
index 5f8d7b8c11..4c8a7ca2db 100644
--- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/clock-utc.args
b/tests/qemuxml2argvdata/clock-utc.args
index 44ba322eb1..fccae6cbbf 100644
--- a/tests/qemuxml2argvdata/clock-utc.args
+++ b/tests/qemuxml2argvdata/clock-utc.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/clock-variable.args
b/tests/qemuxml2argvdata/clock-variable.args
index 643b74d6bf..3561e6ba0d 100644
--- a/tests/qemuxml2argvdata/clock-variable.args
+++ b/tests/qemuxml2argvdata/clock-variable.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/console-compat-auto.args
b/tests/qemuxml2argvdata/console-compat-auto.args
index 40f70e5c9d..857dad6e27 100644
--- a/tests/qemuxml2argvdata/console-compat-auto.args
+++ b/tests/qemuxml2argvdata/console-compat-auto.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args
b/tests/qemuxml2argvdata/console-compat-chardev.args
index 40f70e5c9d..857dad6e27 100644
--- a/tests/qemuxml2argvdata/console-compat-chardev.args
+++ b/tests/qemuxml2argvdata/console-compat-chardev.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/console-compat.args
b/tests/qemuxml2argvdata/console-compat.args
index dc9a254997..15f54af71f 100644
--- a/tests/qemuxml2argvdata/console-compat.args
+++ b/tests/qemuxml2argvdata/console-compat.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/console-sclp.args
b/tests/qemuxml2argvdata/console-sclp.args
index ed976ab88c..0bee7f0865 100644
--- a/tests/qemuxml2argvdata/console-sclp.args
+++ b/tests/qemuxml2argvdata/console-sclp.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.args
b/tests/qemuxml2argvdata/console-virtio-ccw.args
index 41e767d815..c34d634c36 100644
--- a/tests/qemuxml2argvdata/console-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/console-virtio-ccw.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/console-virtio-many.args
b/tests/qemuxml2argvdata/console-virtio-many.args
index 3e0ee28863..96623d548e 100644
--- a/tests/qemuxml2argvdata/console-virtio-many.args
+++ b/tests/qemuxml2argvdata/console-virtio-many.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/console-virtio-s390.args
b/tests/qemuxml2argvdata/console-virtio-s390.args
index 6c1f9cee72..683dbf326e 100644
--- a/tests/qemuxml2argvdata/console-virtio-s390.args
+++ b/tests/qemuxml2argvdata/console-virtio-s390.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
index 5c37b1903e..4f3dd18979 100644
--- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args
b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args
index 0749b888b6..9fa08ca98e 100644
--- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/console-virtio.args
b/tests/qemuxml2argvdata/console-virtio.args
index 5fb562a7f3..5d024adc0b 100644
--- a/tests/qemuxml2argvdata/console-virtio.args
+++ b/tests/qemuxml2argvdata/console-virtio.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/controller-order.args
b/tests/qemuxml2argvdata/controller-order.args
index 5ab74a6559..6a77c82835 100644
--- a/tests/qemuxml2argvdata/controller-order.args
+++ b/tests/qemuxml2argvdata/controller-order.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-fdr/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-fdr/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-x86_64 \
-name fdr \
diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
index 095b4724d3..432ee259aa 100644
--- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
index 94116cc676..0e611a0c9f 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args
b/tests/qemuxml2argvdata/cpu-Haswell.args
index 643c6b7e42..52d6abfdc0 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args
b/tests/qemuxml2argvdata/cpu-Haswell2.args
index 9885db7758..d7a0d60c85 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell2.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args
b/tests/qemuxml2argvdata/cpu-Haswell3.args
index fbd1ede38d..b7b1d1e639 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell3.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell3.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args
b/tests/qemuxml2argvdata/cpu-cache-disable.args
index 029769dabc..299fbddff7 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name foo \
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable2.args
b/tests/qemuxml2argvdata/cpu-cache-disable2.args
index 2c6baa113a..e03451dac3 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name foo \
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args
b/tests/qemuxml2argvdata/cpu-cache-disable3.args
index 2c3b50f57e..70a9dd1228 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name foo \
diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
index 0ac181f591..dea6a7e860 100644
--- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name foo \
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args
b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
index 134c764034..806f5469f6 100644
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name foo \
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
index d2ff29bd83..910328d786 100644
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name foo \
diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args
b/tests/qemuxml2argvdata/cpu-check-default-none.args
index df946124e6..7da7a57d1c 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args
b/tests/qemuxml2argvdata/cpu-check-default-none2.args
index 201fc80fbd..1e57c9f698 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-none2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args
b/tests/qemuxml2argvdata/cpu-check-default-partial.args
index c58c69a2a3..246df7b884 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-partial.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args
b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
index bc3c7b3ba4..fe096c6fb0 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-check-none.args
b/tests/qemuxml2argvdata/cpu-check-none.args
index bc3c7b3ba4..fe096c6fb0 100644
--- a/tests/qemuxml2argvdata/cpu-check-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-none.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
index 7bd9024522..599ca1b8e0 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
index a929dbd996..b7c47fd7f5 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-exact1.args
b/tests/qemuxml2argvdata/cpu-exact1.args
index d61ed68e9f..f2f1aac1a2 100644
--- a/tests/qemuxml2argvdata/cpu-exact1.args
+++ b/tests/qemuxml2argvdata/cpu-exact1.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
index 648b44fdfc..07d6b17107 100644
--- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
+++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-exact2.args
b/tests/qemuxml2argvdata/cpu-exact2.args
index 648b44fdfc..07d6b17107 100644
--- a/tests/qemuxml2argvdata/cpu-exact2.args
+++ b/tests/qemuxml2argvdata/cpu-exact2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-fallback.args
b/tests/qemuxml2argvdata/cpu-fallback.args
index 08ae3d091c..54069209d5 100644
--- a/tests/qemuxml2argvdata/cpu-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-fallback.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args
b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
index 9a0cb283cb..8c230f8b8c 100644
--- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
index 8930765954..441091b4d5 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
index c561147ba2..98b85b64cd 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args
b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
index 359857d397..54f6eb9b77 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-host-model.args
b/tests/qemuxml2argvdata/cpu-host-model.args
index 0d192d3079..a457e1f365 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
index dc88596025..5eeac30f2f 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args
b/tests/qemuxml2argvdata/cpu-host-passthrough.args
index df946124e6..7da7a57d1c 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.args
b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
index 9ccad54921..ff35f56ac4 100644
--- a/tests/qemuxml2argvdata/cpu-hotplug-startup.args
+++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args
b/tests/qemuxml2argvdata/cpu-kvmclock.args
index d9fa0fea21..8acc4480d5 100644
--- a/tests/qemuxml2argvdata/cpu-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-kvmclock.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args
b/tests/qemuxml2argvdata/cpu-minimum1.args
index 553a06b96f..fcf1af9b10 100644
--- a/tests/qemuxml2argvdata/cpu-minimum1.args
+++ b/tests/qemuxml2argvdata/cpu-minimum1.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args
b/tests/qemuxml2argvdata/cpu-minimum2.args
index f2b87b76e6..a6573076f0 100644
--- a/tests/qemuxml2argvdata/cpu-minimum2.args
+++ b/tests/qemuxml2argvdata/cpu-minimum2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args
b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
index 046c52da94..20c6f5a14e 100644
--- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args
+++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args
b/tests/qemuxml2argvdata/cpu-numa-memshared.args
index 7921b9fd08..0a7d8107c6 100644
--- a/tests/qemuxml2argvdata/cpu-numa-memshared.args
+++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
index f2e790816f..0c33875ec6 100644
--- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
+++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-numa1.args
b/tests/qemuxml2argvdata/cpu-numa1.args
index f2e790816f..0c33875ec6 100644
--- a/tests/qemuxml2argvdata/cpu-numa1.args
+++ b/tests/qemuxml2argvdata/cpu-numa1.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-numa2.args
b/tests/qemuxml2argvdata/cpu-numa2.args
index f2e790816f..0c33875ec6 100644
--- a/tests/qemuxml2argvdata/cpu-numa2.args
+++ b/tests/qemuxml2argvdata/cpu-numa2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-s390-features.args
b/tests/qemuxml2argvdata/cpu-s390-features.args
index 1cb81ccb19..4b5443bd52 100644
--- a/tests/qemuxml2argvdata/cpu-s390-features.args
+++ b/tests/qemuxml2argvdata/cpu-s390-features.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest1 \
diff --git a/tests/qemuxml2argvdata/cpu-s390-zEC12.args
b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
index aa540bda45..a54f83ed8d 100644
--- a/tests/qemuxml2argvdata/cpu-s390-zEC12.args
+++ b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest1 \
diff --git a/tests/qemuxml2argvdata/cpu-strict1.args
b/tests/qemuxml2argvdata/cpu-strict1.args
index 23205a037c..9e79a593fe 100644
--- a/tests/qemuxml2argvdata/cpu-strict1.args
+++ b/tests/qemuxml2argvdata/cpu-strict1.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-topology1.args
b/tests/qemuxml2argvdata/cpu-topology1.args
index 437d996439..fa90e28057 100644
--- a/tests/qemuxml2argvdata/cpu-topology1.args
+++ b/tests/qemuxml2argvdata/cpu-topology1.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-topology2.args
b/tests/qemuxml2argvdata/cpu-topology2.args
index 12c77c657e..64db68715d 100644
--- a/tests/qemuxml2argvdata/cpu-topology2.args
+++ b/tests/qemuxml2argvdata/cpu-topology2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-topology3.args
b/tests/qemuxml2argvdata/cpu-topology3.args
index 437d996439..fa90e28057 100644
--- a/tests/qemuxml2argvdata/cpu-topology3.args
+++ b/tests/qemuxml2argvdata/cpu-topology3.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
index b51c200900..aa95d49710 100644
--- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
+++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cputune-numatune.args
b/tests/qemuxml2argvdata/cputune-numatune.args
index c094f9b88b..9d0885d55c 100644
--- a/tests/qemuxml2argvdata/cputune-numatune.args
+++ b/tests/qemuxml2argvdata/cputune-numatune.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-dummy2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-dummy2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-dummy2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name dummy2 \
diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args
b/tests/qemuxml2argvdata/cputune-zero-shares.args
index 2343d2a0a1..afec8ebca5 100644
--- a/tests/qemuxml2argvdata/cputune-zero-shares.args
+++ b/tests/qemuxml2argvdata/cputune-zero-shares.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/cputune.args
index 2343d2a0a1..afec8ebca5 100644
--- a/tests/qemuxml2argvdata/cputune.args
+++ b/tests/qemuxml2argvdata/cputune.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/debug-threads.args
b/tests/qemuxml2argvdata/debug-threads.args
index 03bb5b57b9..2d6d915776 100644
--- a/tests/qemuxml2argvdata/debug-threads.args
+++ b/tests/qemuxml2argvdata/debug-threads.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args
b/tests/qemuxml2argvdata/default-kvm-host-arch.args
index b2bc62fb0a..7855d12dea 100644
--- a/tests/qemuxml2argvdata/default-kvm-host-arch.args
+++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-kvm/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-kvm/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-kvm/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name kvm \
diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args
b/tests/qemuxml2argvdata/default-qemu-host-arch.args
index 8bb164dd3b..6050db2225 100644
--- a/tests/qemuxml2argvdata/default-qemu-host-arch.args
+++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-qemu-host/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-qemu-host/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-qemu-host/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name qemu-host \
diff --git a/tests/qemuxml2argvdata/disk-aio.args b/tests/qemuxml2argvdata/disk-aio.args
index bab4191125..fb86bf2036 100644
--- a/tests/qemuxml2argvdata/disk-aio.args
+++ b/tests/qemuxml2argvdata/disk-aio.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
index 1dfade0882..f7ec0c7712 100644
--- a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
index 3894ed2502..9421f6f90f 100644
--- a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
index dea109b13a..865a84b628 100644
--- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
index afe078adcc..97d65fd8a8 100644
--- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-blockio.args
b/tests/qemuxml2argvdata/disk-blockio.args
index a0522e8ccf..8c288e572a 100644
--- a/tests/qemuxml2argvdata/disk-blockio.args
+++ b/tests/qemuxml2argvdata/disk-blockio.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.args
b/tests/qemuxml2argvdata/disk-boot-cdrom.args
index 5ad698eb27..6f80e67741 100644
--- a/tests/qemuxml2argvdata/disk-boot-cdrom.args
+++ b/tests/qemuxml2argvdata/disk-boot-cdrom.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-boot-disk.args
b/tests/qemuxml2argvdata/disk-boot-disk.args
index e912203945..2e144093d4 100644
--- a/tests/qemuxml2argvdata/disk-boot-disk.args
+++ b/tests/qemuxml2argvdata/disk-boot-disk.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
index 288d0aa43c..5c326e565d 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
index 9220e6bee9..2401627ac6 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
index 1c75839c9e..bc090bfe44 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
index 9f7d06e72c..bfc0348dc0 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
index 7f703d0861..07433dfa27 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args
index cb7902dfd0..0c72a7740a 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.args
b/tests/qemuxml2argvdata/disk-cdrom-network.args
index f8803754e0..7bd662b5a5 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-network.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-network.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
index 0ce8497840..a10137ffa6 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
index 0ce8497840..a10137ffa6 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.args
b/tests/qemuxml2argvdata/disk-cdrom-tray.args
index a928de4cbe..95f378764d 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-tray.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-tray.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name test \
diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args
index 79863e456d..894034b2f3 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=test,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args
index 79863e456d..894034b2f3 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=test,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-cdrom.args
b/tests/qemuxml2argvdata/disk-cdrom.args
index 005668952c..2aae56d0a1 100644
--- a/tests/qemuxml2argvdata/disk-cdrom.args
+++ b/tests/qemuxml2argvdata/disk-cdrom.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
index 2fe84177b8..679e31e70a 100644
--- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
index 9b9451f435..0cd9abab86 100644
--- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.args
b/tests/qemuxml2argvdata/disk-copy_on_read.args
index f5e62e99b5..02c34b0e6a 100644
--- a/tests/qemuxml2argvdata/disk-copy_on_read.args
+++ b/tests/qemuxml2argvdata/disk-copy_on_read.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name test \
diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args
index f2b5dbe050..b057eb3a32 100644
--- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=test,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
index f2b5dbe050..b057eb3a32 100644
--- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=test,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.args
b/tests/qemuxml2argvdata/disk-detect-zeroes.args
index 3541d2100f..50d8d726bc 100644
--- a/tests/qemuxml2argvdata/disk-detect-zeroes.args
+++ b/tests/qemuxml2argvdata/disk-detect-zeroes.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name test \
diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args
index 101c0f2e65..90b87332b8 100644
--- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=test,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args
index 101c0f2e65..90b87332b8 100644
--- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=test,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-discard.args
b/tests/qemuxml2argvdata/disk-discard.args
index b093c2a694..2e14bbbe27 100644
--- a/tests/qemuxml2argvdata/disk-discard.args
+++ b/tests/qemuxml2argvdata/disk-discard.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name test \
diff --git a/tests/qemuxml2argvdata/disk-error-policy.args
b/tests/qemuxml2argvdata/disk-error-policy.args
index 66ccf09f9c..63ff7401ad 100644
--- a/tests/qemuxml2argvdata/disk-error-policy.args
+++ b/tests/qemuxml2argvdata/disk-error-policy.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args
index ebdddfd43a..b5dffaf184 100644
--- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args
index e8fa9e2452..6c838b32b4 100644
--- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args
index 17abe9a989..6686ac6dd1 100644
--- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
index 17abe9a989..6686ac6dd1 100644
--- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args
index e4ece864fe..abc4f090c0 100644
--- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args
index e4ece864fe..abc4f090c0 100644
--- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.args
b/tests/qemuxml2argvdata/disk-floppy-tray.args
index cc64a09e74..2517adff72 100644
--- a/tests/qemuxml2argvdata/disk-floppy-tray.args
+++ b/tests/qemuxml2argvdata/disk-floppy-tray.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-floppy.args
b/tests/qemuxml2argvdata/disk-floppy.args
index 432549b85f..31937c103a 100644
--- a/tests/qemuxml2argvdata/disk-floppy.args
+++ b/tests/qemuxml2argvdata/disk-floppy.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args
index 6265ae23c7..742f5aecfe 100644
--- a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args
index 8f10c980c9..1ec339fc20 100644
--- a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.args
b/tests/qemuxml2argvdata/disk-fmt-qcow.args
index 154f7c15e6..5aece87c11 100644
--- a/tests/qemuxml2argvdata/disk-fmt-qcow.args
+++ b/tests/qemuxml2argvdata/disk-fmt-qcow.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-geometry.args
b/tests/qemuxml2argvdata/disk-geometry.args
index e377244cde..ef8f1a5f3c 100644
--- a/tests/qemuxml2argvdata/disk-geometry.args
+++ b/tests/qemuxml2argvdata/disk-geometry.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
index 317e3aec9a..cac993e8c3 100644
--- a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
+++ b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest2 \
diff --git a/tests/qemuxml2argvdata/disk-ide-split.args
b/tests/qemuxml2argvdata/disk-ide-split.args
index b236322625..8a5fb1eb13 100644
--- a/tests/qemuxml2argvdata/disk-ide-split.args
+++ b/tests/qemuxml2argvdata/disk-ide-split.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.args
b/tests/qemuxml2argvdata/disk-ide-wwn.args
index b56febb613..bc68264faa 100644
--- a/tests/qemuxml2argvdata/disk-ide-wwn.args
+++ b/tests/qemuxml2argvdata/disk-ide-wwn.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.args
b/tests/qemuxml2argvdata/disk-ioeventfd.args
index c7a028006c..b24057d349 100644
--- a/tests/qemuxml2argvdata/disk-ioeventfd.args
+++ b/tests/qemuxml2argvdata/disk-ioeventfd.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name test \
diff --git a/tests/qemuxml2argvdata/disk-iscsi.args
b/tests/qemuxml2argvdata/disk-iscsi.args
index 2b889c8f9a..444eb2eaf8 100644
--- a/tests/qemuxml2argvdata/disk-iscsi.args
+++ b/tests/qemuxml2argvdata/disk-iscsi.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-network-gluster.args
b/tests/qemuxml2argvdata/disk-network-gluster.args
index 1538df9068..ebb53048ed 100644
--- a/tests/qemuxml2argvdata/disk-network-gluster.args
+++ b/tests/qemuxml2argvdata/disk-network-gluster.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args
index c463db0ed5..8d3fcca3c1 100644
--- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args
index 9b99db8715..ddea39bd58 100644
--- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
index fc77d34931..02bded2e61 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.args
b/tests/qemuxml2argvdata/disk-network-iscsi.args
index 3cd3b5e03e..47eb42af66 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
index 4b648a985d..355d8dff37 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
index be9ab18314..f26cc5a565 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-network-nbd.args
b/tests/qemuxml2argvdata/disk-network-nbd.args
index 4abff25a0e..656de387e1 100644
--- a/tests/qemuxml2argvdata/disk-network-nbd.args
+++ b/tests/qemuxml2argvdata/disk-network-nbd.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args
index 86bde153ee..2488d68b61 100644
--- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args
index 85452e715a..39e73eb1eb 100644
--- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
index aa562b7afc..cec5b15f7b 100644
--- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
index 82fce3f4de..9a7bbc8a1d 100644
--- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
index 0c5898cbd3..69f516ef74 100644
--- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.args
b/tests/qemuxml2argvdata/disk-network-sheepdog.args
index da42030f79..f71786a1c1 100644
--- a/tests/qemuxml2argvdata/disk-network-sheepdog.args
+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
index 9ade05b3ba..59a563a08b 100644
--- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
index 544c673820..c036aa0bf2 100644
--- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.args
b/tests/qemuxml2argvdata/disk-network-source-auth.args
index 338d37d791..834fde7ee7 100644
--- a/tests/qemuxml2argvdata/disk-network-source-auth.args
+++ b/tests/qemuxml2argvdata/disk-network-source-auth.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
index a585b0350d..43f711df12 100644
--- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
index 9f124ec75f..eeb72e0200 100644
--- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.args
b/tests/qemuxml2argvdata/disk-network-tlsx509.args
index 2239d1ecca..0958dc8339 100644
--- a/tests/qemuxml2argvdata/disk-network-tlsx509.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args
index 5752685514..783f7f5343 100644
--- a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
index 48d70e1cd3..4dae95b839 100644
--- a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-network-vxhs.args
b/tests/qemuxml2argvdata/disk-network-vxhs.args
index 989c60a74e..805ba13e12 100644
--- a/tests/qemuxml2argvdata/disk-network-vxhs.args
+++ b/tests/qemuxml2argvdata/disk-network-vxhs.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-no-boot.args
b/tests/qemuxml2argvdata/disk-no-boot.args
index f461a19091..b50e6c2294 100644
--- a/tests/qemuxml2argvdata/disk-no-boot.args
+++ b/tests/qemuxml2argvdata/disk-no-boot.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-order.args
b/tests/qemuxml2argvdata/disk-order.args
index f798280a57..02c26f5d03 100644
--- a/tests/qemuxml2argvdata/disk-order.args
+++ b/tests/qemuxml2argvdata/disk-order.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.args
b/tests/qemuxml2argvdata/disk-readonly-disk.args
index 75c215e95a..4e33eeb10d 100644
--- a/tests/qemuxml2argvdata/disk-readonly-disk.args
+++ b/tests/qemuxml2argvdata/disk-readonly-disk.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args
index 5c33067c83..e599a846f3 100644
--- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args
index 3fd8f5c849..5bdd84867c 100644
--- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-sata-device.args
b/tests/qemuxml2argvdata/disk-sata-device.args
index a081ef1e69..dc7946ea25 100644
--- a/tests/qemuxml2argvdata/disk-sata-device.args
+++ b/tests/qemuxml2argvdata/disk-sata-device.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
index e2ff678c4e..df1f120d80 100644
--- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
+++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
index 508daa0365..f7c2f3aa06 100644
--- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.args
b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
index 01dc055bb1..f114d54a20 100644
--- a/tests/qemuxml2argvdata/disk-scsi-disk-split.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
index e183ca7771..97b38bbe91 100644
--- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
index b6abcc4e86..d4392105fd 100644
--- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
index a7cecd926e..6b89af34e9 100644
--- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
+++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
index e5b930a28a..bc8c2e53db 100644
--- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-serial.args
b/tests/qemuxml2argvdata/disk-serial.args
index 3455308d2a..b47157023d 100644
--- a/tests/qemuxml2argvdata/disk-serial.args
+++ b/tests/qemuxml2argvdata/disk-serial.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
index 15c3b75df1..3a44228e7c 100644
--- a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
index 141cf735a5..990d5f6007 100644
--- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-snapshot.args
b/tests/qemuxml2argvdata/disk-snapshot.args
index b35d6b8cf5..e8504a5e4b 100644
--- a/tests/qemuxml2argvdata/disk-snapshot.args
+++ b/tests/qemuxml2argvdata/disk-snapshot.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.args
b/tests/qemuxml2argvdata/disk-source-pool-mode.args
index 4d7e085045..66936a691f 100644
--- a/tests/qemuxml2argvdata/disk-source-pool-mode.args
+++ b/tests/qemuxml2argvdata/disk-source-pool-mode.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-source-pool.args
b/tests/qemuxml2argvdata/disk-source-pool.args
index 9e54828724..fdc5a5de43 100644
--- a/tests/qemuxml2argvdata/disk-source-pool.args
+++ b/tests/qemuxml2argvdata/disk-source-pool.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.args
b/tests/qemuxml2argvdata/disk-usb-device-removable.args
index 7c5347bcc0..1961582ecc 100644
--- a/tests/qemuxml2argvdata/disk-usb-device-removable.args
+++ b/tests/qemuxml2argvdata/disk-usb-device-removable.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-usb-device.args
b/tests/qemuxml2argvdata/disk-usb-device.args
index 724a75f8d1..2ca016a1e9 100644
--- a/tests/qemuxml2argvdata/disk-usb-device.args
+++ b/tests/qemuxml2argvdata/disk-usb-device.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
b/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
index 9c5808e1e8..ad49f15cc2 100644
--- a/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
+++ b/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw.args
b/tests/qemuxml2argvdata/disk-virtio-ccw.args
index ef3e1aa946..29ef35d791 100644
--- a/tests/qemuxml2argvdata/disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/disk-virtio-ccw.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.args
b/tests/qemuxml2argvdata/disk-virtio-queues.args
index d79cb73b16..f678faaa83 100644
--- a/tests/qemuxml2argvdata/disk-virtio-queues.args
+++ b/tests/qemuxml2argvdata/disk-virtio-queues.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
index 3daa8316b6..2c911b0cbc 100644
--- a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
+++ b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-virtio-s390.args
b/tests/qemuxml2argvdata/disk-virtio-s390.args
index 67844e788a..49ce8f7bd3 100644
--- a/tests/qemuxml2argvdata/disk-virtio-s390.args
+++ b/tests/qemuxml2argvdata/disk-virtio-s390.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args
index 1173dac674..d591baf48f 100644
--- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args
index 902864539b..ff68cc59c4 100644
--- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/disk-virtio.args
b/tests/qemuxml2argvdata/disk-virtio.args
index 901fe7acdf..9cbcf1d5de 100644
--- a/tests/qemuxml2argvdata/disk-virtio.args
+++ b/tests/qemuxml2argvdata/disk-virtio.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.args
b/tests/qemuxml2argvdata/encrypted-disk-usage.args
index 2fd51072d8..e677ae5050 100644
--- a/tests/qemuxml2argvdata/encrypted-disk-usage.args
+++ b/tests/qemuxml2argvdata/encrypted-disk-usage.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name encryptdisk \
diff --git a/tests/qemuxml2argvdata/encrypted-disk.args
b/tests/qemuxml2argvdata/encrypted-disk.args
index 2fd51072d8..e677ae5050 100644
--- a/tests/qemuxml2argvdata/encrypted-disk.args
+++ b/tests/qemuxml2argvdata/encrypted-disk.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name encryptdisk \
diff --git a/tests/qemuxml2argvdata/eoi-disabled.args
b/tests/qemuxml2argvdata/eoi-disabled.args
index 7bd9024522..599ca1b8e0 100644
--- a/tests/qemuxml2argvdata/eoi-disabled.args
+++ b/tests/qemuxml2argvdata/eoi-disabled.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/eoi-enabled.args
b/tests/qemuxml2argvdata/eoi-enabled.args
index a929dbd996..b7c47fd7f5 100644
--- a/tests/qemuxml2argvdata/eoi-enabled.args
+++ b/tests/qemuxml2argvdata/eoi-enabled.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/event_idx.args
b/tests/qemuxml2argvdata/event_idx.args
index f4c0304c15..a2cdb326e5 100644
--- a/tests/qemuxml2argvdata/event_idx.args
+++ b/tests/qemuxml2argvdata/event_idx.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name test \
diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
index 76c7556468..bbeff4cb68 100644
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-instance-00000092/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-instance-00000092/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name instance-00000092 \
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
index 995d3e2003..d3b5de10d3 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-instance-00000092/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-instance-00000092/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name instance-00000092 \
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
index 891f1747b6..459fcfe56d 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-instance-00000092/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-instance-00000092/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name instance-00000092 \
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
index a1b0692d25..4c7957382f 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-instance-00000092/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-instance-00000092/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name instance-00000092 \
diff --git a/tests/qemuxml2argvdata/fips-enabled.args
b/tests/qemuxml2argvdata/fips-enabled.args
index 1fcefbbf7f..e93f2d6d36 100644
--- a/tests/qemuxml2argvdata/fips-enabled.args
+++ b/tests/qemuxml2argvdata/fips-enabled.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.args
b/tests/qemuxml2argvdata/floppy-drive-fat.args
index 52a7592e4e..b5f2b33223 100644
--- a/tests/qemuxml2argvdata/floppy-drive-fat.args
+++ b/tests/qemuxml2argvdata/floppy-drive-fat.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args
index 70b373c016..4b630bd2e0 100644
--- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args
b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args
index bf133aaab0..0674d69c08 100644
--- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/fs9p-ccw.args b/tests/qemuxml2argvdata/fs9p-ccw.args
index 81bb14442d..0960072fa6 100644
--- a/tests/qemuxml2argvdata/fs9p-ccw.args
+++ b/tests/qemuxml2argvdata/fs9p-ccw.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/fs9p.args b/tests/qemuxml2argvdata/fs9p.args
index 5d9e7d3ad0..ed5ae693d8 100644
--- a/tests/qemuxml2argvdata/fs9p.args
+++ b/tests/qemuxml2argvdata/fs9p.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args
b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args
index 63b1d41885..f451931148 100644
--- a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/genid.x86_64-latest.args
b/tests/qemuxml2argvdata/genid.x86_64-latest.args
index e209a1de72..f470962dc1 100644
--- a/tests/qemuxml2argvdata/genid.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/genid.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args
b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args
index ad9079d912..65ad493f80 100644
--- a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args
b/tests/qemuxml2argvdata/graphics-egl-headless.args
index 4a41ce33fe..c5b90c6d98 100644
--- a/tests/qemuxml2argvdata/graphics-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args
b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args
index ad9079d912..65ad493f80 100644
--- a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
index 01833337dd..87e355e790 100644
--- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
+++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
XAUTHORITY=/root/.Xauthority \
DISPLAY=:0.1 \
/usr/bin/qemu-system-i686 \
diff --git a/tests/qemuxml2argvdata/graphics-sdl.args
b/tests/qemuxml2argvdata/graphics-sdl.args
index 8896af8639..d2b6a30fa3 100644
--- a/tests/qemuxml2argvdata/graphics-sdl.args
+++ b/tests/qemuxml2argvdata/graphics-sdl.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
XAUTHORITY=/root/.Xauthority \
DISPLAY=:0.1 \
/usr/bin/qemu-system-i686 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
index 636ffcb28f..5dedaf9524 100644
--- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
+++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
index b3ff22a729..e18b23c536 100644
--- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
+++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
index b2a8decbea..672ddcb346 100644
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
index b2a8decbea..672ddcb346 100644
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.args
b/tests/qemuxml2argvdata/graphics-spice-compression.args
index 17857780b9..c289ddb993 100644
--- a/tests/qemuxml2argvdata/graphics-spice-compression.args
+++ b/tests/qemuxml2argvdata/graphics-spice-compression.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
index 824d64fd0a..89daf3e66b 100644
--- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
index ee92e1fa5a..4da73ba401 100644
--- a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.args
b/tests/qemuxml2argvdata/graphics-spice-no-args.args
index f427bab402..dc7d5dfc34 100644
--- a/tests/qemuxml2argvdata/graphics-spice-no-args.args
+++ b/tests/qemuxml2argvdata/graphics-spice-no-args.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
index 7acd7732e2..482794b7e9 100644
--- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
+++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args
b/tests/qemuxml2argvdata/graphics-spice-sasl.args
index 664911cb5a..5581b45dda 100644
--- a/tests/qemuxml2argvdata/graphics-spice-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-spice-sasl.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
SASL_CONF_PATH=/root/.sasl2 \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.args
b/tests/qemuxml2argvdata/graphics-spice-socket.args
index 04e88aae98..340135a90b 100644
--- a/tests/qemuxml2argvdata/graphics-spice-socket.args
+++ b/tests/qemuxml2argvdata/graphics-spice-socket.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args
b/tests/qemuxml2argvdata/graphics-spice-timeout.args
index e8cd35a946..b38a1902fe 100644
--- a/tests/qemuxml2argvdata/graphics-spice-timeout.args
+++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-f14/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-f14/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-f14/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name f14 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
index 0ae5cda562..00e69dc659 100644
--- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
+++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-spice.args
b/tests/qemuxml2argvdata/graphics-spice.args
index afe896673e..ec76345335 100644
--- a/tests/qemuxml2argvdata/graphics-spice.args
+++ b/tests/qemuxml2argvdata/graphics-spice.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
index 1a5e2b565c..794b8ebea0 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
index 440884dfed..d6f0a5e26f 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
index bb8fe4e0df..5b65a38bb1 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
index 122d973459..0cc17b53a3 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.args
b/tests/qemuxml2argvdata/graphics-vnc-none.args
index 7234d8588f..74157ae8b5 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-none.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-none.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.args
b/tests/qemuxml2argvdata/graphics-vnc-policy.args
index 9b0571c198..a4a6762f20 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-policy.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-policy.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
index f295c42d72..18e082dfab 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.args
b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
index 9d41bea2bc..dc44171e49 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
SASL_CONF_PATH=/root/.sasl2 \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
index fc4c1731a1..933362939c 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.args
b/tests/qemuxml2argvdata/graphics-vnc-socket.args
index 04f2621799..43443038f2 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
index 737c4fe8fb..1888a15e54 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
SASL_CONF_PATH=/root/.sasl2 \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.args
b/tests/qemuxml2argvdata/graphics-vnc-tls.args
index bb7e34d278..37902d1ef0 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
SASL_CONF_PATH=/root/.sasl2 \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
index 7b8e3a4aa6..a1f3c6bd2b 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
SASL_CONF_PATH=/root/.sasl2 \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
index 97775fad42..70bf59e3fc 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
SASL_CONF_PATH=/root/.sasl2 \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.args
b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
index edb9f80cf6..14878ac578 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-websocket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc.args
b/tests/qemuxml2argvdata/graphics-vnc.args
index 122d973459..0cc17b53a3 100644
--- a/tests/qemuxml2argvdata/graphics-vnc.args
+++ b/tests/qemuxml2argvdata/graphics-vnc.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git
a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
index f5229936fc..10802c5038 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest2,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
index 80c56abfb9..bd8507d960 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest2,debug-threads=on \
diff --git
a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
index 9eaaf89eef..08b2bd3b5a 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest2,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
index dd84b74183..1cb4ceb2dd 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest2,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
index 5d41ba2af5..ed13bd3e94 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest2 \
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.args
b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
index b72d7591bc..eff8476683 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address-device.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest2 \
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.args
b/tests/qemuxml2argvdata/hostdev-pci-address.args
index 8e50f2345e..670b21881f 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest2 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args
b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args
index 01215efeb3..8a8ab4f448 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest2 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args
b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args
index e7b89551e6..308496b03e 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest2 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.args
b/tests/qemuxml2argvdata/hostdev-scsi-lsi.args
index 344a4b1b70..d683381da7 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest2 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args
b/tests/qemuxml2argvdata/hostdev-scsi-readonly.args
index 74899724cf..3b012f717a 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-readonly.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest2 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
index 33527c74b0..f39e9e46a2 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest2 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
index da53ef2b19..7aa7d25b66 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest2 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
index 27b36f2d2c..0556301103 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest2 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args
b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args
index 8cdde3dcce..add33b41c6 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest2 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args
b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args
index c464fbea49..d87185d715 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest2 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args
b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args
index 2e36e6f87f..f888bee2e4 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest2 \
diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
index 1d157fbecf..4a1d201361 100644
--- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
index d9c29aab75..3fcf75cb1d 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.args
b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
index 43f03aa835..f510f7c168 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.args
b/tests/qemuxml2argvdata/hostdev-usb-address.args
index 3a8cf42dac..d3fb6c7e7b 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
index a18945c0a9..dc6a6050a2 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest2 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
index 4309cdf2be..ed540d42f9 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
index 01b06837c8..8835492a6f 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
index 60b6a2e0d2..5b833cd997 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
index 7ca4257a34..0defc21c48 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args
b/tests/qemuxml2argvdata/hostdev-vfio.args
index 92cc15eef8..87374ceed7 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest2 \
diff --git a/tests/qemuxml2argvdata/hotplug-base.args
b/tests/qemuxml2argvdata/hotplug-base.args
index 64cf3e68fd..3296575646 100644
--- a/tests/qemuxml2argvdata/hotplug-base.args
+++ b/tests/qemuxml2argvdata/hotplug-base.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-hotplug/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-hotplug/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-hotplug/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name hotplug \
diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.args
b/tests/qemuxml2argvdata/hugepages-default-2M.args
index 6c5ade296c..54dd1d9a71 100644
--- a/tests/qemuxml2argvdata/hugepages-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name SomeDummyHugepagesGuest \
diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.args
b/tests/qemuxml2argvdata/hugepages-default-system-size.args
index ac7cb167e3..94f2895cc4 100644
--- a/tests/qemuxml2argvdata/hugepages-default-system-size.args
+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name SomeDummyHugepagesGuest \
diff --git a/tests/qemuxml2argvdata/hugepages-default.args
b/tests/qemuxml2argvdata/hugepages-default.args
index b63cb543a5..1b681c82ef 100644
--- a/tests/qemuxml2argvdata/hugepages-default.args
+++ b/tests/qemuxml2argvdata/hugepages-default.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args
b/tests/qemuxml2argvdata/hugepages-memaccess.args
index 030e7f31ef..adde2156ab 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args
b/tests/qemuxml2argvdata/hugepages-memaccess2.args
index 03667f28de..634dabaf1b 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess2.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.args
b/tests/qemuxml2argvdata/hugepages-nodeset.args
index 6c5ade296c..54dd1d9a71 100644
--- a/tests/qemuxml2argvdata/hugepages-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-nodeset.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name SomeDummyHugepagesGuest \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
index a710b583b7..ecf7ce1fc8 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name SomeDummyHugepagesGuest \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
index df90f7aad9..32b743cd02 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name fedora \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.args
b/tests/qemuxml2argvdata/hugepages-numa-default.args
index 440a3466a3..8571a684eb 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name fedora \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
index c6e11dd6c2..a08ea55dc6 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name SomeDummyHugepagesGuest \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
index be07c71af0..70ac061bd1 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
index bc3e64948a..e7dd381286 100644
--- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/hugepages-shared.args
b/tests/qemuxml2argvdata/hugepages-shared.args
index 30f27682de..e2dfb35bcc 100644
--- a/tests/qemuxml2argvdata/hugepages-shared.args
+++ b/tests/qemuxml2argvdata/hugepages-shared.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/hyperv-off.args
b/tests/qemuxml2argvdata/hyperv-off.args
index ca25fe5c5f..6bb8a636bf 100644
--- a/tests/qemuxml2argvdata/hyperv-off.args
+++ b/tests/qemuxml2argvdata/hyperv-off.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/hyperv-panic.args
b/tests/qemuxml2argvdata/hyperv-panic.args
index 468a1112e2..43cc0324ed 100644
--- a/tests/qemuxml2argvdata/hyperv-panic.args
+++ b/tests/qemuxml2argvdata/hyperv-panic.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/hyperv.args b/tests/qemuxml2argvdata/hyperv.args
index 5d59788e14..e7e2c4c4b2 100644
--- a/tests/qemuxml2argvdata/hyperv.args
+++ b/tests/qemuxml2argvdata/hyperv.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args
b/tests/qemuxml2argvdata/input-usbmouse-addr.args
index 92eb6c88f1..ac18e2a444 100644
--- a/tests/qemuxml2argvdata/input-usbmouse-addr.args
+++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/input-usbmouse.args
b/tests/qemuxml2argvdata/input-usbmouse.args
index ecd81c02c5..a54083f2b6 100644
--- a/tests/qemuxml2argvdata/input-usbmouse.args
+++ b/tests/qemuxml2argvdata/input-usbmouse.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/input-usbtablet.args
b/tests/qemuxml2argvdata/input-usbtablet.args
index 038e4a3e8f..46a52901c4 100644
--- a/tests/qemuxml2argvdata/input-usbtablet.args
+++ b/tests/qemuxml2argvdata/input-usbtablet.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/input-virtio-ccw.args
b/tests/qemuxml2argvdata/input-virtio-ccw.args
index 52e72a50c3..a9bd3f70e7 100644
--- a/tests/qemuxml2argvdata/input-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/input-virtio-ccw.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.args
b/tests/qemuxml2argvdata/intel-iommu-caching-mode.args
index 0921d09403..c7b6551b50 100644
--- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.args
+++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.args
b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.args
index 64a26903c4..1e9e96641a 100644
--- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.args
+++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.args
b/tests/qemuxml2argvdata/intel-iommu-eim.args
index 8067821bb0..6599ec4316 100644
--- a/tests/qemuxml2argvdata/intel-iommu-eim.args
+++ b/tests/qemuxml2argvdata/intel-iommu-eim.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/intel-iommu-machine.args
b/tests/qemuxml2argvdata/intel-iommu-machine.args
index 289826d106..f85475b6d9 100644
--- a/tests/qemuxml2argvdata/intel-iommu-machine.args
+++ b/tests/qemuxml2argvdata/intel-iommu-machine.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/intel-iommu.args
b/tests/qemuxml2argvdata/intel-iommu.args
index cad3f62657..fab3af0882 100644
--- a/tests/qemuxml2argvdata/intel-iommu.args
+++ b/tests/qemuxml2argvdata/intel-iommu.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
index b2d9def187..105b0162e6 100644
--- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/iothreads-disk.args
b/tests/qemuxml2argvdata/iothreads-disk.args
index 8ec1faedae..e8b6c80f62 100644
--- a/tests/qemuxml2argvdata/iothreads-disk.args
+++ b/tests/qemuxml2argvdata/iothreads-disk.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.args
b/tests/qemuxml2argvdata/iothreads-ids-partial.args
index 8edf72fdbd..bf10ec6cd9 100644
--- a/tests/qemuxml2argvdata/iothreads-ids-partial.args
+++ b/tests/qemuxml2argvdata/iothreads-ids-partial.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/iothreads-ids.args
b/tests/qemuxml2argvdata/iothreads-ids.args
index 3473050326..c18342ad83 100644
--- a/tests/qemuxml2argvdata/iothreads-ids.args
+++ b/tests/qemuxml2argvdata/iothreads-ids.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
index 1c5be88a47..73a3891f6e 100644
--- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
+++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args
b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args
index cde42c7dd1..f76eec9acc 100644
--- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/iothreads.args
b/tests/qemuxml2argvdata/iothreads.args
index 39c934ec80..63d2f1ea5a 100644
--- a/tests/qemuxml2argvdata/iothreads.args
+++ b/tests/qemuxml2argvdata/iothreads.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/kvm-features-off.args
b/tests/qemuxml2argvdata/kvm-features-off.args
index ca25fe5c5f..6bb8a636bf 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.args
+++ b/tests/qemuxml2argvdata/kvm-features-off.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/kvm-features.args
b/tests/qemuxml2argvdata/kvm-features.args
index d96b286248..0d395d4146 100644
--- a/tests/qemuxml2argvdata/kvm-features.args
+++ b/tests/qemuxml2argvdata/kvm-features.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args
b/tests/qemuxml2argvdata/kvm-pit-delay.args
index f430ac7060..6af09924a3 100644
--- a/tests/qemuxml2argvdata/kvm-pit-delay.args
+++ b/tests/qemuxml2argvdata/kvm-pit-delay.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args
b/tests/qemuxml2argvdata/kvm-pit-discard.args
index 867e5c2d31..d60c38ebb2 100644
--- a/tests/qemuxml2argvdata/kvm-pit-discard.args
+++ b/tests/qemuxml2argvdata/kvm-pit-discard.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.args
b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.args
index 47085c840b..a2b8a3e906 100644
--- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.args
+++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args
index fb9ff613ac..6ce5e7a711 100644
--- a/tests/qemuxml2argvdata/kvmclock.args
+++ b/tests/qemuxml2argvdata/kvmclock.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
index 6da068e1a5..c5e59808f3 100644
--- a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
index 02dcef3988..ab0d70fa54 100644
--- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
+++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name encryptdisk \
diff --git a/tests/qemuxml2argvdata/luks-disks-source.args
b/tests/qemuxml2argvdata/luks-disks-source.args
index 4361346279..1f200777ff 100644
--- a/tests/qemuxml2argvdata/luks-disks-source.args
+++ b/tests/qemuxml2argvdata/luks-disks-source.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name encryptdisk \
diff --git a/tests/qemuxml2argvdata/luks-disks.args
b/tests/qemuxml2argvdata/luks-disks.args
index 628bf7cc1a..aac8a90634 100644
--- a/tests/qemuxml2argvdata/luks-disks.args
+++ b/tests/qemuxml2argvdata/luks-disks.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name encryptdisk \
diff --git a/tests/qemuxml2argvdata/mach-virt-console-virtio.args
b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
index f4a43ff7c6..28619cb0ad 100644
--- a/tests/qemuxml2argvdata/mach-virt-console-virtio.args
+++ b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-native.args
b/tests/qemuxml2argvdata/mach-virt-serial-native.args
index 5918e50dd5..8ccfa20ee0 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-native.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-native.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-pci.args
b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
index 8794619fda..cbf6f6be50 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-pci.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-usb.args
b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
index ff30e99169..458afb9747 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-usb.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
index 3dee5c314f..bb467227dd 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
index 3dee5c314f..bb467227dd 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
index 1a537ba7d5..762fec28cf 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
index 1a537ba7d5..762fec28cf 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/machine-aliases1.args
b/tests/qemuxml2argvdata/machine-aliases1.args
index 4570f4684c..0a4783b117 100644
--- a/tests/qemuxml2argvdata/machine-aliases1.args
+++ b/tests/qemuxml2argvdata/machine-aliases1.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/machine-aliases2.args
b/tests/qemuxml2argvdata/machine-aliases2.args
index e952b8c28f..bbc45f9820 100644
--- a/tests/qemuxml2argvdata/machine-aliases2.args
+++ b/tests/qemuxml2argvdata/machine-aliases2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/machine-core-off.args
b/tests/qemuxml2argvdata/machine-core-off.args
index 44ba322eb1..fccae6cbbf 100644
--- a/tests/qemuxml2argvdata/machine-core-off.args
+++ b/tests/qemuxml2argvdata/machine-core-off.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/machine-core-on.args
b/tests/qemuxml2argvdata/machine-core-on.args
index b5f453533a..fdb5b01a1a 100644
--- a/tests/qemuxml2argvdata/machine-core-on.args
+++ b/tests/qemuxml2argvdata/machine-core-on.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
index 8911ae1d3e..616b2b7fe9 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
index 8911ae1d3e..616b2b7fe9 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
index c019470492..2dbe1a55ee 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
index c019470492..2dbe1a55ee 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
index 9bbbab411a..4ee41df2e0 100644
--- a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
+++ b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.args
b/tests/qemuxml2argvdata/machine-keywrap-none.args
index 9bbbab411a..4ee41df2e0 100644
--- a/tests/qemuxml2argvdata/machine-keywrap-none.args
+++ b/tests/qemuxml2argvdata/machine-keywrap-none.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
index 8f2540dc69..a79fe9bd62 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
index 59a6fbab00..60186de500 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390.args
b/tests/qemuxml2argvdata/machine-loadparm-s390.args
index fe7d530d6e..6190f99227 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-s390.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/machine-smm-opt.args
b/tests/qemuxml2argvdata/machine-smm-opt.args
index e4dea21a7c..2a46b1e75b 100644
--- a/tests/qemuxml2argvdata/machine-smm-opt.args
+++ b/tests/qemuxml2argvdata/machine-smm-opt.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args
b/tests/qemuxml2argvdata/machine-vmport-opt.args
index 4830deea57..a22979d404 100644
--- a/tests/qemuxml2argvdata/machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/master-key.args
b/tests/qemuxml2argvdata/master-key.args
index 1b0f9e3d6f..0861a1a5b5 100644
--- a/tests/qemuxml2argvdata/master-key.args
+++ b/tests/qemuxml2argvdata/master-key.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
index d0f4057e01..578fee52db 100644
--- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-instance-00000092/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-instance-00000092/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=instance-00000092,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
index 5fd90dabb0..61771cb574 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
index 4dd6c2a0a9..ba28eb389e 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
index f11de69cdc..4995f6b331 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
index 7017719ddc..aad242ca6c 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
index 6c224b91e5..d9ef516e6c 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
index 9d0ecfc115..8b96529172 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
index 783d16b9db..4924975854 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
index 6309250e47..4208c9bba4 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
index 836ee73bc9..ffdedd2d06 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/memory-hotplug.args
b/tests/qemuxml2argvdata/memory-hotplug.args
index 4d95efc713..c5f67af12e 100644
--- a/tests/qemuxml2argvdata/memory-hotplug.args
+++ b/tests/qemuxml2argvdata/memory-hotplug.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args
b/tests/qemuxml2argvdata/memtune-unlimited.args
index 547b9ced44..21d141cb7c 100644
--- a/tests/qemuxml2argvdata/memtune-unlimited.args
+++ b/tests/qemuxml2argvdata/memtune-unlimited.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args
index 547b9ced44..21d141cb7c 100644
--- a/tests/qemuxml2argvdata/memtune.args
+++ b/tests/qemuxml2argvdata/memtune.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.args
b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
index 3fb91b81a8..b4a083e177 100644
--- a/tests/qemuxml2argvdata/migrate-numa-unaligned.args
+++ b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest \
diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/migrate.args
index f633031860..1d53abd32f 100644
--- a/tests/qemuxml2argvdata/migrate.args
+++ b/tests/qemuxml2argvdata/migrate.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/minimal-msg-timestamp.args
b/tests/qemuxml2argvdata/minimal-msg-timestamp.args
index 36a1d27074..38ccdf6843 100644
--- a/tests/qemuxml2argvdata/minimal-msg-timestamp.args
+++ b/tests/qemuxml2argvdata/minimal-msg-timestamp.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/minimal-sandbox.args
b/tests/qemuxml2argvdata/minimal-sandbox.args
index 373f91141e..6ac61c2c87 100644
--- a/tests/qemuxml2argvdata/minimal-sandbox.args
+++ b/tests/qemuxml2argvdata/minimal-sandbox.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args
index 547b9ced44..21d141cb7c 100644
--- a/tests/qemuxml2argvdata/minimal.args
+++ b/tests/qemuxml2argvdata/minimal.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/misc-acpi.args
b/tests/qemuxml2argvdata/misc-acpi.args
index d714bfaba6..4fd8a659ca 100644
--- a/tests/qemuxml2argvdata/misc-acpi.args
+++ b/tests/qemuxml2argvdata/misc-acpi.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args
b/tests/qemuxml2argvdata/misc-disable-s3.args
index 2aa8ff3c6a..db34a779c2 100644
--- a/tests/qemuxml2argvdata/misc-disable-s3.args
+++ b/tests/qemuxml2argvdata/misc-disable-s3.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args
b/tests/qemuxml2argvdata/misc-disable-suspends.args
index e420a2344f..435421523e 100644
--- a/tests/qemuxml2argvdata/misc-disable-suspends.args
+++ b/tests/qemuxml2argvdata/misc-disable-suspends.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args
b/tests/qemuxml2argvdata/misc-enable-s4.args
index adbba6befd..9c122cb1b0 100644
--- a/tests/qemuxml2argvdata/misc-enable-s4.args
+++ b/tests/qemuxml2argvdata/misc-enable-s4.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/misc-no-reboot.args
b/tests/qemuxml2argvdata/misc-no-reboot.args
index 5c927afd45..7d34ca5a20 100644
--- a/tests/qemuxml2argvdata/misc-no-reboot.args
+++ b/tests/qemuxml2argvdata/misc-no-reboot.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/misc-uuid.args
b/tests/qemuxml2argvdata/misc-uuid.args
index d714bfaba6..4fd8a659ca 100644
--- a/tests/qemuxml2argvdata/misc-uuid.args
+++ b/tests/qemuxml2argvdata/misc-uuid.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/mlock-off.args
b/tests/qemuxml2argvdata/mlock-off.args
index 9a90b0a733..bb52bf8f47 100644
--- a/tests/qemuxml2argvdata/mlock-off.args
+++ b/tests/qemuxml2argvdata/mlock-off.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/mlock-on.args b/tests/qemuxml2argvdata/mlock-on.args
index 40e3090187..d5a3901867 100644
--- a/tests/qemuxml2argvdata/mlock-on.args
+++ b/tests/qemuxml2argvdata/mlock-on.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/mlock-unsupported.args
b/tests/qemuxml2argvdata/mlock-unsupported.args
index b827036b0a..dcf98040c7 100644
--- a/tests/qemuxml2argvdata/mlock-unsupported.args
+++ b/tests/qemuxml2argvdata/mlock-unsupported.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/monitor-json.args
b/tests/qemuxml2argvdata/monitor-json.args
index d46543a57e..a46e1effe5 100644
--- a/tests/qemuxml2argvdata/monitor-json.args
+++ b/tests/qemuxml2argvdata/monitor-json.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name encryptdisk \
diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args
b/tests/qemuxml2argvdata/multifunction-pci-device.args
index 94e89c411f..4abefbf40a 100644
--- a/tests/qemuxml2argvdata/multifunction-pci-device.args
+++ b/tests/qemuxml2argvdata/multifunction-pci-device.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/name-escape.args
b/tests/qemuxml2argvdata/name-escape.args
index 9190b0b921..27bb8a62f7 100644
--- a/tests/qemuxml2argvdata/name-escape.args
+++ b/tests/qemuxml2argvdata/name-escape.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-foo=1,bar=2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-foo=1,bar=2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-foo=1,bar=2/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name guest=foo=1,,bar=2,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/net-client.args
b/tests/qemuxml2argvdata/net-client.args
index 054064f0b2..fcedf4924b 100644
--- a/tests/qemuxml2argvdata/net-client.args
+++ b/tests/qemuxml2argvdata/net-client.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args
b/tests/qemuxml2argvdata/net-eth-hostip.args
index 0a18fd7ae7..fe58cf820f 100644
--- a/tests/qemuxml2argvdata/net-eth-hostip.args
+++ b/tests/qemuxml2argvdata/net-eth-hostip.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args
b/tests/qemuxml2argvdata/net-eth-ifname.args
index 0a18fd7ae7..fe58cf820f 100644
--- a/tests/qemuxml2argvdata/net-eth-ifname.args
+++ b/tests/qemuxml2argvdata/net-eth-ifname.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-eth-names.args
b/tests/qemuxml2argvdata/net-eth-names.args
index 7d6f0e9578..f15fad16cf 100644
--- a/tests/qemuxml2argvdata/net-eth-names.args
+++ b/tests/qemuxml2argvdata/net-eth-names.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/net-eth.args
index 0a18fd7ae7..fe58cf820f 100644
--- a/tests/qemuxml2argvdata/net-eth.args
+++ b/tests/qemuxml2argvdata/net-eth.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
index f3c332b405..0b216e0fc8 100644
--- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
index 5df24f5d18..b8296b5b13 100644
--- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
index 6903d878d1..2c00340d2b 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args
b/tests/qemuxml2argvdata/net-hostdev-vfio.args
index d8a669b836..3493002a65 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-hostdev.args
b/tests/qemuxml2argvdata/net-hostdev.args
index c9515b2671..091c7c7834 100644
--- a/tests/qemuxml2argvdata/net-hostdev.args
+++ b/tests/qemuxml2argvdata/net-hostdev.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-mcast.args
b/tests/qemuxml2argvdata/net-mcast.args
index 43668f8839..1f22d930d4 100644
--- a/tests/qemuxml2argvdata/net-mcast.args
+++ b/tests/qemuxml2argvdata/net-mcast.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-server.args
b/tests/qemuxml2argvdata/net-server.args
index 06de02d698..d98256bb37 100644
--- a/tests/qemuxml2argvdata/net-server.args
+++ b/tests/qemuxml2argvdata/net-server.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/net-udp.args
index c3c32933d0..7fda543227 100644
--- a/tests/qemuxml2argvdata/net-udp.args
+++ b/tests/qemuxml2argvdata/net-udp.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-user-addr.args
b/tests/qemuxml2argvdata/net-user-addr.args
index cb2f46d294..0700ffd600 100644
--- a/tests/qemuxml2argvdata/net-user-addr.args
+++ b/tests/qemuxml2argvdata/net-user-addr.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/net-user.args
index c796031c37..5eb349d977 100644
--- a/tests/qemuxml2argvdata/net-user.args
+++ b/tests/qemuxml2argvdata/net-user.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
index a211216381..5f2270f0f2 100644
--- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
+++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-vhostuser.args
b/tests/qemuxml2argvdata/net-vhostuser.args
index 516cb23123..0a706113d4 100644
--- a/tests/qemuxml2argvdata/net-vhostuser.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
index 8f67b14a2b..df149acc20 100644
--- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
index d96d8ca3a6..e021ef4a57 100644
--- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.args
b/tests/qemuxml2argvdata/net-virtio-ccw.args
index dad8605ad8..382ac65436 100644
--- a/tests/qemuxml2argvdata/net-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/net-virtio-ccw.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-virtio-device.args
b/tests/qemuxml2argvdata/net-virtio-device.args
index 3d73551162..e9170a8a90 100644
--- a/tests/qemuxml2argvdata/net-virtio-device.args
+++ b/tests/qemuxml2argvdata/net-virtio-device.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
index fe1c985e3c..0241fd7fd9 100644
--- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
+++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args
b/tests/qemuxml2argvdata/net-virtio-netdev.args
index 3db1196dea..8cff93414b 100644
--- a/tests/qemuxml2argvdata/net-virtio-netdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-netdev.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
index f75a79eb58..0ad7fc5051 100644
--- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
+++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-virtio-s390.args
b/tests/qemuxml2argvdata/net-virtio-s390.args
index fbdbf7c451..3c3c2313d6 100644
--- a/tests/qemuxml2argvdata/net-virtio-s390.args
+++ b/tests/qemuxml2argvdata/net-virtio-s390.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/net-virtio.args
b/tests/qemuxml2argvdata/net-virtio.args
index 39ca2c035c..58e07c48de 100644
--- a/tests/qemuxml2argvdata/net-virtio.args
+++ b/tests/qemuxml2argvdata/net-virtio.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/nosharepages.args
b/tests/qemuxml2argvdata/nosharepages.args
index bfac1b25c6..9616ac8f06 100644
--- a/tests/qemuxml2argvdata/nosharepages.args
+++ b/tests/qemuxml2argvdata/nosharepages.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
index 2343d2a0a1..afec8ebca5 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
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 2343d2a0a1..afec8ebca5 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
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
index 2343d2a0a1..afec8ebca5 100644
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
index 2343d2a0a1..afec8ebca5 100644
--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
+++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args
index 2343d2a0a1..afec8ebca5 100644
--- a/tests/qemuxml2argvdata/numad.args
+++ b/tests/qemuxml2argvdata/numad.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
index 2343d2a0a1..afec8ebca5 100644
--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
+++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.args
b/tests/qemuxml2argvdata/numatune-auto-prefer.args
index 3f587468de..0ec2456604 100644
--- a/tests/qemuxml2argvdata/numatune-auto-prefer.args
+++ b/tests/qemuxml2argvdata/numatune-auto-prefer.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest \
diff --git a/tests/qemuxml2argvdata/numatune-distances.args
b/tests/qemuxml2argvdata/numatune-distances.args
index 548369adff..a10dd7977a 100644
--- a/tests/qemuxml2argvdata/numatune-distances.args
+++ b/tests/qemuxml2argvdata/numatune-distances.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest \
diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
index 53c037e3e9..1d439dc8ee 100644
--- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest \
diff --git a/tests/qemuxml2argvdata/numatune-memnode.args
b/tests/qemuxml2argvdata/numatune-memnode.args
index 2f327215ac..9b9d53f9f2 100644
--- a/tests/qemuxml2argvdata/numatune-memnode.args
+++ b/tests/qemuxml2argvdata/numatune-memnode.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest \
diff --git a/tests/qemuxml2argvdata/numatune-memory.args
b/tests/qemuxml2argvdata/numatune-memory.args
index 2343d2a0a1..afec8ebca5 100644
--- a/tests/qemuxml2argvdata/numatune-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memory.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args
b/tests/qemuxml2argvdata/pages-dimm-discard.args
index bec8eb4f86..c81495c535 100644
--- a/tests/qemuxml2argvdata/pages-dimm-discard.args
+++ b/tests/qemuxml2argvdata/pages-dimm-discard.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name fedora \
diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.args
b/tests/qemuxml2argvdata/pages-discard-hugepages.args
index a710b583b7..ecf7ce1fc8 100644
--- a/tests/qemuxml2argvdata/pages-discard-hugepages.args
+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name SomeDummyHugepagesGuest \
diff --git a/tests/qemuxml2argvdata/pages-discard.args
b/tests/qemuxml2argvdata/pages-discard.args
index f249dbdf8c..10c0c0ead0 100644
--- a/tests/qemuxml2argvdata/pages-discard.args
+++ b/tests/qemuxml2argvdata/pages-discard.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/panic-double.args
b/tests/qemuxml2argvdata/panic-double.args
index 0b244714cf..d838a248f1 100644
--- a/tests/qemuxml2argvdata/panic-double.args
+++ b/tests/qemuxml2argvdata/panic-double.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/panic-no-address.args
b/tests/qemuxml2argvdata/panic-no-address.args
index efd287ba96..9c0d87368f 100644
--- a/tests/qemuxml2argvdata/panic-no-address.args
+++ b/tests/qemuxml2argvdata/panic-no-address.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/panic.args b/tests/qemuxml2argvdata/panic.args
index 5307da1d7f..b29d7a6f27 100644
--- a/tests/qemuxml2argvdata/panic.args
+++ b/tests/qemuxml2argvdata/panic.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args
b/tests/qemuxml2argvdata/parallel-parport-chardev.args
index f03efd361f..40ef641a4c 100644
--- a/tests/qemuxml2argvdata/parallel-parport-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
index e1befe14aa..709f321881 100644
--- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
index eb504a7210..a8fe991bfa 100644
--- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args
b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args
index e3fa87c503..ab6e90b2f5 100644
--- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args
b/tests/qemuxml2argvdata/pci-autoadd-addr.args
index 1ec645d8dc..e0353dc2f3 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-addr.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-fdr-br/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name fdr-br \
diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args
b/tests/qemuxml2argvdata/pci-autoadd-idx.args
index e56c648536..7c832a1204 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-idx.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-fdr-br/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name fdr-br \
diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args
b/tests/qemuxml2argvdata/pci-autofill-addr.args
index 1508787f8b..e32ad6e0ee 100644
--- a/tests/qemuxml2argvdata/pci-autofill-addr.args
+++ b/tests/qemuxml2argvdata/pci-autofill-addr.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-fdr-br/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name fdr-br \
diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
index 62e4c3a436..794e005dba 100644
--- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
+++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-lots-of-disks/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-lots-of-disks/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-lots-of-disks/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name lots-of-disks \
diff --git a/tests/qemuxml2argvdata/pci-bridge.args
b/tests/qemuxml2argvdata/pci-bridge.args
index 4df7953f2b..748c6ebcaa 100644
--- a/tests/qemuxml2argvdata/pci-bridge.args
+++ b/tests/qemuxml2argvdata/pci-bridge.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-fdr-br/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name fdr-br \
diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args
b/tests/qemuxml2argvdata/pci-expander-bus.args
index f9cb8bc268..18a6a31f5e 100644
--- a/tests/qemuxml2argvdata/pci-expander-bus.args
+++ b/tests/qemuxml2argvdata/pci-expander-bus.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-expander-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-expander-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-expander-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name expander-test \
diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args
index 7b06be8b15..d6b5a33581 100644
--- a/tests/qemuxml2argvdata/pci-many.args
+++ b/tests/qemuxml2argvdata/pci-many.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-fdr-br/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name fdr-br \
diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args
b/tests/qemuxml2argvdata/pci-rom-disabled.args
index 731c52de60..fa02fb4662 100644
--- a/tests/qemuxml2argvdata/pci-rom-disabled.args
+++ b/tests/qemuxml2argvdata/pci-rom-disabled.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args
index 64d7b16632..4a3d963b78 100644
--- a/tests/qemuxml2argvdata/pci-rom.args
+++ b/tests/qemuxml2argvdata/pci-rom.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest2 \
diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
index d127dd46c7..f1279a9c2d 100644
--- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args
b/tests/qemuxml2argvdata/pcie-expander-bus.args
index 9328f98390..c2b8102191 100644
--- a/tests/qemuxml2argvdata/pcie-expander-bus.args
+++ b/tests/qemuxml2argvdata/pcie-expander-bus.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-pcie-expander-bus-te/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-pcie-expander-bus-te/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-pcie-expander-bus-te/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name pcie-expander-bus-test \
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
index d57014dfa7..cefad08474 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
index 2f0db0fb65..e537e9231c 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/pcie-root-port.args
b/tests/qemuxml2argvdata/pcie-root-port.args
index 7d96a5aa5c..ce0752baa9 100644
--- a/tests/qemuxml2argvdata/pcie-root-port.args
+++ b/tests/qemuxml2argvdata/pcie-root-port.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35-test \
diff --git a/tests/qemuxml2argvdata/pcie-root.args
b/tests/qemuxml2argvdata/pcie-root.args
index 03d93168bd..cf487bc6ae 100644
--- a/tests/qemuxml2argvdata/pcie-root.args
+++ b/tests/qemuxml2argvdata/pcie-root.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35-test \
diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
index a670850b0d..575a19b7b0 100644
--- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35-test \
diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
index 9ef2bb0269..03eca9086a 100644
--- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35-test \
diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args
b/tests/qemuxml2argvdata/pcihole64-q35.args
index 08163189ec..fd9db5570b 100644
--- a/tests/qemuxml2argvdata/pcihole64-q35.args
+++ b/tests/qemuxml2argvdata/pcihole64-q35.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35-test \
diff --git a/tests/qemuxml2argvdata/pcihole64.args
b/tests/qemuxml2argvdata/pcihole64.args
index 8fcb2fc885..2e934d2a1c 100644
--- a/tests/qemuxml2argvdata/pcihole64.args
+++ b/tests/qemuxml2argvdata/pcihole64.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name foo \
diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args
b/tests/qemuxml2argvdata/pmu-feature-off.args
index 872d8b4475..c73d50b58b 100644
--- a/tests/qemuxml2argvdata/pmu-feature-off.args
+++ b/tests/qemuxml2argvdata/pmu-feature-off.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pmu-feature.args
b/tests/qemuxml2argvdata/pmu-feature.args
index 1602f15d93..7b6634c796 100644
--- a/tests/qemuxml2argvdata/pmu-feature.args
+++ b/tests/qemuxml2argvdata/pmu-feature.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/ppc-dtb.args b/tests/qemuxml2argvdata/ppc-dtb.args
index 510d00425c..a7da6efeab 100644
--- a/tests/qemuxml2argvdata/ppc-dtb.args
+++ b/tests/qemuxml2argvdata/ppc-dtb.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
index 2ae5cfb84c..b9f3384e4d 100644
--- a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
index ca3f8ddd01..fd70f74866 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
index 4397b6cbcc..02b4e2d968 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller.args
b/tests/qemuxml2argvdata/ppc64-usb-controller.args
index fee9abdb29..0755151bea 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/ppce500-serial.args
b/tests/qemuxml2argvdata/ppce500-serial.args
index 348955ef3e..f353acb308 100644
--- a/tests/qemuxml2argvdata/ppce500-serial.args
+++ b/tests/qemuxml2argvdata/ppce500-serial.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pseries-basic.args
b/tests/qemuxml2argvdata/pseries-basic.args
index db5ab1ee10..b5ddce9e12 100644
--- a/tests/qemuxml2argvdata/pseries-basic.args
+++ b/tests/qemuxml2argvdata/pseries-basic.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pseries-console-virtio.args
b/tests/qemuxml2argvdata/pseries-console-virtio.args
index 2240e9b418..8b7b8d1e83 100644
--- a/tests/qemuxml2argvdata/pseries-console-virtio.args
+++ b/tests/qemuxml2argvdata/pseries-console-virtio.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
index f6f07b44b1..aed740fcf6 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat.args
b/tests/qemuxml2argvdata/pseries-cpu-compat.args
index 773b221dd3..42cbcd6d54 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-compat.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-exact.args
b/tests/qemuxml2argvdata/pseries-cpu-exact.args
index 8ce1598a81..5bf0227a46 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-exact.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-exact.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-le.args
b/tests/qemuxml2argvdata/pseries-cpu-le.args
index ffc3f7b9d7..9dff2fc2e1 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-le.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-le.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pseries-features.args
b/tests/qemuxml2argvdata/pseries-features.args
index 0acab91c2a..efcf457689 100644
--- a/tests/qemuxml2argvdata/pseries-features.args
+++ b/tests/qemuxml2argvdata/pseries-features.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-1.args
b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
index 2c6f51464b..f3385eaf1c 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-1.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-2.args
b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
index dca6c27d1f..f085750fc9 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-2.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-3.args
b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
index 5ae171e5bb..cf9890b90d 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-3.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
index 553c317c51..b612c3c8f4 100644
--- a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
+++ b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pseries-many-buses-1.args
b/tests/qemuxml2argvdata/pseries-many-buses-1.args
index 5e62ff529a..46b3d28689 100644
--- a/tests/qemuxml2argvdata/pseries-many-buses-1.args
+++ b/tests/qemuxml2argvdata/pseries-many-buses-1.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/pseries-many-buses-2.args
b/tests/qemuxml2argvdata/pseries-many-buses-2.args
index cc1f641e99..921477d864 100644
--- a/tests/qemuxml2argvdata/pseries-many-buses-2.args
+++ b/tests/qemuxml2argvdata/pseries-many-buses-2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/pseries-many-devices.args
b/tests/qemuxml2argvdata/pseries-many-devices.args
index 1ef609b940..f9f7cdce25 100644
--- a/tests/qemuxml2argvdata/pseries-many-devices.args
+++ b/tests/qemuxml2argvdata/pseries-many-devices.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/pseries-nvram.args
b/tests/qemuxml2argvdata/pseries-nvram.args
index 1274dc433b..e067db0594 100644
--- a/tests/qemuxml2argvdata/pseries-nvram.args
+++ b/tests/qemuxml2argvdata/pseries-nvram.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pseries-panic-missing.args
b/tests/qemuxml2argvdata/pseries-panic-missing.args
index db5ab1ee10..b5ddce9e12 100644
--- a/tests/qemuxml2argvdata/pseries-panic-missing.args
+++ b/tests/qemuxml2argvdata/pseries-panic-missing.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pseries-panic-no-address.args
b/tests/qemuxml2argvdata/pseries-panic-no-address.args
index db5ab1ee10..b5ddce9e12 100644
--- a/tests/qemuxml2argvdata/pseries-panic-no-address.args
+++ b/tests/qemuxml2argvdata/pseries-panic-no-address.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pseries-phb-default-missing.args
b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
index 3ea566ccf6..5f1f1ac3b5 100644
--- a/tests/qemuxml2argvdata/pseries-phb-default-missing.args
+++ b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.args
b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
index 03f3ece9aa..b58ccfd22d 100644
--- a/tests/qemuxml2argvdata/pseries-phb-numa-node.args
+++ b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pseries-phb-simple.args
b/tests/qemuxml2argvdata/pseries-phb-simple.args
index 3ea566ccf6..5f1f1ac3b5 100644
--- a/tests/qemuxml2argvdata/pseries-phb-simple.args
+++ b/tests/qemuxml2argvdata/pseries-phb-simple.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pseries-serial-native.args
b/tests/qemuxml2argvdata/pseries-serial-native.args
index f76eb7727c..cedee6d56b 100644
--- a/tests/qemuxml2argvdata/pseries-serial-native.args
+++ b/tests/qemuxml2argvdata/pseries-serial-native.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/pseries-serial-pci.args
b/tests/qemuxml2argvdata/pseries-serial-pci.args
index 4a885a2770..6061d7eb16 100644
--- a/tests/qemuxml2argvdata/pseries-serial-pci.args
+++ b/tests/qemuxml2argvdata/pseries-serial-pci.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/pseries-serial-usb.args
b/tests/qemuxml2argvdata/pseries-serial-usb.args
index 46e665dab8..fe78c51b8f 100644
--- a/tests/qemuxml2argvdata/pseries-serial-usb.args
+++ b/tests/qemuxml2argvdata/pseries-serial-usb.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/pseries-usb-default.args
b/tests/qemuxml2argvdata/pseries-usb-default.args
index f903df7817..d88f20f020 100644
--- a/tests/qemuxml2argvdata/pseries-usb-default.args
+++ b/tests/qemuxml2argvdata/pseries-usb-default.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pseries-usb-kbd.args
b/tests/qemuxml2argvdata/pseries-usb-kbd.args
index fbbec05c28..58f9d24052 100644
--- a/tests/qemuxml2argvdata/pseries-usb-kbd.args
+++ b/tests/qemuxml2argvdata/pseries-usb-kbd.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pseries-usb-multi.args
b/tests/qemuxml2argvdata/pseries-usb-multi.args
index 7e655b178b..d36d1528de 100644
--- a/tests/qemuxml2argvdata/pseries-usb-multi.args
+++ b/tests/qemuxml2argvdata/pseries-usb-multi.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
index 62b98363ef..d63979a388 100644
--- a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
+++ b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pseries-vio.args
b/tests/qemuxml2argvdata/pseries-vio.args
index d55272e85b..39383a524b 100644
--- a/tests/qemuxml2argvdata/pseries-vio.args
+++ b/tests/qemuxml2argvdata/pseries-vio.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.args
b/tests/qemuxml2argvdata/pv-spinlock-disabled.args
index 800d55cd76..e1f829ac4f 100644
--- a/tests/qemuxml2argvdata/pv-spinlock-disabled.args
+++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.args
b/tests/qemuxml2argvdata/pv-spinlock-enabled.args
index 5d307125c3..d64e90501c 100644
--- a/tests/qemuxml2argvdata/pv-spinlock-enabled.args
+++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/q35-acpi-nouefi.args
b/tests/qemuxml2argvdata/q35-acpi-nouefi.args
index aa1fb8dcee..8f8f9171a8 100644
--- a/tests/qemuxml2argvdata/q35-acpi-nouefi.args
+++ b/tests/qemuxml2argvdata/q35-acpi-nouefi.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.args
b/tests/qemuxml2argvdata/q35-acpi-uefi.args
index 22508d6494..b71f9cad0f 100644
--- a/tests/qemuxml2argvdata/q35-acpi-uefi.args
+++ b/tests/qemuxml2argvdata/q35-acpi-uefi.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.args
b/tests/qemuxml2argvdata/q35-default-devices-only.args
index 6e834dc6e8..9d64da93cd 100644
--- a/tests/qemuxml2argvdata/q35-default-devices-only.args
+++ b/tests/qemuxml2argvdata/q35-default-devices-only.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35-test \
diff --git a/tests/qemuxml2argvdata/q35-multifunction.args
b/tests/qemuxml2argvdata/q35-multifunction.args
index 13d89247b1..d688f69931 100644
--- a/tests/qemuxml2argvdata/q35-multifunction.args
+++ b/tests/qemuxml2argvdata/q35-multifunction.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35-test \
diff --git a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
index a3c7bde0ec..6955a663d9 100644
--- a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
+++ b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest \
diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args
b/tests/qemuxml2argvdata/q35-pci-force-address.args
index 53b70c9cde..0ff49ee42f 100644
--- a/tests/qemuxml2argvdata/q35-pci-force-address.args
+++ b/tests/qemuxml2argvdata/q35-pci-force-address.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35-test \
diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.args
b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
index 7ebcc93297..0b73ae95da 100644
--- a/tests/qemuxml2argvdata/q35-pcie-autoadd.args
+++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35-test \
diff --git a/tests/qemuxml2argvdata/q35-pcie.args b/tests/qemuxml2argvdata/q35-pcie.args
index 91c4f85396..45557acf06 100644
--- a/tests/qemuxml2argvdata/q35-pcie.args
+++ b/tests/qemuxml2argvdata/q35-pcie.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35-test \
diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
index 8198b9c60b..d5981fda90 100644
--- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35 \
diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args
b/tests/qemuxml2argvdata/q35-pm-disable.args
index 079f37b9b2..593cbdf91d 100644
--- a/tests/qemuxml2argvdata/q35-pm-disable.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35 \
diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args
b/tests/qemuxml2argvdata/q35-usb2-multi.args
index 85427bbb49..94616232f9 100644
--- a/tests/qemuxml2argvdata/q35-usb2-multi.args
+++ b/tests/qemuxml2argvdata/q35-usb2-multi.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35-test \
diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args
b/tests/qemuxml2argvdata/q35-usb2-reorder.args
index 2e9a6d595e..81ca776a90 100644
--- a/tests/qemuxml2argvdata/q35-usb2-reorder.args
+++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35-test \
diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args
index 03ae90892d..a20c2097d9 100644
--- a/tests/qemuxml2argvdata/q35-usb2.args
+++ b/tests/qemuxml2argvdata/q35-usb2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35-test \
diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
index e9b8c0b681..f556951a64 100644
--- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-virt-manager-basic/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-virt-manager-basic/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-virt-manager-basic/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-x86_64 \
-name virt-manager-basic \
diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.args
b/tests/qemuxml2argvdata/q35-virtio-pci.args
index 54504582ae..8d7e756850 100644
--- a/tests/qemuxml2argvdata/q35-virtio-pci.args
+++ b/tests/qemuxml2argvdata/q35-virtio-pci.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35-test \
diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args
index 10f3d48a8d..a5712fe543 100644
--- a/tests/qemuxml2argvdata/q35.args
+++ b/tests/qemuxml2argvdata/q35.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35-test \
diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args
b/tests/qemuxml2argvdata/qemu-ns-alt.args
index b72aed97b5..e81a719b14 100644
--- a/tests/qemuxml2argvdata/qemu-ns-alt.args
+++ b/tests/qemuxml2argvdata/qemu-ns-alt.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
NS=ns \
BAR='' \
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
index 2fd0bfa444..fa4852598e 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
index 2fd0bfa444..fa4852598e 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args
b/tests/qemuxml2argvdata/qemu-ns-commandline.args
index 2fd0bfa444..fa4852598e 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
index 2fd0bfa444..fa4852598e 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
index 2fd0bfa444..fa4852598e 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
index 2fd0bfa444..fa4852598e 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args
b/tests/qemuxml2argvdata/qemu-ns-no-env.args
index 6de707e0cb..e2d8e54bc3 100644
--- a/tests/qemuxml2argvdata/qemu-ns-no-env.args
+++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/qemu-ns.args b/tests/qemuxml2argvdata/qemu-ns.args
index b72aed97b5..e81a719b14 100644
--- a/tests/qemuxml2argvdata/qemu-ns.args
+++ b/tests/qemuxml2argvdata/qemu-ns.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
NS=ns \
BAR='' \
diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
index 01bfd1fa58..0a05742673 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
index e8873b832b..e3894c5b78 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args
b/tests/qemuxml2argvdata/restore-v2-fd.args
index 0d6752ea3f..724c3e450f 100644
--- a/tests/qemuxml2argvdata/restore-v2-fd.args
+++ b/tests/qemuxml2argvdata/restore-v2-fd.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/restore-v2.args
b/tests/qemuxml2argvdata/restore-v2.args
index 35180eb836..549b00dd69 100644
--- a/tests/qemuxml2argvdata/restore-v2.args
+++ b/tests/qemuxml2argvdata/restore-v2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
index 8a28c035d7..90201dd9e4 100644
--- a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
+++ b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-riscv64 \
-name guest=guest,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.args
b/tests/qemuxml2argvdata/riscv64-virt-pci.args
index 6fc3316125..ed0073de82 100644
--- a/tests/qemuxml2argvdata/riscv64-virt-pci.args
+++ b/tests/qemuxml2argvdata/riscv64-virt-pci.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-riscv64/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-riscv64/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-riscv64/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-riscv64 \
-name riscv64 \
diff --git a/tests/qemuxml2argvdata/riscv64-virt.args
b/tests/qemuxml2argvdata/riscv64-virt.args
index a373ff2b92..f4a135c9ca 100644
--- a/tests/qemuxml2argvdata/riscv64-virt.args
+++ b/tests/qemuxml2argvdata/riscv64-virt.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-riscv64/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-riscv64/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-riscv64/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-riscv64 \
-name riscv64 \
diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args
b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args
index f487671ba1..5bd8374640 100644
--- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args
+++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name test \
diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args
b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args
index f487671ba1..5bd8374640 100644
--- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args
+++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name test \
diff --git a/tests/qemuxml2argvdata/s390-panic-missing.args
b/tests/qemuxml2argvdata/s390-panic-missing.args
index 0fbdaee5ec..d858359b96 100644
--- a/tests/qemuxml2argvdata/s390-panic-missing.args
+++ b/tests/qemuxml2argvdata/s390-panic-missing.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/s390-panic-no-address.args
b/tests/qemuxml2argvdata/s390-panic-no-address.args
index 3f3a31f1fa..80dd94c25c 100644
--- a/tests/qemuxml2argvdata/s390-panic-no-address.args
+++ b/tests/qemuxml2argvdata/s390-panic-no-address.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/s390-serial-2.args
b/tests/qemuxml2argvdata/s390-serial-2.args
index 38bb3a3e0e..ff1c20a689 100644
--- a/tests/qemuxml2argvdata/s390-serial-2.args
+++ b/tests/qemuxml2argvdata/s390-serial-2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/s390-serial-console.args
b/tests/qemuxml2argvdata/s390-serial-console.args
index 6ade1c12ec..dab58366b1 100644
--- a/tests/qemuxml2argvdata/s390-serial-console.args
+++ b/tests/qemuxml2argvdata/s390-serial-console.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/s390-serial.args
b/tests/qemuxml2argvdata/s390-serial.args
index 6ade1c12ec..dab58366b1 100644
--- a/tests/qemuxml2argvdata/s390-serial.args
+++ b/tests/qemuxml2argvdata/s390-serial.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
index 135359c4c1..fab5656659 100644
--- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
+++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=guest,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args
b/tests/qemuxml2argvdata/seclabel-dac-none.args
index 547b9ced44..21d141cb7c 100644
--- a/tests/qemuxml2argvdata/seclabel-dac-none.args
+++ b/tests/qemuxml2argvdata/seclabel-dac-none.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
index 547b9ced44..21d141cb7c 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
index 547b9ced44..21d141cb7c 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
index a1993c1800..a62a5bf9fc 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
index 547b9ced44..21d141cb7c 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args
b/tests/qemuxml2argvdata/seclabel-dynamic.args
index 547b9ced44..21d141cb7c 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/seclabel-none.args
b/tests/qemuxml2argvdata/seclabel-none.args
index 547b9ced44..21d141cb7c 100644
--- a/tests/qemuxml2argvdata/seclabel-none.args
+++ b/tests/qemuxml2argvdata/seclabel-none.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
index 547b9ced44..21d141cb7c 100644
--- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args
b/tests/qemuxml2argvdata/seclabel-static-relabel.args
index 547b9ced44..21d141cb7c 100644
--- a/tests/qemuxml2argvdata/seclabel-static-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/seclabel-static.args
b/tests/qemuxml2argvdata/seclabel-static.args
index 547b9ced44..21d141cb7c 100644
--- a/tests/qemuxml2argvdata/seclabel-static.args
+++ b/tests/qemuxml2argvdata/seclabel-static.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
index c2bf28b160..4e87ac355b 100644
--- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args
b/tests/qemuxml2argvdata/serial-dev-chardev.args
index 87ade2468f..0e790be825 100644
--- a/tests/qemuxml2argvdata/serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args
b/tests/qemuxml2argvdata/serial-file-chardev.args
index ae1c2a322e..46fed6d4a4 100644
--- a/tests/qemuxml2argvdata/serial-file-chardev.args
+++ b/tests/qemuxml2argvdata/serial-file-chardev.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/serial-file-log.args
b/tests/qemuxml2argvdata/serial-file-log.args
index d3ef2f15b1..c414a7357e 100644
--- a/tests/qemuxml2argvdata/serial-file-log.args
+++ b/tests/qemuxml2argvdata/serial-file-log.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args
b/tests/qemuxml2argvdata/serial-many-chardev.args
index c0aa52a235..e54f929ee6 100644
--- a/tests/qemuxml2argvdata/serial-many-chardev.args
+++ b/tests/qemuxml2argvdata/serial-many-chardev.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args
b/tests/qemuxml2argvdata/serial-pty-chardev.args
index 40f70e5c9d..857dad6e27 100644
--- a/tests/qemuxml2argvdata/serial-pty-chardev.args
+++ b/tests/qemuxml2argvdata/serial-pty-chardev.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.args
b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
index 547b9ced44..21d141cb7c 100644
--- a/tests/qemuxml2argvdata/serial-spiceport-nospice.args
+++ b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/serial-spiceport.args
b/tests/qemuxml2argvdata/serial-spiceport.args
index e5d2da6442..f535da15d2 100644
--- a/tests/qemuxml2argvdata/serial-spiceport.args
+++ b/tests/qemuxml2argvdata/serial-spiceport.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-chardev.args
index 968a81a9af..5829fc740c 100644
--- a/tests/qemuxml2argvdata/serial-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
index 175cb24de1..13d1cbce98 100644
--- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
index ec6b5cb7f3..ab9f83c64f 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
index cf0bc9bba9..1f1bbd91b6 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
index cf0bc9bba9..1f1bbd91b6 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
index 98eb9b0392..77f5872e63 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args
b/tests/qemuxml2argvdata/serial-udp-chardev.args
index 9f8502653e..991e5021f9 100644
--- a/tests/qemuxml2argvdata/serial-udp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-udp-chardev.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args
b/tests/qemuxml2argvdata/serial-unix-chardev.args
index a345897411..994ae224dd 100644
--- a/tests/qemuxml2argvdata/serial-unix-chardev.args
+++ b/tests/qemuxml2argvdata/serial-unix-chardev.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
index e9ce4d3181..43b0f29125 100644
--- a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args
b/tests/qemuxml2argvdata/serial-vc-chardev.args
index 3c5b808e83..8a7b71c4b2 100644
--- a/tests/qemuxml2argvdata/serial-vc-chardev.args
+++ b/tests/qemuxml2argvdata/serial-vc-chardev.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
index 5b2096cfaf..b5cf175580 100644
--- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
+++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/shmem.args b/tests/qemuxml2argvdata/shmem.args
index e36b6514e6..156e1e7576 100644
--- a/tests/qemuxml2argvdata/shmem.args
+++ b/tests/qemuxml2argvdata/shmem.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/smartcard-controller.args
b/tests/qemuxml2argvdata/smartcard-controller.args
index 4c5286dd87..1fd9a81979 100644
--- a/tests/qemuxml2argvdata/smartcard-controller.args
+++ b/tests/qemuxml2argvdata/smartcard-controller.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
index 1056f52cfa..c6c95e3d92 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args
b/tests/qemuxml2argvdata/smartcard-host-certificates.args
index 6bfb56b94b..c109eaf852 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/smartcard-host.args
b/tests/qemuxml2argvdata/smartcard-host.args
index 4c5286dd87..1fd9a81979 100644
--- a/tests/qemuxml2argvdata/smartcard-host.args
+++ b/tests/qemuxml2argvdata/smartcard-host.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
index 9fbc86bce7..463cd6d750 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
index 12c03ad4b6..ba3cb7c8ce 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
index 19ec438392..af5b134ca7 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args
b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args
index eaa3e0b71d..1a621a5473 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args
index faf4068557..6cc18760c3 100644
--- a/tests/qemuxml2argvdata/smbios.args
+++ b/tests/qemuxml2argvdata/smbios.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args
index a275ce12e3..23fb0d12b2 100644
--- a/tests/qemuxml2argvdata/smp.args
+++ b/tests/qemuxml2argvdata/smp.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/sound-device.args
b/tests/qemuxml2argvdata/sound-device.args
index 52ff53f2a9..cd588736c8 100644
--- a/tests/qemuxml2argvdata/sound-device.args
+++ b/tests/qemuxml2argvdata/sound-device.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/sound.args b/tests/qemuxml2argvdata/sound.args
index 7097de5719..4e8a5982a4 100644
--- a/tests/qemuxml2argvdata/sound.args
+++ b/tests/qemuxml2argvdata/sound.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args
b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args
index 071f339b06..3f68cfa1b8 100644
--- a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-TPM-VM/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-TPM-VM/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-TPM-VM/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=TPM-VM,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args
b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args
index 071f339b06..3f68cfa1b8 100644
--- a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-TPM-VM/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-TPM-VM/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-TPM-VM/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=TPM-VM,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/tpm-passthrough-crb.args
b/tests/qemuxml2argvdata/tpm-passthrough-crb.args
index 4da8be1a73..7de372d9a7 100644
--- a/tests/qemuxml2argvdata/tpm-passthrough-crb.args
+++ b/tests/qemuxml2argvdata/tpm-passthrough-crb.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-TPM-VM/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-TPM-VM/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-TPM-VM/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name TPM-VM \
diff --git a/tests/qemuxml2argvdata/tpm-passthrough.args
b/tests/qemuxml2argvdata/tpm-passthrough.args
index 8ab7693009..c6c8a52b73 100644
--- a/tests/qemuxml2argvdata/tpm-passthrough.args
+++ b/tests/qemuxml2argvdata/tpm-passthrough.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-TPM-VM/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-TPM-VM/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-TPM-VM/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name TPM-VM \
diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
index 110761b96e..f812e0c5b6 100644
--- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args
b/tests/qemuxml2argvdata/usb-controller-default-q35.args
index 1dc30259d7..f33195ac0b 100644
--- a/tests/qemuxml2argvdata/usb-controller-default-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35-test \
diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
index 18d4231001..25b2464973 100644
--- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name q35-test \
diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
index 2ef89ef132..da09509b58 100644
--- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args
b/tests/qemuxml2argvdata/usb-controller-xhci.args
index 7ac1b2bef0..6146f6441f 100644
--- a/tests/qemuxml2argvdata/usb-controller-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-xhci.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-controller.args
b/tests/qemuxml2argvdata/usb-controller.args
index 52049e2f75..ba3bc53353 100644
--- a/tests/qemuxml2argvdata/usb-controller.args
+++ b/tests/qemuxml2argvdata/usb-controller.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
index 20227927fa..737ede4ae1 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args
b/tests/qemuxml2argvdata/usb-hub-autoadd.args
index 460ef7999c..912f9ce991 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args
index 0861250b26..1462d37020 100644
--- a/tests/qemuxml2argvdata/usb-hub.args
+++ b/tests/qemuxml2argvdata/usb-hub.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
index ed86175b53..bb20ac17b4 100644
--- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args
b/tests/qemuxml2argvdata/usb-ich9-companion.args
index 7a3ebdf193..e5fd181895 100644
--- a/tests/qemuxml2argvdata/usb-ich9-companion.args
+++ b/tests/qemuxml2argvdata/usb-ich9-companion.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
index 3f74d3270d..93d0cc1e5b 100644
--- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
+++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args
b/tests/qemuxml2argvdata/usb-long-port-path.args
index ad1776581b..5bbf856e76 100644
--- a/tests/qemuxml2argvdata/usb-long-port-path.args
+++ b/tests/qemuxml2argvdata/usb-long-port-path.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.args
index 9e85dfa0b7..e1c4016bb2 100644
--- a/tests/qemuxml2argvdata/usb-none.args
+++ b/tests/qemuxml2argvdata/usb-none.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args
b/tests/qemuxml2argvdata/usb-piix3-controller.args
index 0bee41c8de..540f028eae 100644
--- a/tests/qemuxml2argvdata/usb-piix3-controller.args
+++ b/tests/qemuxml2argvdata/usb-piix3-controller.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args
b/tests/qemuxml2argvdata/usb-port-autoassign.args
index 9df3100055..90b39f355a 100644
--- a/tests/qemuxml2argvdata/usb-port-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-port-autoassign.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-port-missing.args
b/tests/qemuxml2argvdata/usb-port-missing.args
index e20ef08102..f32d30cd8d 100644
--- a/tests/qemuxml2argvdata/usb-port-missing.args
+++ b/tests/qemuxml2argvdata/usb-port-missing.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-ports.args
b/tests/qemuxml2argvdata/usb-ports.args
index 23020dcac1..8c18029bbc 100644
--- a/tests/qemuxml2argvdata/usb-ports.args
+++ b/tests/qemuxml2argvdata/usb-ports.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args
b/tests/qemuxml2argvdata/usb-redir-boot.args
index 213ad29436..6625e19a1f 100644
--- a/tests/qemuxml2argvdata/usb-redir-boot.args
+++ b/tests/qemuxml2argvdata/usb-redir-boot.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args
b/tests/qemuxml2argvdata/usb-redir-filter-version.args
index f30d75da83..ef6a2291ba 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter-version.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args
b/tests/qemuxml2argvdata/usb-redir-filter.args
index c6898a7957..f85433d6f8 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
index bc122db077..ff0765c592 100644
--- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args
b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args
index 2d2dab1dea..a4cbe7412c 100644
--- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/usb-redir.args
b/tests/qemuxml2argvdata/usb-redir.args
index 52c766acab..0081a11424 100644
--- a/tests/qemuxml2argvdata/usb-redir.args
+++ b/tests/qemuxml2argvdata/usb-redir.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
index 386f4dafd4..64600fc2d3 100644
--- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/usb1-usb2.args
b/tests/qemuxml2argvdata/usb1-usb2.args
index 1476673246..b5d3532a42 100644
--- a/tests/qemuxml2argvdata/usb1-usb2.args
+++ b/tests/qemuxml2argvdata/usb1-usb2.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/user-aliases-usb.args
b/tests/qemuxml2argvdata/user-aliases-usb.args
index 1857e7e5de..c1d661e02d 100644
--- a/tests/qemuxml2argvdata/user-aliases-usb.args
+++ b/tests/qemuxml2argvdata/user-aliases-usb.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-gentoo/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-gentoo/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-gentoo/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name gentoo \
diff --git a/tests/qemuxml2argvdata/user-aliases.args
b/tests/qemuxml2argvdata/user-aliases.args
index faa8ad02d4..25ad216551 100644
--- a/tests/qemuxml2argvdata/user-aliases.args
+++ b/tests/qemuxml2argvdata/user-aliases.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-gentoo/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-gentoo/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-gentoo/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name gentoo \
diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.args
b/tests/qemuxml2argvdata/vcpu-placement-static.args
index c58b05aff6..04e3b5b7dc 100644
--- a/tests/qemuxml2argvdata/vcpu-placement-static.args
+++ b/tests/qemuxml2argvdata/vcpu-placement-static.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-dummy2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-dummy2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-dummy2/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name dummy2 \
diff --git a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args
b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args
index a56d5a3efe..819a8aac9f 100644
--- a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=test,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
index 6092f8e85c..1da06de021 100644
--- a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
index 93eb3f3430..23daf944d4 100644
--- a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args
b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args
index 922795abfd..d04d97cb50 100644
--- a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=test,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
index b158efff85..5ac34ddcd1 100644
--- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
+++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/video-none-device.args
b/tests/qemuxml2argvdata/video-none-device.args
index f89485f478..8cc3a8ec42 100644
--- a/tests/qemuxml2argvdata/video-none-device.args
+++ b/tests/qemuxml2argvdata/video-none-device.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
index 2860b24977..f78916b11e 100644
--- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args
b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args
index 913b5d45bc..a5110bb979 100644
--- a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/video-qxl-device.args
b/tests/qemuxml2argvdata/video-qxl-device.args
index faeab8a8ff..59ed52764a 100644
--- a/tests/qemuxml2argvdata/video-qxl-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-device.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args
b/tests/qemuxml2argvdata/video-qxl-heads.args
index 9d1df0d0dd..7492755825 100644
--- a/tests/qemuxml2argvdata/video-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-qxl-heads.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/video-qxl-nodevice.args
b/tests/qemuxml2argvdata/video-qxl-nodevice.args
index 05664fe472..1b55dc430d 100644
--- a/tests/qemuxml2argvdata/video-qxl-nodevice.args
+++ b/tests/qemuxml2argvdata/video-qxl-nodevice.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args
b/tests/qemuxml2argvdata/video-qxl-noheads.args
index eb0bf2ae38..b8079bc2b1 100644
--- a/tests/qemuxml2argvdata/video-qxl-noheads.args
+++ b/tests/qemuxml2argvdata/video-qxl-noheads.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
index 1550c4382c..a94a0e34d2 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args
b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args
index e7c993c907..3c79e640c5 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args
b/tests/qemuxml2argvdata/video-qxl-sec-device.args
index 88997a0bfa..5ad0275b98 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
index b12a146681..b6f57875c0 100644
--- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/video-vga-device.args
b/tests/qemuxml2argvdata/video-vga-device.args
index 74fe2e4294..ace4908456 100644
--- a/tests/qemuxml2argvdata/video-vga-device.args
+++ b/tests/qemuxml2argvdata/video-vga-device.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/video-vga-nodevice.args
b/tests/qemuxml2argvdata/video-vga-nodevice.args
index 00a34ce89d..05c3444945 100644
--- a/tests/qemuxml2argvdata/video-vga-nodevice.args
+++ b/tests/qemuxml2argvdata/video-vga-nodevice.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
index 0be5676daa..5c0c650cf7 100644
--- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
index 9a807be304..6648339019 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
index 2e624328a2..a87ffac642 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
index 506e243f12..bc376b0b60 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
index 94e643bf69..32259c79a9 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
index f1341e359d..dedec18452 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
index 2cefd44142..b3847604da 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args
b/tests/qemuxml2argvdata/video-virtio-vga.args
index 7b97fa7bc3..ae9caf9cf0 100644
--- a/tests/qemuxml2argvdata/video-virtio-vga.args
+++ b/tests/qemuxml2argvdata/video-virtio-vga.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args
b/tests/qemuxml2argvdata/virtio-input-passthrough.args
index 34124d021c..39db66c844 100644
--- a/tests/qemuxml2argvdata/virtio-input-passthrough.args
+++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/virtio-input.args
b/tests/qemuxml2argvdata/virtio-input.args
index 68c39233d2..93d0ac77ff 100644
--- a/tests/qemuxml2argvdata/virtio-input.args
+++ b/tests/qemuxml2argvdata/virtio-input.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/virtio-lun.args
b/tests/qemuxml2argvdata/virtio-lun.args
index 02db2f9732..0803905ec0 100644
--- a/tests/qemuxml2argvdata/virtio-lun.args
+++ b/tests/qemuxml2argvdata/virtio-lun.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name test \
diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
index 52f0855611..da8318d745 100644
--- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
+++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
index 54125d2102..cac21b8deb 100644
--- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/virtio-options.args
b/tests/qemuxml2argvdata/virtio-options.args
index 770989a0bf..66e6184cd3 100644
--- a/tests/qemuxml2argvdata/virtio-options.args
+++ b/tests/qemuxml2argvdata/virtio-options.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.args
b/tests/qemuxml2argvdata/virtio-rng-ccw.args
index 491b940f1b..b51890190e 100644
--- a/tests/qemuxml2argvdata/virtio-rng-ccw.args
+++ b/tests/qemuxml2argvdata/virtio-rng-ccw.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args
b/tests/qemuxml2argvdata/virtio-rng-default.args
index 4d784ae00c..3236a7ec86 100644
--- a/tests/qemuxml2argvdata/virtio-rng-default.args
+++ b/tests/qemuxml2argvdata/virtio-rng-default.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
index ce19aa0bdf..0263b1191b 100644
--- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args
b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args
index 2d5575aa53..c68d1d3a67 100644
--- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args
b/tests/qemuxml2argvdata/virtio-rng-egd.args
index 8166053e11..bc2bf60891 100644
--- a/tests/qemuxml2argvdata/virtio-rng-egd.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args
b/tests/qemuxml2argvdata/virtio-rng-multiple.args
index da3c53ebd5..9181227e1e 100644
--- a/tests/qemuxml2argvdata/virtio-rng-multiple.args
+++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args
b/tests/qemuxml2argvdata/virtio-rng-random.args
index c72bd1e0e9..76a1da9a61 100644
--- a/tests/qemuxml2argvdata/virtio-rng-random.args
+++ b/tests/qemuxml2argvdata/virtio-rng-random.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
index 4f8958f336..954dd7053f 100644
--- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
+++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
index 49cfd12b92..15aa8018fe 100644
--- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args
b/tests/qemuxml2argvdata/vmcoreinfo.args
index c2f746cc8d..b1a1148a7c 100644
--- a/tests/qemuxml2argvdata/vmcoreinfo.args
+++ b/tests/qemuxml2argvdata/vmcoreinfo.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/watchdog-device.args
b/tests/qemuxml2argvdata/watchdog-device.args
index a226951bc8..ce9671857d 100644
--- a/tests/qemuxml2argvdata/watchdog-device.args
+++ b/tests/qemuxml2argvdata/watchdog-device.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/watchdog-diag288.args
b/tests/qemuxml2argvdata/watchdog-diag288.args
index 385888388e..3191b64d3b 100644
--- a/tests/qemuxml2argvdata/watchdog-diag288.args
+++ b/tests/qemuxml2argvdata/watchdog-diag288.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/watchdog-dump.args
b/tests/qemuxml2argvdata/watchdog-dump.args
index ec1394f7f3..845afe982f 100644
--- a/tests/qemuxml2argvdata/watchdog-dump.args
+++ b/tests/qemuxml2argvdata/watchdog-dump.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.args
b/tests/qemuxml2argvdata/watchdog-injectnmi.args
index 176dca6769..d7865cb46d 100644
--- a/tests/qemuxml2argvdata/watchdog-injectnmi.args
+++ b/tests/qemuxml2argvdata/watchdog-injectnmi.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/watchdog.args
index 99eb95b5ef..59964f8db5 100644
--- a/tests/qemuxml2argvdata/watchdog.args
+++ b/tests/qemuxml2argvdata/watchdog.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
index 21211fc120..4fa139b64d 100644
--- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-kvm/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-kvm/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-kvm/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name kvm \
diff --git a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args
b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args
index deffa17091..6ea3fde68d 100644
--- a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=guest,debug-threads=on \
diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
index abeef126ea..ba0909462d 100644
--- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
@@ -3,6 +3,9 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=guest,debug-threads=on \
--
2.20.1
8:41 a.m.
New subject: [libvirt] [PATCH 2/3] qemu: Introduce qemuCommandEnvSetup helper
This is a wrapper over virCommandAddEnvPassCommon and
virCommandAddEnvXDG. It is defined within the qemu module, since it is
meant to enforce isolation of QEMU processes which is not much useful
for other processes we spawn, like dnsmasq.
Signed-off-by: Erik Skultety <eskultet(a)redhat.com>
---
src/qemu/qemu_command.c | 25 +++++++++++++++++++++++--
src/qemu/qemu_command.h | 3 +++
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 2c6d6188e2..85b90be429 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -10620,6 +10620,28 @@ qemuBuildVsockCommandLine(virCommandPtr cmd,
}
+/**
+ * qemuCommandEnvSetup:
+ * @cmd: command to modify
+ * @baseDir: absolute path to a dir which HOME and XDG vars will be based on
+ *
+ * Defines the basic set of environment variables for a QEMU process, e.g.
+ * HOME, PATH, XDG_, etc. To isolate individual QEMU processes, HOME and XDG_
+ * variables are derived from @baseDir. Therefore, @baseDir must not be NULL.
+ */
+void
+qemuCommandEnvSetup(virCommandPtr cmd,
+ const char *baseDir)
+{
+ if (!baseDir)
+ return;
+
+ virCommandAddEnvPassCommon(cmd);
+
+ virCommandAddEnvXDG(cmd, baseDir);
+}
+
+
/*
* Constructs a argv suitable for launching qemu with config defined
* for a given virtual machine.
@@ -10657,8 +10679,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
cmd = virCommandNew(def->emulator);
- virCommandAddEnvPassCommon(cmd);
- virCommandAddEnvXDG(cmd, priv->libDir);
+ qemuCommandEnvSetup(cmd, priv->libDir);
if (qemuBuildNameCommandLine(cmd, cfg, def, qemuCaps) < 0)
goto error;
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index 077484094d..07a034504a 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -227,4 +227,7 @@ qemuBuildTPMOpenBackendFDs(const char *tpmdev,
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
ATTRIBUTE_NONNULL(4);
+void
+qemuCommandEnvSetup(virCommandPtr cmd, const char *baseDir);
+
#endif /* LIBVIRT_QEMU_COMMAND_H */
--
2.20.1
8:41 a.m.
New subject: [libvirt] [PATCH 3/3] qemu: command: Override HOME variable for QEMU processes
By default, qemu user's home dir points to '/' which shouldn't be used
at all. We therefore override the HOME variable and pass the current
environment setting iff not running as SUID, which means that for
systemd we never set the variable. To enhance isolation of QEMU
processes, we should always override the HOME variable and point it
somewhere meaningful, like 'libDir/<domain>'.
Signed-off-by: Erik Skultety <eskultet(a)redhat.com>
---
src/qemu/qemu_command.c | 2 ++
tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args | 2 +-
tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 2 +-
tests/qemuxml2argvdata/aarch64-cpu-passthrough.args | 2 +-
tests/qemuxml2argvdata/aarch64-gic-host.args | 2 +-
tests/qemuxml2argvdata/aarch64-gic-none-tcg.args | 2 +-
tests/qemuxml2argvdata/aarch64-gic-v2.args | 2 +-
tests/qemuxml2argvdata/aarch64-gic-v3.args | 2 +-
tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args | 2 +-
tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args | 2 +-
tests/qemuxml2argvdata/aarch64-noacpi-uefi.args | 2 +-
tests/qemuxml2argvdata/aarch64-pci-serial.args | 2 +-
tests/qemuxml2argvdata/aarch64-traditional-pci.args | 2 +-
tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args | 2 +-
tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args | 2 +-
tests/qemuxml2argvdata/aarch64-video-default.args | 2 +-
tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args | 2 +-
tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args | 2 +-
tests/qemuxml2argvdata/aarch64-virt-default-nic.args | 2 +-
.../qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args | 2 +-
tests/qemuxml2argvdata/aarch64-virt-virtio.args | 2 +-
tests/qemuxml2argvdata/aarch64-virtio-pci-default.args | 2 +-
tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args | 2 +-
tests/qemuxml2argvdata/acpi-table.args | 2 +-
tests/qemuxml2argvdata/arm-vexpressa9-basic.args | 2 +-
tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args | 2 +-
tests/qemuxml2argvdata/arm-vexpressa9-virtio.args | 2 +-
tests/qemuxml2argvdata/arm-virt-virtio.args | 2 +-
tests/qemuxml2argvdata/autoindex.args | 2 +-
tests/qemuxml2argvdata/balloon-ccw-deflate.args | 2 +-
tests/qemuxml2argvdata/balloon-device-auto.args | 2 +-
tests/qemuxml2argvdata/balloon-device-deflate-off.args | 2 +-
tests/qemuxml2argvdata/balloon-device-deflate.args | 2 +-
tests/qemuxml2argvdata/balloon-device-period.args | 2 +-
tests/qemuxml2argvdata/balloon-device.args | 2 +-
tests/qemuxml2argvdata/balloon-mmio-deflate.args | 2 +-
tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +-
tests/qemuxml2argvdata/bios-nvram.args | 2 +-
tests/qemuxml2argvdata/bios.args | 2 +-
tests/qemuxml2argvdata/blkdeviotune-group-num.args | 2 +-
tests/qemuxml2argvdata/blkdeviotune-max-length.args | 2 +-
tests/qemuxml2argvdata/blkdeviotune-max.args | 2 +-
tests/qemuxml2argvdata/blkiotune-device.args | 2 +-
tests/qemuxml2argvdata/blkiotune.args | 2 +-
tests/qemuxml2argvdata/boot-cdrom.args | 2 +-
tests/qemuxml2argvdata/boot-complex.args | 2 +-
tests/qemuxml2argvdata/boot-floppy-q35.args | 2 +-
tests/qemuxml2argvdata/boot-floppy.args | 2 +-
tests/qemuxml2argvdata/boot-menu-disable-drive.args | 2 +-
tests/qemuxml2argvdata/boot-menu-disable.args | 2 +-
tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args | 2 +-
tests/qemuxml2argvdata/boot-menu-enable.args | 2 +-
tests/qemuxml2argvdata/boot-multi.args | 2 +-
tests/qemuxml2argvdata/boot-network.args | 2 +-
tests/qemuxml2argvdata/boot-order.args | 2 +-
tests/qemuxml2argvdata/boot-strict.args | 2 +-
tests/qemuxml2argvdata/channel-guestfwd.args | 2 +-
tests/qemuxml2argvdata/channel-spicevmc.args | 2 +-
tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args | 2 +-
tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/channel-virtio-auto.args | 2 +-
tests/qemuxml2argvdata/channel-virtio-autoadd.args | 2 +-
tests/qemuxml2argvdata/channel-virtio-autoassign.args | 2 +-
tests/qemuxml2argvdata/channel-virtio-default.args | 2 +-
tests/qemuxml2argvdata/channel-virtio-state.args | 2 +-
tests/qemuxml2argvdata/channel-virtio-unix.args | 2 +-
tests/qemuxml2argvdata/channel-virtio.args | 2 +-
tests/qemuxml2argvdata/chardev-reconnect.args | 2 +-
tests/qemuxml2argvdata/clock-catchup.args | 2 +-
tests/qemuxml2argvdata/clock-france.args | 2 +-
tests/qemuxml2argvdata/clock-hpet-off.args | 2 +-
tests/qemuxml2argvdata/clock-localtime-basis-localtime.args | 2 +-
tests/qemuxml2argvdata/clock-localtime.args | 2 +-
tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 2 +-
tests/qemuxml2argvdata/clock-utc.args | 2 +-
tests/qemuxml2argvdata/clock-variable.args | 2 +-
tests/qemuxml2argvdata/console-compat-auto.args | 2 +-
tests/qemuxml2argvdata/console-compat-chardev.args | 2 +-
tests/qemuxml2argvdata/console-compat.args | 2 +-
tests/qemuxml2argvdata/console-sclp.args | 2 +-
tests/qemuxml2argvdata/console-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/console-virtio-many.args | 2 +-
tests/qemuxml2argvdata/console-virtio-s390.args | 2 +-
tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args | 2 +-
tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/console-virtio.args | 2 +-
tests/qemuxml2argvdata/controller-order.args | 2 +-
.../qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +-
tests/qemuxml2argvdata/cpu-cache-disable.args | 2 +-
tests/qemuxml2argvdata/cpu-cache-disable2.args | 2 +-
tests/qemuxml2argvdata/cpu-cache-disable3.args | 2 +-
tests/qemuxml2argvdata/cpu-cache-emulate-l3.args | 2 +-
tests/qemuxml2argvdata/cpu-cache-passthrough.args | 2 +-
tests/qemuxml2argvdata/cpu-cache-passthrough2.args | 2 +-
tests/qemuxml2argvdata/cpu-check-default-none.args | 2 +-
tests/qemuxml2argvdata/cpu-check-default-none2.args | 2 +-
tests/qemuxml2argvdata/cpu-check-default-partial.args | 2 +-
tests/qemuxml2argvdata/cpu-check-default-partial2.args | 2 +-
tests/qemuxml2argvdata/cpu-check-none.args | 2 +-
tests/qemuxml2argvdata/cpu-eoi-disabled.args | 2 +-
tests/qemuxml2argvdata/cpu-eoi-enabled.args | 2 +-
tests/qemuxml2argvdata/cpu-exact1.args | 2 +-
tests/qemuxml2argvdata/cpu-exact2-nofallback.args | 2 +-
tests/qemuxml2argvdata/cpu-exact2.args | 2 +-
tests/qemuxml2argvdata/cpu-fallback.args | 2 +-
tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model-cmt.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model-fallback.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model-vendor.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model.args | 2 +-
tests/qemuxml2argvdata/cpu-host-passthrough-features.args | 2 +-
tests/qemuxml2argvdata/cpu-host-passthrough.args | 2 +-
tests/qemuxml2argvdata/cpu-hotplug-startup.args | 2 +-
tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum1.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum2.args | 2 +-
tests/qemuxml2argvdata/cpu-numa-disjoint.args | 2 +-
tests/qemuxml2argvdata/cpu-numa-memshared.args | 2 +-
tests/qemuxml2argvdata/cpu-numa-no-memory-element.args | 2 +-
tests/qemuxml2argvdata/cpu-numa1.args | 2 +-
tests/qemuxml2argvdata/cpu-numa2.args | 2 +-
tests/qemuxml2argvdata/cpu-s390-features.args | 2 +-
tests/qemuxml2argvdata/cpu-s390-zEC12.args | 2 +-
tests/qemuxml2argvdata/cpu-strict1.args | 2 +-
tests/qemuxml2argvdata/cpu-topology1.args | 2 +-
tests/qemuxml2argvdata/cpu-topology2.args | 2 +-
tests/qemuxml2argvdata/cpu-topology3.args | 2 +-
tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +-
tests/qemuxml2argvdata/cputune-numatune.args | 2 +-
tests/qemuxml2argvdata/cputune-zero-shares.args | 2 +-
tests/qemuxml2argvdata/cputune.args | 2 +-
tests/qemuxml2argvdata/debug-threads.args | 2 +-
tests/qemuxml2argvdata/default-kvm-host-arch.args | 2 +-
tests/qemuxml2argvdata/default-qemu-host-arch.args | 2 +-
tests/qemuxml2argvdata/disk-aio.args | 2 +-
tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-aio.x86_64-latest.args | 2 +-
.../disk-backing-chains-noindex.x86_64-2.12.0.args | 2 +-
.../disk-backing-chains-noindex.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-blockio.args | 2 +-
tests/qemuxml2argvdata/disk-boot-cdrom.args | 2 +-
tests/qemuxml2argvdata/disk-boot-disk.args | 2 +-
tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args | 2 +-
tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args | 2 +-
tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args | 2 +-
tests/qemuxml2argvdata/disk-cache.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-cdrom-network.args | 2 +-
tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-cdrom-tray.args | 2 +-
tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-cdrom.args | 2 +-
tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-copy_on_read.args | 2 +-
tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-detect-zeroes.args | 2 +-
tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-discard.args | 2 +-
tests/qemuxml2argvdata/disk-error-policy.args | 2 +-
tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-floppy-tray.args | 2 +-
tests/qemuxml2argvdata/disk-floppy.args | 2 +-
tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-fmt-qcow.args | 2 +-
tests/qemuxml2argvdata/disk-geometry.args | 2 +-
.../disk-hostdev-scsi-virtio-iscsi-auth-AES.args | 2 +-
tests/qemuxml2argvdata/disk-ide-split.args | 2 +-
tests/qemuxml2argvdata/disk-ide-wwn.args | 2 +-
tests/qemuxml2argvdata/disk-ioeventfd.args | 2 +-
tests/qemuxml2argvdata/disk-iscsi.args | 2 +-
tests/qemuxml2argvdata/disk-network-gluster.args | 2 +-
tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-network-iscsi-modern.args | 2 +-
tests/qemuxml2argvdata/disk-network-iscsi.args | 2 +-
tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-network-nbd.args | 2 +-
tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args | 2 +-
tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-network-sheepdog.args | 2 +-
tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-network-source-auth.args | 2 +-
.../disk-network-source-auth.x86_64-2.12.0.args | 2 +-
.../disk-network-source-auth.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-network-tlsx509.args | 2 +-
tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-network-vxhs.args | 2 +-
tests/qemuxml2argvdata/disk-no-boot.args | 2 +-
tests/qemuxml2argvdata/disk-order.args | 2 +-
tests/qemuxml2argvdata/disk-readonly-disk.args | 2 +-
tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-sata-device.args | 2 +-
tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args | 2 +-
tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-scsi-disk-split.args | 2 +-
tests/qemuxml2argvdata/disk-scsi-disk-vpd.args | 2 +-
tests/qemuxml2argvdata/disk-scsi-disk-wwn.args | 2 +-
tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args | 2 +-
tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-serial.args | 2 +-
tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/disk-shared.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-snapshot.args | 2 +-
tests/qemuxml2argvdata/disk-source-pool-mode.args | 2 +-
tests/qemuxml2argvdata/disk-source-pool.args | 2 +-
tests/qemuxml2argvdata/disk-usb-device-removable.args | 2 +-
tests/qemuxml2argvdata/disk-usb-device.args | 2 +-
tests/qemuxml2argvdata/disk-virtio-ccw-many.args | 2 +-
tests/qemuxml2argvdata/disk-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/disk-virtio-queues.args | 2 +-
tests/qemuxml2argvdata/disk-virtio-s390-zpci.args | 2 +-
tests/qemuxml2argvdata/disk-virtio-s390.args | 2 +-
.../disk-virtio-scsi-reservations.x86_64-2.12.0.args | 2 +-
.../disk-virtio-scsi-reservations.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/disk-virtio.args | 2 +-
tests/qemuxml2argvdata/encrypted-disk-usage.args | 2 +-
tests/qemuxml2argvdata/encrypted-disk.args | 2 +-
tests/qemuxml2argvdata/eoi-disabled.args | 2 +-
tests/qemuxml2argvdata/eoi-enabled.args | 2 +-
tests/qemuxml2argvdata/event_idx.args | 2 +-
tests/qemuxml2argvdata/fd-memory-no-numa-topology.args | 2 +-
tests/qemuxml2argvdata/fd-memory-numa-topology.args | 2 +-
tests/qemuxml2argvdata/fd-memory-numa-topology2.args | 2 +-
tests/qemuxml2argvdata/fd-memory-numa-topology3.args | 2 +-
tests/qemuxml2argvdata/fips-enabled.args | 2 +-
tests/qemuxml2argvdata/floppy-drive-fat.args | 2 +-
tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/fs9p-ccw.args | 2 +-
tests/qemuxml2argvdata/fs9p.args | 2 +-
tests/qemuxml2argvdata/genid-auto.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/genid.x86_64-latest.args | 2 +-
.../graphics-egl-headless-rendernode.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/graphics-egl-headless.args | 2 +-
tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/graphics-sdl-fullscreen.args | 2 +-
tests/qemuxml2argvdata/graphics-sdl.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-agentmouse.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-auto-socket.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-compression.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-egl-headless.args | 2 +-
.../graphics-spice-gl-auto-rendernode.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-no-args.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-qxl-vga.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-sasl.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-socket.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-timeout.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-usb-redir.args | 2 +-
tests/qemuxml2argvdata/graphics-spice.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-auto-socket.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-egl-headless.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-none.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-policy.args | 2 +-
.../qemuxml2argvdata/graphics-vnc-remove-generated-socket.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-sasl.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-socket.args | 2 +-
.../qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-tls.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc-websocket.args | 2 +-
tests/qemuxml2argvdata/graphics-vnc.args | 2 +-
.../hostdev-mdev-display-spice-egl-headless.x86_64-latest.args | 2 +-
.../hostdev-mdev-display-spice-opengl.x86_64-latest.args | 2 +-
.../hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args | 2 +-
.../hostdev-mdev-display-vnc.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/hostdev-mdev-precreated.args | 2 +-
tests/qemuxml2argvdata/hostdev-pci-address-device.args | 2 +-
tests/qemuxml2argvdata/hostdev-pci-address.args | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-lsi.args | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-readonly.args | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args | 2 +-
tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args | 2 +-
tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args | 2 +-
tests/qemuxml2argvdata/hostdev-usb-address-device.args | 2 +-
tests/qemuxml2argvdata/hostdev-usb-address.args | 2 +-
tests/qemuxml2argvdata/hostdev-vfio-multidomain.args | 2 +-
tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args | 2 +-
tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args | 2 +-
tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args | 2 +-
tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 2 +-
tests/qemuxml2argvdata/hostdev-vfio.args | 2 +-
tests/qemuxml2argvdata/hotplug-base.args | 2 +-
tests/qemuxml2argvdata/hugepages-default-2M.args | 2 +-
tests/qemuxml2argvdata/hugepages-default-system-size.args | 2 +-
tests/qemuxml2argvdata/hugepages-default.args | 2 +-
tests/qemuxml2argvdata/hugepages-memaccess.args | 2 +-
tests/qemuxml2argvdata/hugepages-memaccess2.args | 2 +-
tests/qemuxml2argvdata/hugepages-nodeset.args | 2 +-
tests/qemuxml2argvdata/hugepages-numa-default-2M.args | 2 +-
tests/qemuxml2argvdata/hugepages-numa-default-dimm.args | 2 +-
tests/qemuxml2argvdata/hugepages-numa-default.args | 2 +-
tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args | 2 +-
tests/qemuxml2argvdata/hugepages-numa-nodeset.args | 2 +-
tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/hugepages-shared.args | 2 +-
tests/qemuxml2argvdata/hyperv-off.args | 2 +-
tests/qemuxml2argvdata/hyperv-panic.args | 2 +-
tests/qemuxml2argvdata/hyperv.args | 2 +-
tests/qemuxml2argvdata/input-usbmouse-addr.args | 2 +-
tests/qemuxml2argvdata/input-usbmouse.args | 2 +-
tests/qemuxml2argvdata/input-usbtablet.args | 2 +-
tests/qemuxml2argvdata/input-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/intel-iommu-caching-mode.args | 2 +-
tests/qemuxml2argvdata/intel-iommu-device-iotlb.args | 2 +-
tests/qemuxml2argvdata/intel-iommu-eim.args | 2 +-
tests/qemuxml2argvdata/intel-iommu-machine.args | 2 +-
tests/qemuxml2argvdata/intel-iommu.args | 2 +-
tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/iothreads-disk.args | 2 +-
tests/qemuxml2argvdata/iothreads-ids-partial.args | 2 +-
tests/qemuxml2argvdata/iothreads-ids.args | 2 +-
.../iothreads-virtio-scsi-ccw.s390x-latest.args | 2 +-
.../iothreads-virtio-scsi-pci.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/iothreads.args | 2 +-
tests/qemuxml2argvdata/kvm-features-off.args | 2 +-
tests/qemuxml2argvdata/kvm-features.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +-
tests/qemuxml2argvdata/kvmclock+eoi-disabled.args | 2 +-
tests/qemuxml2argvdata/kvmclock.args | 2 +-
tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args | 2 +-
tests/qemuxml2argvdata/luks-disks-source-qcow2.args | 2 +-
tests/qemuxml2argvdata/luks-disks-source.args | 2 +-
tests/qemuxml2argvdata/luks-disks.args | 2 +-
tests/qemuxml2argvdata/mach-virt-console-virtio.args | 2 +-
tests/qemuxml2argvdata/mach-virt-serial-native.args | 2 +-
tests/qemuxml2argvdata/mach-virt-serial-pci.args | 2 +-
tests/qemuxml2argvdata/mach-virt-serial-usb.args | 2 +-
tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args | 2 +-
tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args | 2 +-
tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args | 2 +-
tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args | 2 +-
tests/qemuxml2argvdata/machine-aliases1.args | 2 +-
tests/qemuxml2argvdata/machine-aliases2.args | 2 +-
tests/qemuxml2argvdata/machine-core-off.args | 2 +-
tests/qemuxml2argvdata/machine-core-on.args | 2 +-
tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args | 2 +-
tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args | 2 +-
tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args | 2 +-
tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args | 2 +-
tests/qemuxml2argvdata/machine-keywrap-none-caps.args | 2 +-
tests/qemuxml2argvdata/machine-keywrap-none.args | 2 +-
.../machine-loadparm-multiple-disks-nets-s390.args | 2 +-
tests/qemuxml2argvdata/machine-loadparm-net-s390.args | 2 +-
tests/qemuxml2argvdata/machine-loadparm-s390.args | 2 +-
tests/qemuxml2argvdata/machine-smm-opt.args | 2 +-
tests/qemuxml2argvdata/machine-vmport-opt.args | 2 +-
tests/qemuxml2argvdata/master-key.args | 2 +-
tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args | 2 +-
tests/qemuxml2argvdata/memory-hotplug-dimm.args | 2 +-
.../memory-hotplug-nvdimm-access.x86_64-latest.args | 2 +-
.../memory-hotplug-nvdimm-align.x86_64-latest.args | 2 +-
.../memory-hotplug-nvdimm-label.x86_64-latest.args | 2 +-
.../memory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +-
.../memory-hotplug-nvdimm-readonly.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args | 2 +-
tests/qemuxml2argvdata/memory-hotplug.args | 2 +-
tests/qemuxml2argvdata/memtune-unlimited.args | 2 +-
tests/qemuxml2argvdata/memtune.args | 2 +-
tests/qemuxml2argvdata/migrate-numa-unaligned.args | 2 +-
tests/qemuxml2argvdata/migrate.args | 2 +-
tests/qemuxml2argvdata/minimal-msg-timestamp.args | 2 +-
tests/qemuxml2argvdata/minimal-sandbox.args | 2 +-
tests/qemuxml2argvdata/minimal.args | 2 +-
tests/qemuxml2argvdata/misc-acpi.args | 2 +-
tests/qemuxml2argvdata/misc-disable-s3.args | 2 +-
tests/qemuxml2argvdata/misc-disable-suspends.args | 2 +-
tests/qemuxml2argvdata/misc-enable-s4.args | 2 +-
tests/qemuxml2argvdata/misc-no-reboot.args | 2 +-
tests/qemuxml2argvdata/misc-uuid.args | 2 +-
tests/qemuxml2argvdata/mlock-off.args | 2 +-
tests/qemuxml2argvdata/mlock-on.args | 2 +-
tests/qemuxml2argvdata/mlock-unsupported.args | 2 +-
tests/qemuxml2argvdata/monitor-json.args | 2 +-
tests/qemuxml2argvdata/multifunction-pci-device.args | 2 +-
tests/qemuxml2argvdata/name-escape.args | 2 +-
tests/qemuxml2argvdata/net-client.args | 2 +-
tests/qemuxml2argvdata/net-eth-hostip.args | 2 +-
tests/qemuxml2argvdata/net-eth-ifname.args | 2 +-
tests/qemuxml2argvdata/net-eth-names.args | 2 +-
tests/qemuxml2argvdata/net-eth.args | 2 +-
tests/qemuxml2argvdata/net-hostdev-bootorder.args | 2 +-
tests/qemuxml2argvdata/net-hostdev-multidomain.args | 2 +-
tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args | 2 +-
tests/qemuxml2argvdata/net-hostdev-vfio.args | 2 +-
tests/qemuxml2argvdata/net-hostdev.args | 2 +-
tests/qemuxml2argvdata/net-mcast.args | 2 +-
tests/qemuxml2argvdata/net-server.args | 2 +-
tests/qemuxml2argvdata/net-udp.args | 2 +-
tests/qemuxml2argvdata/net-user-addr.args | 2 +-
tests/qemuxml2argvdata/net-user.args | 2 +-
tests/qemuxml2argvdata/net-vhostuser-multiq.args | 2 +-
tests/qemuxml2argvdata/net-vhostuser.args | 2 +-
tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args | 2 +-
tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/net-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/net-virtio-device.args | 2 +-
tests/qemuxml2argvdata/net-virtio-disable-offloads.args | 2 +-
tests/qemuxml2argvdata/net-virtio-netdev.args | 2 +-
tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args | 2 +-
tests/qemuxml2argvdata/net-virtio-s390.args | 2 +-
tests/qemuxml2argvdata/net-virtio.args | 2 +-
tests/qemuxml2argvdata/nosharepages.args | 2 +-
tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args | 2 +-
.../numad-auto-memory-vcpu-no-cpuset-and-placement.args | 2 +-
tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args | 2 +-
tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args | 2 +-
tests/qemuxml2argvdata/numad.args | 2 +-
tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args | 2 +-
tests/qemuxml2argvdata/numatune-auto-prefer.args | 2 +-
tests/qemuxml2argvdata/numatune-distances.args | 2 +-
tests/qemuxml2argvdata/numatune-memnode-no-memory.args | 2 +-
tests/qemuxml2argvdata/numatune-memnode.args | 2 +-
tests/qemuxml2argvdata/numatune-memory.args | 2 +-
tests/qemuxml2argvdata/pages-dimm-discard.args | 2 +-
tests/qemuxml2argvdata/pages-discard-hugepages.args | 2 +-
tests/qemuxml2argvdata/pages-discard.args | 2 +-
tests/qemuxml2argvdata/panic-double.args | 2 +-
tests/qemuxml2argvdata/panic-no-address.args | 2 +-
tests/qemuxml2argvdata/panic.args | 2 +-
tests/qemuxml2argvdata/parallel-parport-chardev.args | 2 +-
tests/qemuxml2argvdata/parallel-tcp-chardev.args | 2 +-
tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args | 2 +-
tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +-
tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +-
tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +-
tests/qemuxml2argvdata/pci-bridge-many-disks.args | 2 +-
tests/qemuxml2argvdata/pci-bridge.args | 2 +-
tests/qemuxml2argvdata/pci-expander-bus.args | 2 +-
tests/qemuxml2argvdata/pci-many.args | 2 +-
tests/qemuxml2argvdata/pci-rom-disabled.args | 2 +-
tests/qemuxml2argvdata/pci-rom.args | 2 +-
tests/qemuxml2argvdata/pci-serial-dev-chardev.args | 2 +-
tests/qemuxml2argvdata/pcie-expander-bus.args | 2 +-
tests/qemuxml2argvdata/pcie-root-port-model-generic.args | 2 +-
tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args | 2 +-
tests/qemuxml2argvdata/pcie-root-port.args | 2 +-
tests/qemuxml2argvdata/pcie-root.args | 2 +-
tests/qemuxml2argvdata/pcie-switch-downstream-port.args | 2 +-
tests/qemuxml2argvdata/pcie-switch-upstream-port.args | 2 +-
tests/qemuxml2argvdata/pcihole64-q35.args | 2 +-
tests/qemuxml2argvdata/pcihole64.args | 2 +-
tests/qemuxml2argvdata/pmu-feature-off.args | 2 +-
tests/qemuxml2argvdata/pmu-feature.args | 2 +-
tests/qemuxml2argvdata/ppc-dtb.args | 2 +-
tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args | 2 +-
tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args | 2 +-
tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args | 2 +-
tests/qemuxml2argvdata/ppc64-usb-controller.args | 2 +-
tests/qemuxml2argvdata/ppce500-serial.args | 2 +-
tests/qemuxml2argvdata/pseries-basic.args | 2 +-
tests/qemuxml2argvdata/pseries-console-virtio.args | 2 +-
tests/qemuxml2argvdata/pseries-cpu-compat-power9.args | 2 +-
tests/qemuxml2argvdata/pseries-cpu-compat.args | 2 +-
tests/qemuxml2argvdata/pseries-cpu-exact.args | 2 +-
tests/qemuxml2argvdata/pseries-cpu-le.args | 2 +-
tests/qemuxml2argvdata/pseries-features.args | 2 +-
tests/qemuxml2argvdata/pseries-hostdevs-1.args | 2 +-
tests/qemuxml2argvdata/pseries-hostdevs-2.args | 2 +-
tests/qemuxml2argvdata/pseries-hostdevs-3.args | 2 +-
tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args | 2 +-
tests/qemuxml2argvdata/pseries-many-buses-1.args | 2 +-
tests/qemuxml2argvdata/pseries-many-buses-2.args | 2 +-
tests/qemuxml2argvdata/pseries-many-devices.args | 2 +-
tests/qemuxml2argvdata/pseries-nvram.args | 2 +-
tests/qemuxml2argvdata/pseries-panic-missing.args | 2 +-
tests/qemuxml2argvdata/pseries-panic-no-address.args | 2 +-
tests/qemuxml2argvdata/pseries-phb-default-missing.args | 2 +-
tests/qemuxml2argvdata/pseries-phb-numa-node.args | 2 +-
tests/qemuxml2argvdata/pseries-phb-simple.args | 2 +-
tests/qemuxml2argvdata/pseries-serial-native.args | 2 +-
tests/qemuxml2argvdata/pseries-serial-pci.args | 2 +-
tests/qemuxml2argvdata/pseries-serial-usb.args | 2 +-
tests/qemuxml2argvdata/pseries-usb-default.args | 2 +-
tests/qemuxml2argvdata/pseries-usb-kbd.args | 2 +-
tests/qemuxml2argvdata/pseries-usb-multi.args | 2 +-
tests/qemuxml2argvdata/pseries-vio-user-assigned.args | 2 +-
tests/qemuxml2argvdata/pseries-vio.args | 2 +-
tests/qemuxml2argvdata/pv-spinlock-disabled.args | 2 +-
tests/qemuxml2argvdata/pv-spinlock-enabled.args | 2 +-
tests/qemuxml2argvdata/q35-acpi-nouefi.args | 2 +-
tests/qemuxml2argvdata/q35-acpi-uefi.args | 2 +-
tests/qemuxml2argvdata/q35-default-devices-only.args | 2 +-
tests/qemuxml2argvdata/q35-multifunction.args | 2 +-
tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 2 +-
tests/qemuxml2argvdata/q35-pci-force-address.args | 2 +-
tests/qemuxml2argvdata/q35-pcie-autoadd.args | 2 +-
tests/qemuxml2argvdata/q35-pcie.args | 2 +-
tests/qemuxml2argvdata/q35-pm-disable-fallback.args | 2 +-
tests/qemuxml2argvdata/q35-pm-disable.args | 2 +-
tests/qemuxml2argvdata/q35-usb2-multi.args | 2 +-
tests/qemuxml2argvdata/q35-usb2-reorder.args | 2 +-
tests/qemuxml2argvdata/q35-usb2.args | 2 +-
tests/qemuxml2argvdata/q35-virt-manager-basic.args | 2 +-
tests/qemuxml2argvdata/q35-virtio-pci.args | 2 +-
tests/qemuxml2argvdata/q35.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-commandline.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-domain-commandline.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-no-env.args | 2 +-
tests/qemuxml2argvdata/qemu-ns.args | 2 +-
tests/qemuxml2argvdata/reboot-timeout-disabled.args | 2 +-
tests/qemuxml2argvdata/reboot-timeout-enabled.args | 2 +-
tests/qemuxml2argvdata/restore-v2-fd.args | 2 +-
tests/qemuxml2argvdata/restore-v2.args | 2 +-
.../qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args | 2 +-
tests/qemuxml2argvdata/riscv64-virt-pci.args | 2 +-
tests/qemuxml2argvdata/riscv64-virt.args | 2 +-
tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args | 2 +-
tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args | 2 +-
tests/qemuxml2argvdata/s390-panic-missing.args | 2 +-
tests/qemuxml2argvdata/s390-panic-no-address.args | 2 +-
tests/qemuxml2argvdata/s390-serial-2.args | 2 +-
tests/qemuxml2argvdata/s390-serial-console.args | 2 +-
tests/qemuxml2argvdata/s390-serial.args | 2 +-
tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args | 2 +-
tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic-override.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic-relabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +-
tests/qemuxml2argvdata/seclabel-none.args | 2 +-
tests/qemuxml2argvdata/seclabel-static-labelskip.args | 2 +-
tests/qemuxml2argvdata/seclabel-static-relabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-static.args | 2 +-
tests/qemuxml2argvdata/serial-dev-chardev-iobase.args | 2 +-
tests/qemuxml2argvdata/serial-dev-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-file-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-file-log.args | 2 +-
tests/qemuxml2argvdata/serial-many-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-pty-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-spiceport-nospice.args | 2 +-
tests/qemuxml2argvdata/serial-spiceport.args | 2 +-
tests/qemuxml2argvdata/serial-tcp-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args | 2 +-
tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args | 2 +-
tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-udp-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-unix-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +-
tests/qemuxml2argvdata/shmem-plain-doorbell.args | 2 +-
tests/qemuxml2argvdata/shmem.args | 2 +-
tests/qemuxml2argvdata/smartcard-controller.args | 2 +-
.../qemuxml2argvdata/smartcard-host-certificates-database.args | 2 +-
tests/qemuxml2argvdata/smartcard-host-certificates.args | 2 +-
tests/qemuxml2argvdata/smartcard-host.args | 2 +-
tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args | 2 +-
tests/qemuxml2argvdata/smartcard-passthrough-tcp.args | 2 +-
.../smartcard-passthrough-unix.x86_64-2.5.0.args | 2 +-
.../smartcard-passthrough-unix.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/smbios.args | 2 +-
tests/qemuxml2argvdata/smp.args | 2 +-
tests/qemuxml2argvdata/sound-device.args | 2 +-
tests/qemuxml2argvdata/sound.args | 2 +-
tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/tpm-passthrough-crb.args | 2 +-
tests/qemuxml2argvdata/tpm-passthrough.args | 2 +-
tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/usb-controller-default-q35.args | 2 +-
tests/qemuxml2argvdata/usb-controller-explicit-q35.args | 2 +-
tests/qemuxml2argvdata/usb-controller-qemu-xhci.args | 2 +-
tests/qemuxml2argvdata/usb-controller-xhci.args | 2 +-
tests/qemuxml2argvdata/usb-controller.args | 2 +-
tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args | 2 +-
tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +-
tests/qemuxml2argvdata/usb-hub.args | 2 +-
tests/qemuxml2argvdata/usb-ich9-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb-ich9-companion.args | 2 +-
tests/qemuxml2argvdata/usb-ich9-ehci-addr.args | 2 +-
tests/qemuxml2argvdata/usb-long-port-path.args | 2 +-
tests/qemuxml2argvdata/usb-none.args | 2 +-
tests/qemuxml2argvdata/usb-piix3-controller.args | 2 +-
tests/qemuxml2argvdata/usb-port-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb-port-missing.args | 2 +-
tests/qemuxml2argvdata/usb-ports.args | 2 +-
tests/qemuxml2argvdata/usb-redir-boot.args | 2 +-
tests/qemuxml2argvdata/usb-redir-filter-version.args | 2 +-
tests/qemuxml2argvdata/usb-redir-filter.args | 2 +-
tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args | 2 +-
tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/usb-redir.args | 2 +-
tests/qemuxml2argvdata/usb-xhci-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb1-usb2.args | 2 +-
tests/qemuxml2argvdata/user-aliases-usb.args | 2 +-
tests/qemuxml2argvdata/user-aliases.args | 2 +-
tests/qemuxml2argvdata/vcpu-placement-static.args | 2 +-
tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args | 2 +-
tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args | 2 +-
tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/video-device-pciaddr-default.args | 2 +-
tests/qemuxml2argvdata/video-none-device.args | 2 +-
tests/qemuxml2argvdata/video-qxl-device-vgamem.args | 2 +-
.../qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/video-qxl-device.args | 2 +-
tests/qemuxml2argvdata/video-qxl-heads.args | 2 +-
tests/qemuxml2argvdata/video-qxl-nodevice.args | 2 +-
tests/qemuxml2argvdata/video-qxl-noheads.args | 2 +-
tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args | 2 +-
.../video-qxl-sec-device-vram64.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/video-qxl-sec-device.args | 2 +-
tests/qemuxml2argvdata/video-vga-device-vgamem.args | 2 +-
tests/qemuxml2argvdata/video-vga-device.args | 2 +-
tests/qemuxml2argvdata/video-vga-nodevice.args | 2 +-
tests/qemuxml2argvdata/video-vga-qxl-heads.args | 2 +-
tests/qemuxml2argvdata/video-virtio-gpu-ccw.args | 2 +-
tests/qemuxml2argvdata/video-virtio-gpu-device.args | 2 +-
tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args | 2 +-
tests/qemuxml2argvdata/video-virtio-gpu-secondary.args | 2 +-
tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args | 2 +-
tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 2 +-
tests/qemuxml2argvdata/video-virtio-vga.args | 2 +-
tests/qemuxml2argvdata/virtio-input-passthrough.args | 2 +-
tests/qemuxml2argvdata/virtio-input.args | 2 +-
tests/qemuxml2argvdata/virtio-lun.args | 2 +-
.../qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args | 2 +-
.../qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/virtio-options.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-ccw.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-default.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-egd.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-multiple.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-random.args | 2 +-
tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args | 2 +-
tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/vmcoreinfo.args | 2 +-
tests/qemuxml2argvdata/watchdog-device.args | 2 +-
tests/qemuxml2argvdata/watchdog-diag288.args | 2 +-
tests/qemuxml2argvdata/watchdog-dump.args | 2 +-
tests/qemuxml2argvdata/watchdog-injectnmi.args | 2 +-
tests/qemuxml2argvdata/watchdog.args | 2 +-
tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 2 +-
tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args | 2 +-
684 files changed, 685 insertions(+), 683 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 85b90be429..bf83ac8133 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -10638,6 +10638,8 @@ qemuCommandEnvSetup(virCommandPtr cmd,
virCommandAddEnvPassCommon(cmd);
+ /* override HOME for QEMU processes */
+ virCommandAddEnvPair(cmd, "HOME", baseDir);
virCommandAddEnvXDG(cmd, baseDir);
}
diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index 66cc6b9cf3..ba424141d0 100644
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-aarch64test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
index b85c93bd88..eab852d0ba 100644
--- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
+++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
index a10bbec47c..edf2f316ac 100644
--- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
+++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-aarch64test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.args
b/tests/qemuxml2argvdata/aarch64-gic-host.args
index d931d4c7fe..503360691a 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-host.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-host.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-aarch64test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
index 6c473aa003..bd7b056377 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.args
b/tests/qemuxml2argvdata/aarch64-gic-v2.args
index 9b6223db1f..1ff5775b7e 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v2.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-aarch64test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args
b/tests/qemuxml2argvdata/aarch64-gic-v3.args
index 50eca4a7f5..f3ed51157d 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v3.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v3.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-aarch64test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
index b8b3123319..415fd8e3e3 100644
--- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-armtest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
index 17274d4e5f..d9621c8584 100644
--- a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
+++ b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
index 49d000a476..df37bab7d9 100644
--- a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
+++ b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-pci-serial.args
b/tests/qemuxml2argvdata/aarch64-pci-serial.args
index 06d40c94a0..d7d56823d0 100644
--- a/tests/qemuxml2argvdata/aarch64-pci-serial.args
+++ b/tests/qemuxml2argvdata/aarch64-pci-serial.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-aarch64test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-traditional-pci.args
b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
index 792b0c7843..0038bd10a8 100644
--- a/tests/qemuxml2argvdata/aarch64-traditional-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
index 4c8de7c399..0d44966b04 100644
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
index f088f0d149..be2cdb34cc 100644
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-video-default.args
b/tests/qemuxml2argvdata/aarch64-video-default.args
index b7c34daa49..db4c6322dc 100644
--- a/tests/qemuxml2argvdata/aarch64-video-default.args
+++ b/tests/qemuxml2argvdata/aarch64-video-default.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-aarch64-vgpu \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64-vgpu/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
index 22cbe7e3bc..2facfdc26c 100644
--- a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-aarch64-vgpu \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64-vgpu/.local/share \
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 e770eb10e4..6ef0cd9cda 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-aarch64test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
index 26ead35626..d6db21f893 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-aarch64-virt-default \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64-virt-default/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
index ed2dd82846..62471e7f4b 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
index 9b5c4cbda8..9e7e3c2d7c 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-aarch64test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
index 267f94d327..0a99103e89 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-aarch64test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
index ca1ddb9937..4ff8ed1fbd 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-aarch64test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
diff --git a/tests/qemuxml2argvdata/acpi-table.args
b/tests/qemuxml2argvdata/acpi-table.args
index 32fde223f2..86d5c414e8 100644
--- a/tests/qemuxml2argvdata/acpi-table.args
+++ b/tests/qemuxml2argvdata/acpi-table.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
index da01e88a9d..f4297c8ab4 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-armtest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
index 9703530867..7bc55d2151 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-armtest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
index 69d515f6f6..1b88d2da27 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-armtest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.args
b/tests/qemuxml2argvdata/arm-virt-virtio.args
index e127cf87a6..04b2b87423 100644
--- a/tests/qemuxml2argvdata/arm-virt-virtio.args
+++ b/tests/qemuxml2argvdata/arm-virt-virtio.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-armtest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
diff --git a/tests/qemuxml2argvdata/autoindex.args
b/tests/qemuxml2argvdata/autoindex.args
index 182af3843a..fc6a207915 100644
--- a/tests/qemuxml2argvdata/autoindex.args
+++ b/tests/qemuxml2argvdata/autoindex.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.args
b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
index 5b7ec05a83..c2246d54ce 100644
--- a/tests/qemuxml2argvdata/balloon-ccw-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args
b/tests/qemuxml2argvdata/balloon-device-auto.args
index 21d141cb7c..e2fc6335b9 100644
--- a/tests/qemuxml2argvdata/balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/balloon-device-auto.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
index 39cfa7c2a2..4c08fddf78 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args
b/tests/qemuxml2argvdata/balloon-device-deflate.args
index 51d285c6fd..422ed206d2 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/balloon-device-period.args
b/tests/qemuxml2argvdata/balloon-device-period.args
index 6321da1e6c..6d4c78578f 100644
--- a/tests/qemuxml2argvdata/balloon-device-period.args
+++ b/tests/qemuxml2argvdata/balloon-device-period.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/balloon-device.args
b/tests/qemuxml2argvdata/balloon-device.args
index 6321da1e6c..6d4c78578f 100644
--- a/tests/qemuxml2argvdata/balloon-device.args
+++ b/tests/qemuxml2argvdata/balloon-device.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.args
b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
index 75450df169..5af890a7ba 100644
--- a/tests/qemuxml2argvdata/balloon-mmio-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-aarch64test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args
b/tests/qemuxml2argvdata/bios-nvram-secure.args
index 75d13b04b5..9e7fb1320b 100644
--- a/tests/qemuxml2argvdata/bios-nvram-secure.args
+++ b/tests/qemuxml2argvdata/bios-nvram-secure.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test-bios \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
diff --git a/tests/qemuxml2argvdata/bios-nvram.args
b/tests/qemuxml2argvdata/bios-nvram.args
index 4471135925..b21319dc2c 100644
--- a/tests/qemuxml2argvdata/bios-nvram.args
+++ b/tests/qemuxml2argvdata/bios-nvram.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test-bios \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
diff --git a/tests/qemuxml2argvdata/bios.args b/tests/qemuxml2argvdata/bios.args
index c95bdf2820..86d73c3ee1 100644
--- a/tests/qemuxml2argvdata/bios.args
+++ b/tests/qemuxml2argvdata/bios.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test-bios \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.args
b/tests/qemuxml2argvdata/blkdeviotune-group-num.args
index b75eb086d2..2362dccc51 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-group-num.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.args
b/tests/qemuxml2argvdata/blkdeviotune-max-length.args
index c877dc42b1..6072e26393 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-max-length.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.args
b/tests/qemuxml2argvdata/blkdeviotune-max.args
index a342a44afa..1f4f1a1e0e 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-max.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-max.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/blkiotune-device.args
b/tests/qemuxml2argvdata/blkiotune-device.args
index 21d141cb7c..e2fc6335b9 100644
--- a/tests/qemuxml2argvdata/blkiotune-device.args
+++ b/tests/qemuxml2argvdata/blkiotune-device.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/blkiotune.args
b/tests/qemuxml2argvdata/blkiotune.args
index 21d141cb7c..e2fc6335b9 100644
--- a/tests/qemuxml2argvdata/blkiotune.args
+++ b/tests/qemuxml2argvdata/blkiotune.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/boot-cdrom.args
b/tests/qemuxml2argvdata/boot-cdrom.args
index 2432806055..6a9bd747ea 100644
--- a/tests/qemuxml2argvdata/boot-cdrom.args
+++ b/tests/qemuxml2argvdata/boot-cdrom.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/boot-complex.args
b/tests/qemuxml2argvdata/boot-complex.args
index 82ae772ac2..dc779ec4b8 100644
--- a/tests/qemuxml2argvdata/boot-complex.args
+++ b/tests/qemuxml2argvdata/boot-complex.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.args
b/tests/qemuxml2argvdata/boot-floppy-q35.args
index 70cb463cad..5cc63859cc 100644
--- a/tests/qemuxml2argvdata/boot-floppy-q35.args
+++ b/tests/qemuxml2argvdata/boot-floppy-q35.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/boot-floppy.args
b/tests/qemuxml2argvdata/boot-floppy.args
index 99d5c177e7..d8cc52eda7 100644
--- a/tests/qemuxml2argvdata/boot-floppy.args
+++ b/tests/qemuxml2argvdata/boot-floppy.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
index 8d275f5d3f..cad35895bf 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args
b/tests/qemuxml2argvdata/boot-menu-disable.args
index 8d275f5d3f..cad35895bf 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
index c2bf9a8834..a1d8b7342d 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args
b/tests/qemuxml2argvdata/boot-menu-enable.args
index 7061ab6e1d..1fbfba3faa 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/boot-multi.args
b/tests/qemuxml2argvdata/boot-multi.args
index 7061ab6e1d..1fbfba3faa 100644
--- a/tests/qemuxml2argvdata/boot-multi.args
+++ b/tests/qemuxml2argvdata/boot-multi.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/boot-network.args
b/tests/qemuxml2argvdata/boot-network.args
index 47d608306c..8e537f107b 100644
--- a/tests/qemuxml2argvdata/boot-network.args
+++ b/tests/qemuxml2argvdata/boot-network.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/boot-order.args
b/tests/qemuxml2argvdata/boot-order.args
index f7ab464cf7..d8fb9111f3 100644
--- a/tests/qemuxml2argvdata/boot-order.args
+++ b/tests/qemuxml2argvdata/boot-order.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/boot-strict.args
b/tests/qemuxml2argvdata/boot-strict.args
index d2a72a1a97..132e5e3357 100644
--- a/tests/qemuxml2argvdata/boot-strict.args
+++ b/tests/qemuxml2argvdata/boot-strict.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args
b/tests/qemuxml2argvdata/channel-guestfwd.args
index 513e63c6d6..216749908b 100644
--- a/tests/qemuxml2argvdata/channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/channel-guestfwd.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args
b/tests/qemuxml2argvdata/channel-spicevmc.args
index b97d3a26e6..4c20f5fba6 100644
--- a/tests/qemuxml2argvdata/channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/channel-spicevmc.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
index cf70f234d0..bbaa384ff2 100644
--- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args
b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args
index 7b3f170b48..c1bb05a16e 100644
--- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args
b/tests/qemuxml2argvdata/channel-virtio-auto.args
index e06681af4d..b63744166f 100644
--- a/tests/qemuxml2argvdata/channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/channel-virtio-auto.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
index afe5707457..331092d5f3 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
index 956acefae5..aa085fae51 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args
b/tests/qemuxml2argvdata/channel-virtio-default.args
index 7dc6688e28..0c80a5d1a1 100644
--- a/tests/qemuxml2argvdata/channel-virtio-default.args
+++ b/tests/qemuxml2argvdata/channel-virtio-default.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args
b/tests/qemuxml2argvdata/channel-virtio-state.args
index d8d155cf0b..8f3d621121 100644
--- a/tests/qemuxml2argvdata/channel-virtio-state.args
+++ b/tests/qemuxml2argvdata/channel-virtio-state.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args
b/tests/qemuxml2argvdata/channel-virtio-unix.args
index cf91339631..973a039c15 100644
--- a/tests/qemuxml2argvdata/channel-virtio-unix.args
+++ b/tests/qemuxml2argvdata/channel-virtio-unix.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/channel-virtio.args
b/tests/qemuxml2argvdata/channel-virtio.args
index bc92bb514d..2025dcd3f0 100644
--- a/tests/qemuxml2argvdata/channel-virtio.args
+++ b/tests/qemuxml2argvdata/channel-virtio.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args
b/tests/qemuxml2argvdata/chardev-reconnect.args
index fe06a388ae..af22bda249 100644
--- a/tests/qemuxml2argvdata/chardev-reconnect.args
+++ b/tests/qemuxml2argvdata/chardev-reconnect.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/clock-catchup.args
b/tests/qemuxml2argvdata/clock-catchup.args
index a93eff0ee7..145dc9cc29 100644
--- a/tests/qemuxml2argvdata/clock-catchup.args
+++ b/tests/qemuxml2argvdata/clock-catchup.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/clock-france.args
b/tests/qemuxml2argvdata/clock-france.args
index 0c62c856b2..c87df1aab5 100644
--- a/tests/qemuxml2argvdata/clock-france.args
+++ b/tests/qemuxml2argvdata/clock-france.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args
b/tests/qemuxml2argvdata/clock-hpet-off.args
index 1700cd633d..ef80280d30 100644
--- a/tests/qemuxml2argvdata/clock-hpet-off.args
+++ b/tests/qemuxml2argvdata/clock-hpet-off.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
index c861e8bd8d..15ba1c0a65 100644
--- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/clock-localtime.args
b/tests/qemuxml2argvdata/clock-localtime.args
index 8f3329a4ae..e748602178 100644
--- a/tests/qemuxml2argvdata/clock-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
index 4c8a7ca2db..81d4a89094 100644
--- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/clock-utc.args
b/tests/qemuxml2argvdata/clock-utc.args
index fccae6cbbf..b1209e5e0a 100644
--- a/tests/qemuxml2argvdata/clock-utc.args
+++ b/tests/qemuxml2argvdata/clock-utc.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/clock-variable.args
b/tests/qemuxml2argvdata/clock-variable.args
index 3561e6ba0d..9bedcbd77e 100644
--- a/tests/qemuxml2argvdata/clock-variable.args
+++ b/tests/qemuxml2argvdata/clock-variable.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/console-compat-auto.args
b/tests/qemuxml2argvdata/console-compat-auto.args
index 857dad6e27..97c858f04e 100644
--- a/tests/qemuxml2argvdata/console-compat-auto.args
+++ b/tests/qemuxml2argvdata/console-compat-auto.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args
b/tests/qemuxml2argvdata/console-compat-chardev.args
index 857dad6e27..97c858f04e 100644
--- a/tests/qemuxml2argvdata/console-compat-chardev.args
+++ b/tests/qemuxml2argvdata/console-compat-chardev.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/console-compat.args
b/tests/qemuxml2argvdata/console-compat.args
index 15f54af71f..d0f9734491 100644
--- a/tests/qemuxml2argvdata/console-compat.args
+++ b/tests/qemuxml2argvdata/console-compat.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/console-sclp.args
b/tests/qemuxml2argvdata/console-sclp.args
index 0bee7f0865..dc54915068 100644
--- a/tests/qemuxml2argvdata/console-sclp.args
+++ b/tests/qemuxml2argvdata/console-sclp.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.args
b/tests/qemuxml2argvdata/console-virtio-ccw.args
index c34d634c36..7ee2eb30cf 100644
--- a/tests/qemuxml2argvdata/console-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/console-virtio-ccw.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/console-virtio-many.args
b/tests/qemuxml2argvdata/console-virtio-many.args
index 96623d548e..ebe42c8570 100644
--- a/tests/qemuxml2argvdata/console-virtio-many.args
+++ b/tests/qemuxml2argvdata/console-virtio-many.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/console-virtio-s390.args
b/tests/qemuxml2argvdata/console-virtio-s390.args
index 683dbf326e..7b931db298 100644
--- a/tests/qemuxml2argvdata/console-virtio-s390.args
+++ b/tests/qemuxml2argvdata/console-virtio-s390.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
index 4f3dd18979..648dc7493e 100644
--- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args
b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args
index 9fa08ca98e..f9620c9ce5 100644
--- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/console-virtio.args
b/tests/qemuxml2argvdata/console-virtio.args
index 5d024adc0b..3cf814d426 100644
--- a/tests/qemuxml2argvdata/console-virtio.args
+++ b/tests/qemuxml2argvdata/console-virtio.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/controller-order.args
b/tests/qemuxml2argvdata/controller-order.args
index 6a77c82835..6bf795ecb7 100644
--- a/tests/qemuxml2argvdata/controller-order.args
+++ b/tests/qemuxml2argvdata/controller-order.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-fdr \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-fdr/.local/share \
diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
index 432ee259aa..d1088a5a06 100644
--- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
index 0e611a0c9f..a9a84254ff 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args
b/tests/qemuxml2argvdata/cpu-Haswell.args
index 52d6abfdc0..2cf253d2f4 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args
b/tests/qemuxml2argvdata/cpu-Haswell2.args
index d7a0d60c85..f3f7e7aef5 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell2.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args
b/tests/qemuxml2argvdata/cpu-Haswell3.args
index b7b1d1e639..b25cb56949 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell3.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell3.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args
b/tests/qemuxml2argvdata/cpu-cache-disable.args
index 299fbddff7..f661b52a9c 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-foo \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable2.args
b/tests/qemuxml2argvdata/cpu-cache-disable2.args
index e03451dac3..978fb0d256 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-foo \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args
b/tests/qemuxml2argvdata/cpu-cache-disable3.args
index 70a9dd1228..66febb581a 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-foo \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
index dea6a7e860..b5f9d6f0dc 100644
--- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-foo \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args
b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
index 806f5469f6..f164b44831 100644
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-foo \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
index 910328d786..ecd94dfa2c 100644
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-foo \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args
b/tests/qemuxml2argvdata/cpu-check-default-none.args
index 7da7a57d1c..ed2273a7d9 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args
b/tests/qemuxml2argvdata/cpu-check-default-none2.args
index 1e57c9f698..e9a2baf9f9 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-none2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args
b/tests/qemuxml2argvdata/cpu-check-default-partial.args
index 246df7b884..c6a6aa29e2 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-partial.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args
b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
index fe096c6fb0..4a3894810d 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-check-none.args
b/tests/qemuxml2argvdata/cpu-check-none.args
index fe096c6fb0..4a3894810d 100644
--- a/tests/qemuxml2argvdata/cpu-check-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-none.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
index 599ca1b8e0..30fea394bc 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
index b7c47fd7f5..5a82b2ac52 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-exact1.args
b/tests/qemuxml2argvdata/cpu-exact1.args
index f2f1aac1a2..22db6c85ec 100644
--- a/tests/qemuxml2argvdata/cpu-exact1.args
+++ b/tests/qemuxml2argvdata/cpu-exact1.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
index 07d6b17107..aade706c07 100644
--- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
+++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-exact2.args
b/tests/qemuxml2argvdata/cpu-exact2.args
index 07d6b17107..aade706c07 100644
--- a/tests/qemuxml2argvdata/cpu-exact2.args
+++ b/tests/qemuxml2argvdata/cpu-exact2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-fallback.args
b/tests/qemuxml2argvdata/cpu-fallback.args
index 54069209d5..b92001f702 100644
--- a/tests/qemuxml2argvdata/cpu-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-fallback.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args
b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
index 8c230f8b8c..d31acf942b 100644
--- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
index 441091b4d5..4d39e53148 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
index 98b85b64cd..3afaf16db4 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args
b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
index 54f6eb9b77..a255f4429b 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-host-model.args
b/tests/qemuxml2argvdata/cpu-host-model.args
index a457e1f365..3a5482aed3 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
index 5eeac30f2f..aa46d102ca 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args
b/tests/qemuxml2argvdata/cpu-host-passthrough.args
index 7da7a57d1c..ed2273a7d9 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.args
b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
index ff35f56ac4..bbd77513f5 100644
--- a/tests/qemuxml2argvdata/cpu-hotplug-startup.args
+++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args
b/tests/qemuxml2argvdata/cpu-kvmclock.args
index 8acc4480d5..10ce729820 100644
--- a/tests/qemuxml2argvdata/cpu-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-kvmclock.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args
b/tests/qemuxml2argvdata/cpu-minimum1.args
index fcf1af9b10..919d2c5ad7 100644
--- a/tests/qemuxml2argvdata/cpu-minimum1.args
+++ b/tests/qemuxml2argvdata/cpu-minimum1.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args
b/tests/qemuxml2argvdata/cpu-minimum2.args
index a6573076f0..0e00d5407d 100644
--- a/tests/qemuxml2argvdata/cpu-minimum2.args
+++ b/tests/qemuxml2argvdata/cpu-minimum2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args
b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
index 20c6f5a14e..74635ef4f9 100644
--- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args
+++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args
b/tests/qemuxml2argvdata/cpu-numa-memshared.args
index 0a7d8107c6..e453afa82f 100644
--- a/tests/qemuxml2argvdata/cpu-numa-memshared.args
+++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
index 0c33875ec6..1dbfd0470a 100644
--- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
+++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-numa1.args
b/tests/qemuxml2argvdata/cpu-numa1.args
index 0c33875ec6..1dbfd0470a 100644
--- a/tests/qemuxml2argvdata/cpu-numa1.args
+++ b/tests/qemuxml2argvdata/cpu-numa1.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-numa2.args
b/tests/qemuxml2argvdata/cpu-numa2.args
index 0c33875ec6..1dbfd0470a 100644
--- a/tests/qemuxml2argvdata/cpu-numa2.args
+++ b/tests/qemuxml2argvdata/cpu-numa2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-s390-features.args
b/tests/qemuxml2argvdata/cpu-s390-features.args
index 4b5443bd52..5a1f5f441b 100644
--- a/tests/qemuxml2argvdata/cpu-s390-features.args
+++ b/tests/qemuxml2argvdata/cpu-s390-features.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-s390-zEC12.args
b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
index a54f83ed8d..8374d5dc81 100644
--- a/tests/qemuxml2argvdata/cpu-s390-zEC12.args
+++ b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-strict1.args
b/tests/qemuxml2argvdata/cpu-strict1.args
index 9e79a593fe..4a30e18f7a 100644
--- a/tests/qemuxml2argvdata/cpu-strict1.args
+++ b/tests/qemuxml2argvdata/cpu-strict1.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-topology1.args
b/tests/qemuxml2argvdata/cpu-topology1.args
index fa90e28057..ee7fc31d25 100644
--- a/tests/qemuxml2argvdata/cpu-topology1.args
+++ b/tests/qemuxml2argvdata/cpu-topology1.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-topology2.args
b/tests/qemuxml2argvdata/cpu-topology2.args
index 64db68715d..b0ad611b01 100644
--- a/tests/qemuxml2argvdata/cpu-topology2.args
+++ b/tests/qemuxml2argvdata/cpu-topology2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-topology3.args
b/tests/qemuxml2argvdata/cpu-topology3.args
index fa90e28057..ee7fc31d25 100644
--- a/tests/qemuxml2argvdata/cpu-topology3.args
+++ b/tests/qemuxml2argvdata/cpu-topology3.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
index aa95d49710..2c449d28eb 100644
--- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
+++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cputune-numatune.args
b/tests/qemuxml2argvdata/cputune-numatune.args
index 9d0885d55c..b2e5399e8f 100644
--- a/tests/qemuxml2argvdata/cputune-numatune.args
+++ b/tests/qemuxml2argvdata/cputune-numatune.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-dummy2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-dummy2/.local/share \
diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args
b/tests/qemuxml2argvdata/cputune-zero-shares.args
index afec8ebca5..0be5d3e83a 100644
--- a/tests/qemuxml2argvdata/cputune-zero-shares.args
+++ b/tests/qemuxml2argvdata/cputune-zero-shares.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/cputune.args
index afec8ebca5..0be5d3e83a 100644
--- a/tests/qemuxml2argvdata/cputune.args
+++ b/tests/qemuxml2argvdata/cputune.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/debug-threads.args
b/tests/qemuxml2argvdata/debug-threads.args
index 2d6d915776..636798a47d 100644
--- a/tests/qemuxml2argvdata/debug-threads.args
+++ b/tests/qemuxml2argvdata/debug-threads.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args
b/tests/qemuxml2argvdata/default-kvm-host-arch.args
index 7855d12dea..4f32959d97 100644
--- a/tests/qemuxml2argvdata/default-kvm-host-arch.args
+++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-kvm \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-kvm/.local/share \
diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args
b/tests/qemuxml2argvdata/default-qemu-host-arch.args
index 6050db2225..ab2530381a 100644
--- a/tests/qemuxml2argvdata/default-qemu-host-arch.args
+++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-qemu-host \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-qemu-host/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-aio.args b/tests/qemuxml2argvdata/disk-aio.args
index fb86bf2036..63906283d0 100644
--- a/tests/qemuxml2argvdata/disk-aio.args
+++ b/tests/qemuxml2argvdata/disk-aio.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
index f7ec0c7712..9148b98ba5 100644
--- a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
index 9421f6f90f..9ba9588dd4 100644
--- a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
index 865a84b628..fb8a62dde3 100644
--- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
index 97d65fd8a8..ee3a3f4ed3 100644
--- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-blockio.args
b/tests/qemuxml2argvdata/disk-blockio.args
index 8c288e572a..d90cc4b94a 100644
--- a/tests/qemuxml2argvdata/disk-blockio.args
+++ b/tests/qemuxml2argvdata/disk-blockio.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.args
b/tests/qemuxml2argvdata/disk-boot-cdrom.args
index 6f80e67741..4979946579 100644
--- a/tests/qemuxml2argvdata/disk-boot-cdrom.args
+++ b/tests/qemuxml2argvdata/disk-boot-cdrom.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-boot-disk.args
b/tests/qemuxml2argvdata/disk-boot-disk.args
index 2e144093d4..05c110dd8c 100644
--- a/tests/qemuxml2argvdata/disk-boot-disk.args
+++ b/tests/qemuxml2argvdata/disk-boot-disk.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
index 5c326e565d..64db701de8 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
index 2401627ac6..e1a7299b12 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
index bc090bfe44..e69fae40ff 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
index bfc0348dc0..60b9982549 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
index 07433dfa27..efe9678d41 100644
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args
index 0c72a7740a..b069edbfa3 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.args
b/tests/qemuxml2argvdata/disk-cdrom-network.args
index 7bd662b5a5..ab1a9bbe9f 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-network.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-network.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
index a10137ffa6..1ece3d6f46 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
index a10137ffa6..1ece3d6f46 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.args
b/tests/qemuxml2argvdata/disk-cdrom-tray.args
index 95f378764d..9b2dbc04f2 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-tray.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-tray.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args
index 894034b2f3..33262d37e8 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args
index 894034b2f3..33262d37e8 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-cdrom.args
b/tests/qemuxml2argvdata/disk-cdrom.args
index 2aae56d0a1..d5834fbbe1 100644
--- a/tests/qemuxml2argvdata/disk-cdrom.args
+++ b/tests/qemuxml2argvdata/disk-cdrom.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
index 679e31e70a..9250cf58d0 100644
--- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
index 0cd9abab86..9caed976d1 100644
--- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.args
b/tests/qemuxml2argvdata/disk-copy_on_read.args
index 02c34b0e6a..0345358753 100644
--- a/tests/qemuxml2argvdata/disk-copy_on_read.args
+++ b/tests/qemuxml2argvdata/disk-copy_on_read.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args
index b057eb3a32..31719c4933 100644
--- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
index b057eb3a32..31719c4933 100644
--- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.args
b/tests/qemuxml2argvdata/disk-detect-zeroes.args
index 50d8d726bc..a129fa0e90 100644
--- a/tests/qemuxml2argvdata/disk-detect-zeroes.args
+++ b/tests/qemuxml2argvdata/disk-detect-zeroes.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args
index 90b87332b8..a0cc477400 100644
--- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args
index 90b87332b8..a0cc477400 100644
--- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-discard.args
b/tests/qemuxml2argvdata/disk-discard.args
index 2e14bbbe27..59d9941367 100644
--- a/tests/qemuxml2argvdata/disk-discard.args
+++ b/tests/qemuxml2argvdata/disk-discard.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-error-policy.args
b/tests/qemuxml2argvdata/disk-error-policy.args
index 63ff7401ad..466ffe02cf 100644
--- a/tests/qemuxml2argvdata/disk-error-policy.args
+++ b/tests/qemuxml2argvdata/disk-error-policy.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args
index b5dffaf184..7451620798 100644
--- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args
index 6c838b32b4..b48408434c 100644
--- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args
index 6686ac6dd1..b221718e29 100644
--- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
index 6686ac6dd1..b221718e29 100644
--- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args
index abc4f090c0..51be45465e 100644
--- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args
index abc4f090c0..51be45465e 100644
--- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.args
b/tests/qemuxml2argvdata/disk-floppy-tray.args
index 2517adff72..8337f35992 100644
--- a/tests/qemuxml2argvdata/disk-floppy-tray.args
+++ b/tests/qemuxml2argvdata/disk-floppy-tray.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-floppy.args
b/tests/qemuxml2argvdata/disk-floppy.args
index 31937c103a..f19df096eb 100644
--- a/tests/qemuxml2argvdata/disk-floppy.args
+++ b/tests/qemuxml2argvdata/disk-floppy.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args
index 742f5aecfe..fd9fe1d54e 100644
--- a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args
index 1ec339fc20..fdac8cf00c 100644
--- a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.args
b/tests/qemuxml2argvdata/disk-fmt-qcow.args
index 5aece87c11..066d3a2c5d 100644
--- a/tests/qemuxml2argvdata/disk-fmt-qcow.args
+++ b/tests/qemuxml2argvdata/disk-fmt-qcow.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-geometry.args
b/tests/qemuxml2argvdata/disk-geometry.args
index ef8f1a5f3c..64bea355dc 100644
--- a/tests/qemuxml2argvdata/disk-geometry.args
+++ b/tests/qemuxml2argvdata/disk-geometry.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
index cac993e8c3..4b59b60a2a 100644
--- a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
+++ b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-ide-split.args
b/tests/qemuxml2argvdata/disk-ide-split.args
index 8a5fb1eb13..83c0a4d290 100644
--- a/tests/qemuxml2argvdata/disk-ide-split.args
+++ b/tests/qemuxml2argvdata/disk-ide-split.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.args
b/tests/qemuxml2argvdata/disk-ide-wwn.args
index bc68264faa..50f6b372c5 100644
--- a/tests/qemuxml2argvdata/disk-ide-wwn.args
+++ b/tests/qemuxml2argvdata/disk-ide-wwn.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.args
b/tests/qemuxml2argvdata/disk-ioeventfd.args
index b24057d349..12dce1a69b 100644
--- a/tests/qemuxml2argvdata/disk-ioeventfd.args
+++ b/tests/qemuxml2argvdata/disk-ioeventfd.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-iscsi.args
b/tests/qemuxml2argvdata/disk-iscsi.args
index 444eb2eaf8..71643a98ab 100644
--- a/tests/qemuxml2argvdata/disk-iscsi.args
+++ b/tests/qemuxml2argvdata/disk-iscsi.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-gluster.args
b/tests/qemuxml2argvdata/disk-network-gluster.args
index ebb53048ed..11a012dbc8 100644
--- a/tests/qemuxml2argvdata/disk-network-gluster.args
+++ b/tests/qemuxml2argvdata/disk-network-gluster.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args
index 8d3fcca3c1..bca51ff5d7 100644
--- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args
index ddea39bd58..e11ceab6bc 100644
--- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
index 02bded2e61..224c5e4c9c 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.args
b/tests/qemuxml2argvdata/disk-network-iscsi.args
index 47eb42af66..1450f3d2bb 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
index 355d8dff37..372888e444 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
index f26cc5a565..da04caf134 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-nbd.args
b/tests/qemuxml2argvdata/disk-network-nbd.args
index 656de387e1..7455bf8856 100644
--- a/tests/qemuxml2argvdata/disk-network-nbd.args
+++ b/tests/qemuxml2argvdata/disk-network-nbd.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args
index 2488d68b61..a462dcfd27 100644
--- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args
index 39e73eb1eb..beafc0bfa4 100644
--- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
index cec5b15f7b..80969bdc43 100644
--- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
index 9a7bbc8a1d..4920bfb520 100644
--- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
index 69f516ef74..7650a8889f 100644
--- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.args
b/tests/qemuxml2argvdata/disk-network-sheepdog.args
index f71786a1c1..97fc6045ce 100644
--- a/tests/qemuxml2argvdata/disk-network-sheepdog.args
+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
index 59a563a08b..25f6e4b7f5 100644
--- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
index c036aa0bf2..48a85a9d1e 100644
--- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.args
b/tests/qemuxml2argvdata/disk-network-source-auth.args
index 834fde7ee7..e96acfc9e9 100644
--- a/tests/qemuxml2argvdata/disk-network-source-auth.args
+++ b/tests/qemuxml2argvdata/disk-network-source-auth.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
index 43f711df12..caba015187 100644
--- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
index eeb72e0200..dd95c0f002 100644
--- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.args
b/tests/qemuxml2argvdata/disk-network-tlsx509.args
index 0958dc8339..51f29cd272 100644
--- a/tests/qemuxml2argvdata/disk-network-tlsx509.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args
index 783f7f5343..06686f801d 100644
--- a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
index 4dae95b839..35e5936828 100644
--- a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-network-vxhs.args
b/tests/qemuxml2argvdata/disk-network-vxhs.args
index 805ba13e12..5d781ca616 100644
--- a/tests/qemuxml2argvdata/disk-network-vxhs.args
+++ b/tests/qemuxml2argvdata/disk-network-vxhs.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-no-boot.args
b/tests/qemuxml2argvdata/disk-no-boot.args
index b50e6c2294..24b8717735 100644
--- a/tests/qemuxml2argvdata/disk-no-boot.args
+++ b/tests/qemuxml2argvdata/disk-no-boot.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-order.args
b/tests/qemuxml2argvdata/disk-order.args
index 02c26f5d03..d8ef322316 100644
--- a/tests/qemuxml2argvdata/disk-order.args
+++ b/tests/qemuxml2argvdata/disk-order.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.args
b/tests/qemuxml2argvdata/disk-readonly-disk.args
index 4e33eeb10d..b5ce165cfa 100644
--- a/tests/qemuxml2argvdata/disk-readonly-disk.args
+++ b/tests/qemuxml2argvdata/disk-readonly-disk.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args
index e599a846f3..87719ff12b 100644
--- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args
index 5bdd84867c..2096a2ef92 100644
--- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-sata-device.args
b/tests/qemuxml2argvdata/disk-sata-device.args
index dc7946ea25..1f2e8bbbcc 100644
--- a/tests/qemuxml2argvdata/disk-sata-device.args
+++ b/tests/qemuxml2argvdata/disk-sata-device.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
index df1f120d80..89d692602c 100644
--- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
+++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
index f7c2f3aa06..248a64eeef 100644
--- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.args
b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
index f114d54a20..800d9689dd 100644
--- a/tests/qemuxml2argvdata/disk-scsi-disk-split.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
index 97b38bbe91..fa2d760aff 100644
--- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
index d4392105fd..97b383949d 100644
--- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
index 6b89af34e9..74a0ecd5b6 100644
--- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
+++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
index bc8c2e53db..ca3d5c8a36 100644
--- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-serial.args
b/tests/qemuxml2argvdata/disk-serial.args
index b47157023d..81ddac12e5 100644
--- a/tests/qemuxml2argvdata/disk-serial.args
+++ b/tests/qemuxml2argvdata/disk-serial.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
index 3a44228e7c..94eb0fe05c 100644
--- a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
index 990d5f6007..227574012d 100644
--- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-snapshot.args
b/tests/qemuxml2argvdata/disk-snapshot.args
index e8504a5e4b..c7aa57ab5b 100644
--- a/tests/qemuxml2argvdata/disk-snapshot.args
+++ b/tests/qemuxml2argvdata/disk-snapshot.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.args
b/tests/qemuxml2argvdata/disk-source-pool-mode.args
index 66936a691f..daaafdd885 100644
--- a/tests/qemuxml2argvdata/disk-source-pool-mode.args
+++ b/tests/qemuxml2argvdata/disk-source-pool-mode.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-source-pool.args
b/tests/qemuxml2argvdata/disk-source-pool.args
index fdc5a5de43..3ff9a2534f 100644
--- a/tests/qemuxml2argvdata/disk-source-pool.args
+++ b/tests/qemuxml2argvdata/disk-source-pool.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.args
b/tests/qemuxml2argvdata/disk-usb-device-removable.args
index 1961582ecc..a7bdee359f 100644
--- a/tests/qemuxml2argvdata/disk-usb-device-removable.args
+++ b/tests/qemuxml2argvdata/disk-usb-device-removable.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-usb-device.args
b/tests/qemuxml2argvdata/disk-usb-device.args
index 2ca016a1e9..bba14fde0f 100644
--- a/tests/qemuxml2argvdata/disk-usb-device.args
+++ b/tests/qemuxml2argvdata/disk-usb-device.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
b/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
index ad49f15cc2..960bbec7c7 100644
--- a/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
+++ b/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw.args
b/tests/qemuxml2argvdata/disk-virtio-ccw.args
index 29ef35d791..bb53fcea92 100644
--- a/tests/qemuxml2argvdata/disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/disk-virtio-ccw.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.args
b/tests/qemuxml2argvdata/disk-virtio-queues.args
index f678faaa83..29017e5cad 100644
--- a/tests/qemuxml2argvdata/disk-virtio-queues.args
+++ b/tests/qemuxml2argvdata/disk-virtio-queues.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
index 2c911b0cbc..ca88cbe7b3 100644
--- a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
+++ b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-virtio-s390.args
b/tests/qemuxml2argvdata/disk-virtio-s390.args
index 49ce8f7bd3..d98aa9a223 100644
--- a/tests/qemuxml2argvdata/disk-virtio-s390.args
+++ b/tests/qemuxml2argvdata/disk-virtio-s390.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args
index d591baf48f..e0bc344f76 100644
--- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args
index ff68cc59c4..0b1b83295c 100644
--- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/disk-virtio.args
b/tests/qemuxml2argvdata/disk-virtio.args
index 9cbcf1d5de..0e2e098767 100644
--- a/tests/qemuxml2argvdata/disk-virtio.args
+++ b/tests/qemuxml2argvdata/disk-virtio.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.args
b/tests/qemuxml2argvdata/encrypted-disk-usage.args
index e677ae5050..cc58120e7f 100644
--- a/tests/qemuxml2argvdata/encrypted-disk-usage.args
+++ b/tests/qemuxml2argvdata/encrypted-disk-usage.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-encryptdisk \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
diff --git a/tests/qemuxml2argvdata/encrypted-disk.args
b/tests/qemuxml2argvdata/encrypted-disk.args
index e677ae5050..cc58120e7f 100644
--- a/tests/qemuxml2argvdata/encrypted-disk.args
+++ b/tests/qemuxml2argvdata/encrypted-disk.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-encryptdisk \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
diff --git a/tests/qemuxml2argvdata/eoi-disabled.args
b/tests/qemuxml2argvdata/eoi-disabled.args
index 599ca1b8e0..30fea394bc 100644
--- a/tests/qemuxml2argvdata/eoi-disabled.args
+++ b/tests/qemuxml2argvdata/eoi-disabled.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/eoi-enabled.args
b/tests/qemuxml2argvdata/eoi-enabled.args
index b7c47fd7f5..5a82b2ac52 100644
--- a/tests/qemuxml2argvdata/eoi-enabled.args
+++ b/tests/qemuxml2argvdata/eoi-enabled.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/event_idx.args
b/tests/qemuxml2argvdata/event_idx.args
index a2cdb326e5..1d4115c6c4 100644
--- a/tests/qemuxml2argvdata/event_idx.args
+++ b/tests/qemuxml2argvdata/event_idx.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
index bbeff4cb68..f7f672c2da 100644
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-instance-00000092 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-instance-00000092/.local/share \
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
index d3b5de10d3..0382b792d7 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-instance-00000092 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-instance-00000092/.local/share \
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
index 459fcfe56d..5853e0c0b3 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-instance-00000092 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-instance-00000092/.local/share \
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
index 4c7957382f..9ac9a2d646 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-instance-00000092 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-instance-00000092/.local/share \
diff --git a/tests/qemuxml2argvdata/fips-enabled.args
b/tests/qemuxml2argvdata/fips-enabled.args
index e93f2d6d36..0cf53326b6 100644
--- a/tests/qemuxml2argvdata/fips-enabled.args
+++ b/tests/qemuxml2argvdata/fips-enabled.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.args
b/tests/qemuxml2argvdata/floppy-drive-fat.args
index b5f2b33223..c4a3d17642 100644
--- a/tests/qemuxml2argvdata/floppy-drive-fat.args
+++ b/tests/qemuxml2argvdata/floppy-drive-fat.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args
index 4b630bd2e0..b3ecac19e6 100644
--- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args
b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args
index 0674d69c08..102b13bf82 100644
--- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/fs9p-ccw.args b/tests/qemuxml2argvdata/fs9p-ccw.args
index 0960072fa6..2403d5da9b 100644
--- a/tests/qemuxml2argvdata/fs9p-ccw.args
+++ b/tests/qemuxml2argvdata/fs9p-ccw.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/fs9p.args b/tests/qemuxml2argvdata/fs9p.args
index ed5ae693d8..dbdbd204a8 100644
--- a/tests/qemuxml2argvdata/fs9p.args
+++ b/tests/qemuxml2argvdata/fs9p.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args
b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args
index f451931148..63c4fd3d65 100644
--- a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/genid.x86_64-latest.args
b/tests/qemuxml2argvdata/genid.x86_64-latest.args
index f470962dc1..5d73d78571 100644
--- a/tests/qemuxml2argvdata/genid.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/genid.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args
b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args
index 65ad493f80..10b44d52d3 100644
--- a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args
b/tests/qemuxml2argvdata/graphics-egl-headless.args
index c5b90c6d98..f0562a9356 100644
--- a/tests/qemuxml2argvdata/graphics-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args
b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args
index 65ad493f80..10b44d52d3 100644
--- a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
index 87e355e790..16f79eb933 100644
--- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
+++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-sdl.args
b/tests/qemuxml2argvdata/graphics-sdl.args
index d2b6a30fa3..c06babe9ff 100644
--- a/tests/qemuxml2argvdata/graphics-sdl.args
+++ b/tests/qemuxml2argvdata/graphics-sdl.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
index 5dedaf9524..b782059ac4 100644
--- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
+++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
index e18b23c536..ba0ca8530c 100644
--- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
+++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
index 672ddcb346..b73561b6f5 100644
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
index 672ddcb346..b73561b6f5 100644
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.args
b/tests/qemuxml2argvdata/graphics-spice-compression.args
index c289ddb993..b35417a133 100644
--- a/tests/qemuxml2argvdata/graphics-spice-compression.args
+++ b/tests/qemuxml2argvdata/graphics-spice-compression.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
index 89daf3e66b..0c7164bfe4 100644
--- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
index 4da73ba401..cec5cbe71f 100644
--- a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.args
b/tests/qemuxml2argvdata/graphics-spice-no-args.args
index dc7d5dfc34..7b81d8557d 100644
--- a/tests/qemuxml2argvdata/graphics-spice-no-args.args
+++ b/tests/qemuxml2argvdata/graphics-spice-no-args.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
index 482794b7e9..de1af66898 100644
--- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
+++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args
b/tests/qemuxml2argvdata/graphics-spice-sasl.args
index 5581b45dda..e3ed7e2f4f 100644
--- a/tests/qemuxml2argvdata/graphics-spice-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-spice-sasl.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.args
b/tests/qemuxml2argvdata/graphics-spice-socket.args
index 340135a90b..45fc061fd5 100644
--- a/tests/qemuxml2argvdata/graphics-spice-socket.args
+++ b/tests/qemuxml2argvdata/graphics-spice-socket.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args
b/tests/qemuxml2argvdata/graphics-spice-timeout.args
index b38a1902fe..e07110e6e1 100644
--- a/tests/qemuxml2argvdata/graphics-spice-timeout.args
+++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-f14 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-f14/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
index 00e69dc659..3c7ec5b69d 100644
--- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
+++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-spice.args
b/tests/qemuxml2argvdata/graphics-spice.args
index ec76345335..a934b0602b 100644
--- a/tests/qemuxml2argvdata/graphics-spice.args
+++ b/tests/qemuxml2argvdata/graphics-spice.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
index 794b8ebea0..e7473b9b03 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
index d6f0a5e26f..e7337cda74 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
index 5b65a38bb1..277ed94c20 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
index 0cc17b53a3..9e42511e97 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.args
b/tests/qemuxml2argvdata/graphics-vnc-none.args
index 74157ae8b5..8b9b9a927e 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-none.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-none.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.args
b/tests/qemuxml2argvdata/graphics-vnc-policy.args
index a4a6762f20..63d29a67b6 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-policy.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-policy.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
index 18e082dfab..ba02443b7a 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.args
b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
index dc44171e49..048c640446 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
index 933362939c..e9ad08a14d 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.args
b/tests/qemuxml2argvdata/graphics-vnc-socket.args
index 43443038f2..af5c3c0afc 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
index 1888a15e54..3494eecbfe 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.args
b/tests/qemuxml2argvdata/graphics-vnc-tls.args
index 37902d1ef0..c4b444ca61 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
index a1f3c6bd2b..a976e5d88c 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
index 70bf59e3fc..014230942c 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.args
b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
index 14878ac578..bb3f5b212d 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-websocket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/graphics-vnc.args
b/tests/qemuxml2argvdata/graphics-vnc.args
index 0cc17b53a3..9e42511e97 100644
--- a/tests/qemuxml2argvdata/graphics-vnc.args
+++ b/tests/qemuxml2argvdata/graphics-vnc.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git
a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
index 10802c5038..40b4cca088 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
index bd8507d960..da0aedca9b 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git
a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
index 08b2bd3b5a..d6f0f47ce8 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
index 1cb4ceb2dd..3eef014f13 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
index ed13bd3e94..1a5a436ca6 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.args
b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
index eff8476683..ba75d91b7f 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address-device.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.args
b/tests/qemuxml2argvdata/hostdev-pci-address.args
index 670b21881f..0ca99ec3ce 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args
b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args
index 8a8ab4f448..469e2dd7ab 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args
b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args
index 308496b03e..9ac624b470 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.args
b/tests/qemuxml2argvdata/hostdev-scsi-lsi.args
index d683381da7..07c15fab09 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args
b/tests/qemuxml2argvdata/hostdev-scsi-readonly.args
index 3b012f717a..87a7451b07 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-readonly.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
index f39e9e46a2..45b845226a 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
index 7aa7d25b66..cc87c450b9 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
index 0556301103..1832a37b51 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args
b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args
index add33b41c6..ef21e79604 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args
b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args
index d87185d715..6e087eff33 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args
b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args
index f888bee2e4..727875881b 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
index 4a1d201361..7bb05851d2 100644
--- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
index 3fcf75cb1d..5ed83db4d1 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.args
b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
index f510f7c168..96b11b4757 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.args
b/tests/qemuxml2argvdata/hostdev-usb-address.args
index d3fb6c7e7b..832e9fd225 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
index dc6a6050a2..49e3a60b7d 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
index ed540d42f9..78a0d4a004 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
index 8835492a6f..b2830c4ea0 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
index 5b833cd997..ec35353233 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
index 0defc21c48..256098ade8 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args
b/tests/qemuxml2argvdata/hostdev-vfio.args
index 87374ceed7..1ef4b958bf 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/hotplug-base.args
b/tests/qemuxml2argvdata/hotplug-base.args
index 3296575646..9a55d44897 100644
--- a/tests/qemuxml2argvdata/hotplug-base.args
+++ b/tests/qemuxml2argvdata/hotplug-base.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-hotplug \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-hotplug/.local/share \
diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.args
b/tests/qemuxml2argvdata/hugepages-default-2M.args
index 54dd1d9a71..1b28679b57 100644
--- a/tests/qemuxml2argvdata/hugepages-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.args
b/tests/qemuxml2argvdata/hugepages-default-system-size.args
index 94f2895cc4..576ba7969e 100644
--- a/tests/qemuxml2argvdata/hugepages-default-system-size.args
+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
diff --git a/tests/qemuxml2argvdata/hugepages-default.args
b/tests/qemuxml2argvdata/hugepages-default.args
index 1b681c82ef..108c2962ba 100644
--- a/tests/qemuxml2argvdata/hugepages-default.args
+++ b/tests/qemuxml2argvdata/hugepages-default.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args
b/tests/qemuxml2argvdata/hugepages-memaccess.args
index adde2156ab..5e47c05b09 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args
b/tests/qemuxml2argvdata/hugepages-memaccess2.args
index 634dabaf1b..2c540c9aa8 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess2.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.args
b/tests/qemuxml2argvdata/hugepages-nodeset.args
index 54dd1d9a71..1b28679b57 100644
--- a/tests/qemuxml2argvdata/hugepages-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-nodeset.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
index ecf7ce1fc8..fb6dab30f9 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
index 32b743cd02..696a73431a 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-fedora \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.args
b/tests/qemuxml2argvdata/hugepages-numa-default.args
index 8571a684eb..766f4817e1 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-fedora \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
index a08ea55dc6..6b2a769caa 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
index 70ac061bd1..f5c74a8749 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
index e7dd381286..f4b401ebdd 100644
--- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/hugepages-shared.args
b/tests/qemuxml2argvdata/hugepages-shared.args
index e2dfb35bcc..aa88a7275a 100644
--- a/tests/qemuxml2argvdata/hugepages-shared.args
+++ b/tests/qemuxml2argvdata/hugepages-shared.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/hyperv-off.args
b/tests/qemuxml2argvdata/hyperv-off.args
index 6bb8a636bf..23cd05d37a 100644
--- a/tests/qemuxml2argvdata/hyperv-off.args
+++ b/tests/qemuxml2argvdata/hyperv-off.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/hyperv-panic.args
b/tests/qemuxml2argvdata/hyperv-panic.args
index 43cc0324ed..aeb9c9e773 100644
--- a/tests/qemuxml2argvdata/hyperv-panic.args
+++ b/tests/qemuxml2argvdata/hyperv-panic.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/hyperv.args b/tests/qemuxml2argvdata/hyperv.args
index e7e2c4c4b2..f606a06e51 100644
--- a/tests/qemuxml2argvdata/hyperv.args
+++ b/tests/qemuxml2argvdata/hyperv.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args
b/tests/qemuxml2argvdata/input-usbmouse-addr.args
index ac18e2a444..463d6c018a 100644
--- a/tests/qemuxml2argvdata/input-usbmouse-addr.args
+++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/input-usbmouse.args
b/tests/qemuxml2argvdata/input-usbmouse.args
index a54083f2b6..e7c4a1277e 100644
--- a/tests/qemuxml2argvdata/input-usbmouse.args
+++ b/tests/qemuxml2argvdata/input-usbmouse.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/input-usbtablet.args
b/tests/qemuxml2argvdata/input-usbtablet.args
index 46a52901c4..8856b4879e 100644
--- a/tests/qemuxml2argvdata/input-usbtablet.args
+++ b/tests/qemuxml2argvdata/input-usbtablet.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/input-virtio-ccw.args
b/tests/qemuxml2argvdata/input-virtio-ccw.args
index a9bd3f70e7..987f0396c0 100644
--- a/tests/qemuxml2argvdata/input-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/input-virtio-ccw.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.args
b/tests/qemuxml2argvdata/intel-iommu-caching-mode.args
index c7b6551b50..aae4825a5b 100644
--- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.args
+++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.args
b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.args
index 1e9e96641a..2ca6ae5433 100644
--- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.args
+++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.args
b/tests/qemuxml2argvdata/intel-iommu-eim.args
index 6599ec4316..50fafea462 100644
--- a/tests/qemuxml2argvdata/intel-iommu-eim.args
+++ b/tests/qemuxml2argvdata/intel-iommu-eim.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/intel-iommu-machine.args
b/tests/qemuxml2argvdata/intel-iommu-machine.args
index f85475b6d9..eb1319e6b2 100644
--- a/tests/qemuxml2argvdata/intel-iommu-machine.args
+++ b/tests/qemuxml2argvdata/intel-iommu-machine.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/intel-iommu.args
b/tests/qemuxml2argvdata/intel-iommu.args
index fab3af0882..25deeb74a9 100644
--- a/tests/qemuxml2argvdata/intel-iommu.args
+++ b/tests/qemuxml2argvdata/intel-iommu.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
index 105b0162e6..4673ff6d84 100644
--- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/iothreads-disk.args
b/tests/qemuxml2argvdata/iothreads-disk.args
index e8b6c80f62..4785408991 100644
--- a/tests/qemuxml2argvdata/iothreads-disk.args
+++ b/tests/qemuxml2argvdata/iothreads-disk.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.args
b/tests/qemuxml2argvdata/iothreads-ids-partial.args
index bf10ec6cd9..a253e7e1eb 100644
--- a/tests/qemuxml2argvdata/iothreads-ids-partial.args
+++ b/tests/qemuxml2argvdata/iothreads-ids-partial.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/iothreads-ids.args
b/tests/qemuxml2argvdata/iothreads-ids.args
index c18342ad83..3801b877cd 100644
--- a/tests/qemuxml2argvdata/iothreads-ids.args
+++ b/tests/qemuxml2argvdata/iothreads-ids.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
index 73a3891f6e..47071b80b0 100644
--- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
+++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args
b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args
index f76eec9acc..6a153381be 100644
--- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/iothreads.args
b/tests/qemuxml2argvdata/iothreads.args
index 63d2f1ea5a..6e8ec08d02 100644
--- a/tests/qemuxml2argvdata/iothreads.args
+++ b/tests/qemuxml2argvdata/iothreads.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/kvm-features-off.args
b/tests/qemuxml2argvdata/kvm-features-off.args
index 6bb8a636bf..23cd05d37a 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.args
+++ b/tests/qemuxml2argvdata/kvm-features-off.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/kvm-features.args
b/tests/qemuxml2argvdata/kvm-features.args
index 0d395d4146..03432519a9 100644
--- a/tests/qemuxml2argvdata/kvm-features.args
+++ b/tests/qemuxml2argvdata/kvm-features.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args
b/tests/qemuxml2argvdata/kvm-pit-delay.args
index 6af09924a3..15e3934340 100644
--- a/tests/qemuxml2argvdata/kvm-pit-delay.args
+++ b/tests/qemuxml2argvdata/kvm-pit-delay.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args
b/tests/qemuxml2argvdata/kvm-pit-discard.args
index d60c38ebb2..0cd340490b 100644
--- a/tests/qemuxml2argvdata/kvm-pit-discard.args
+++ b/tests/qemuxml2argvdata/kvm-pit-discard.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.args
b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.args
index a2b8a3e906..4f3a147afb 100644
--- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.args
+++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args
index 6ce5e7a711..af134c14df 100644
--- a/tests/qemuxml2argvdata/kvmclock.args
+++ b/tests/qemuxml2argvdata/kvmclock.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
index c5e59808f3..378c3b681c 100644
--- a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
index ab0d70fa54..975c3d4b4f 100644
--- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
+++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-encryptdisk \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
diff --git a/tests/qemuxml2argvdata/luks-disks-source.args
b/tests/qemuxml2argvdata/luks-disks-source.args
index 1f200777ff..d6599e336f 100644
--- a/tests/qemuxml2argvdata/luks-disks-source.args
+++ b/tests/qemuxml2argvdata/luks-disks-source.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-encryptdisk \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
diff --git a/tests/qemuxml2argvdata/luks-disks.args
b/tests/qemuxml2argvdata/luks-disks.args
index aac8a90634..4e3307d9a4 100644
--- a/tests/qemuxml2argvdata/luks-disks.args
+++ b/tests/qemuxml2argvdata/luks-disks.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-encryptdisk \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
diff --git a/tests/qemuxml2argvdata/mach-virt-console-virtio.args
b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
index 28619cb0ad..772e89c3f1 100644
--- a/tests/qemuxml2argvdata/mach-virt-console-virtio.args
+++ b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-native.args
b/tests/qemuxml2argvdata/mach-virt-serial-native.args
index 8ccfa20ee0..1cdc770508 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-native.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-native.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-pci.args
b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
index cbf6f6be50..efffa19b4a 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-pci.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-usb.args
b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
index 458afb9747..ba056a62e3 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-usb.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
index bb467227dd..ec257b1e8b 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
index bb467227dd..ec257b1e8b 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
index 762fec28cf..f50e0b87e1 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
index 762fec28cf..f50e0b87e1 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-aliases1.args
b/tests/qemuxml2argvdata/machine-aliases1.args
index 0a4783b117..7505436791 100644
--- a/tests/qemuxml2argvdata/machine-aliases1.args
+++ b/tests/qemuxml2argvdata/machine-aliases1.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-aliases2.args
b/tests/qemuxml2argvdata/machine-aliases2.args
index bbc45f9820..01ba4d4aa2 100644
--- a/tests/qemuxml2argvdata/machine-aliases2.args
+++ b/tests/qemuxml2argvdata/machine-aliases2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-core-off.args
b/tests/qemuxml2argvdata/machine-core-off.args
index fccae6cbbf..b1209e5e0a 100644
--- a/tests/qemuxml2argvdata/machine-core-off.args
+++ b/tests/qemuxml2argvdata/machine-core-off.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-core-on.args
b/tests/qemuxml2argvdata/machine-core-on.args
index fdb5b01a1a..edffb668ff 100644
--- a/tests/qemuxml2argvdata/machine-core-on.args
+++ b/tests/qemuxml2argvdata/machine-core-on.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
index 616b2b7fe9..80d963c01c 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
index 616b2b7fe9..80d963c01c 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
index 2dbe1a55ee..b7c98cd4d7 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
index 2dbe1a55ee..b7c98cd4d7 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
index 4ee41df2e0..521d976e13 100644
--- a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
+++ b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.args
b/tests/qemuxml2argvdata/machine-keywrap-none.args
index 4ee41df2e0..521d976e13 100644
--- a/tests/qemuxml2argvdata/machine-keywrap-none.args
+++ b/tests/qemuxml2argvdata/machine-keywrap-none.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
index a79fe9bd62..f530db8bad 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
index 60186de500..18544141d3 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390.args
b/tests/qemuxml2argvdata/machine-loadparm-s390.args
index 6190f99227..b321217541 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-s390.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-smm-opt.args
b/tests/qemuxml2argvdata/machine-smm-opt.args
index 2a46b1e75b..446340ede1 100644
--- a/tests/qemuxml2argvdata/machine-smm-opt.args
+++ b/tests/qemuxml2argvdata/machine-smm-opt.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args
b/tests/qemuxml2argvdata/machine-vmport-opt.args
index a22979d404..1658840049 100644
--- a/tests/qemuxml2argvdata/machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/master-key.args
b/tests/qemuxml2argvdata/master-key.args
index 0861a1a5b5..086aaa6269 100644
--- a/tests/qemuxml2argvdata/master-key.args
+++ b/tests/qemuxml2argvdata/master-key.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
index 578fee52db..ee425a737b 100644
--- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-instance-00000092 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-instance-00000092/.local/share \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
index 61771cb574..e5bafc828a 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
index ba28eb389e..51e652a994 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
index 4995f6b331..83905457ad 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
index aad242ca6c..30838e13a9 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
index d9ef516e6c..e6738a5522 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
index 8b96529172..6ea83ad835 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
index 4924975854..974ec4c45c 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
index 4208c9bba4..a1507f3851 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
index ffdedd2d06..7c3736c692 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/memory-hotplug.args
b/tests/qemuxml2argvdata/memory-hotplug.args
index c5f67af12e..d1556b481f 100644
--- a/tests/qemuxml2argvdata/memory-hotplug.args
+++ b/tests/qemuxml2argvdata/memory-hotplug.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args
b/tests/qemuxml2argvdata/memtune-unlimited.args
index 21d141cb7c..e2fc6335b9 100644
--- a/tests/qemuxml2argvdata/memtune-unlimited.args
+++ b/tests/qemuxml2argvdata/memtune-unlimited.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args
index 21d141cb7c..e2fc6335b9 100644
--- a/tests/qemuxml2argvdata/memtune.args
+++ b/tests/qemuxml2argvdata/memtune.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.args
b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
index b4a083e177..332d5bd53c 100644
--- a/tests/qemuxml2argvdata/migrate-numa-unaligned.args
+++ b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/migrate.args
index 1d53abd32f..31afba6046 100644
--- a/tests/qemuxml2argvdata/migrate.args
+++ b/tests/qemuxml2argvdata/migrate.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/minimal-msg-timestamp.args
b/tests/qemuxml2argvdata/minimal-msg-timestamp.args
index 38ccdf6843..a46213159f 100644
--- a/tests/qemuxml2argvdata/minimal-msg-timestamp.args
+++ b/tests/qemuxml2argvdata/minimal-msg-timestamp.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/minimal-sandbox.args
b/tests/qemuxml2argvdata/minimal-sandbox.args
index 6ac61c2c87..61b6732068 100644
--- a/tests/qemuxml2argvdata/minimal-sandbox.args
+++ b/tests/qemuxml2argvdata/minimal-sandbox.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args
index 21d141cb7c..e2fc6335b9 100644
--- a/tests/qemuxml2argvdata/minimal.args
+++ b/tests/qemuxml2argvdata/minimal.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/misc-acpi.args
b/tests/qemuxml2argvdata/misc-acpi.args
index 4fd8a659ca..ca079ad6a8 100644
--- a/tests/qemuxml2argvdata/misc-acpi.args
+++ b/tests/qemuxml2argvdata/misc-acpi.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args
b/tests/qemuxml2argvdata/misc-disable-s3.args
index db34a779c2..7e35abb417 100644
--- a/tests/qemuxml2argvdata/misc-disable-s3.args
+++ b/tests/qemuxml2argvdata/misc-disable-s3.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args
b/tests/qemuxml2argvdata/misc-disable-suspends.args
index 435421523e..cbe755dca6 100644
--- a/tests/qemuxml2argvdata/misc-disable-suspends.args
+++ b/tests/qemuxml2argvdata/misc-disable-suspends.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args
b/tests/qemuxml2argvdata/misc-enable-s4.args
index 9c122cb1b0..adfd7c16d4 100644
--- a/tests/qemuxml2argvdata/misc-enable-s4.args
+++ b/tests/qemuxml2argvdata/misc-enable-s4.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/misc-no-reboot.args
b/tests/qemuxml2argvdata/misc-no-reboot.args
index 7d34ca5a20..026a3ddf5a 100644
--- a/tests/qemuxml2argvdata/misc-no-reboot.args
+++ b/tests/qemuxml2argvdata/misc-no-reboot.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/misc-uuid.args
b/tests/qemuxml2argvdata/misc-uuid.args
index 4fd8a659ca..ca079ad6a8 100644
--- a/tests/qemuxml2argvdata/misc-uuid.args
+++ b/tests/qemuxml2argvdata/misc-uuid.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/mlock-off.args
b/tests/qemuxml2argvdata/mlock-off.args
index bb52bf8f47..aa41fb6eb8 100644
--- a/tests/qemuxml2argvdata/mlock-off.args
+++ b/tests/qemuxml2argvdata/mlock-off.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/mlock-on.args b/tests/qemuxml2argvdata/mlock-on.args
index d5a3901867..b9ad161ec2 100644
--- a/tests/qemuxml2argvdata/mlock-on.args
+++ b/tests/qemuxml2argvdata/mlock-on.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/mlock-unsupported.args
b/tests/qemuxml2argvdata/mlock-unsupported.args
index dcf98040c7..c347035698 100644
--- a/tests/qemuxml2argvdata/mlock-unsupported.args
+++ b/tests/qemuxml2argvdata/mlock-unsupported.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/monitor-json.args
b/tests/qemuxml2argvdata/monitor-json.args
index a46e1effe5..cc0f5b6914 100644
--- a/tests/qemuxml2argvdata/monitor-json.args
+++ b/tests/qemuxml2argvdata/monitor-json.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-encryptdisk \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args
b/tests/qemuxml2argvdata/multifunction-pci-device.args
index 4abefbf40a..48e96a40f8 100644
--- a/tests/qemuxml2argvdata/multifunction-pci-device.args
+++ b/tests/qemuxml2argvdata/multifunction-pci-device.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/name-escape.args
b/tests/qemuxml2argvdata/name-escape.args
index 27bb8a62f7..9077484e8a 100644
--- a/tests/qemuxml2argvdata/name-escape.args
+++ b/tests/qemuxml2argvdata/name-escape.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-foo=1,bar=2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-foo=1,bar=2/.local/share \
diff --git a/tests/qemuxml2argvdata/net-client.args
b/tests/qemuxml2argvdata/net-client.args
index fcedf4924b..ed8c807ec8 100644
--- a/tests/qemuxml2argvdata/net-client.args
+++ b/tests/qemuxml2argvdata/net-client.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args
b/tests/qemuxml2argvdata/net-eth-hostip.args
index fe58cf820f..f06cbf263c 100644
--- a/tests/qemuxml2argvdata/net-eth-hostip.args
+++ b/tests/qemuxml2argvdata/net-eth-hostip.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args
b/tests/qemuxml2argvdata/net-eth-ifname.args
index fe58cf820f..f06cbf263c 100644
--- a/tests/qemuxml2argvdata/net-eth-ifname.args
+++ b/tests/qemuxml2argvdata/net-eth-ifname.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-eth-names.args
b/tests/qemuxml2argvdata/net-eth-names.args
index f15fad16cf..745550f1b8 100644
--- a/tests/qemuxml2argvdata/net-eth-names.args
+++ b/tests/qemuxml2argvdata/net-eth-names.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/net-eth.args
index fe58cf820f..f06cbf263c 100644
--- a/tests/qemuxml2argvdata/net-eth.args
+++ b/tests/qemuxml2argvdata/net-eth.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
index 0b216e0fc8..9824911f48 100644
--- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
index b8296b5b13..ded43796ac 100644
--- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
index 2c00340d2b..4913ae82ab 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args
b/tests/qemuxml2argvdata/net-hostdev-vfio.args
index 3493002a65..ef3cfa52a2 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-hostdev.args
b/tests/qemuxml2argvdata/net-hostdev.args
index 091c7c7834..0e0a30dafa 100644
--- a/tests/qemuxml2argvdata/net-hostdev.args
+++ b/tests/qemuxml2argvdata/net-hostdev.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-mcast.args
b/tests/qemuxml2argvdata/net-mcast.args
index 1f22d930d4..5496f9c6f9 100644
--- a/tests/qemuxml2argvdata/net-mcast.args
+++ b/tests/qemuxml2argvdata/net-mcast.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-server.args
b/tests/qemuxml2argvdata/net-server.args
index d98256bb37..b776e5796d 100644
--- a/tests/qemuxml2argvdata/net-server.args
+++ b/tests/qemuxml2argvdata/net-server.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/net-udp.args
index 7fda543227..4aeb3e0c41 100644
--- a/tests/qemuxml2argvdata/net-udp.args
+++ b/tests/qemuxml2argvdata/net-udp.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-user-addr.args
b/tests/qemuxml2argvdata/net-user-addr.args
index 0700ffd600..993fc9f9ee 100644
--- a/tests/qemuxml2argvdata/net-user-addr.args
+++ b/tests/qemuxml2argvdata/net-user-addr.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/net-user.args
index 5eb349d977..0e3f2f8f4b 100644
--- a/tests/qemuxml2argvdata/net-user.args
+++ b/tests/qemuxml2argvdata/net-user.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
index 5f2270f0f2..8224ac7a84 100644
--- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
+++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-vhostuser.args
b/tests/qemuxml2argvdata/net-vhostuser.args
index 0a706113d4..aa595119eb 100644
--- a/tests/qemuxml2argvdata/net-vhostuser.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
index df149acc20..17a97e3315 100644
--- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
index e021ef4a57..66c0fcd5bd 100644
--- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.args
b/tests/qemuxml2argvdata/net-virtio-ccw.args
index 382ac65436..22c092e861 100644
--- a/tests/qemuxml2argvdata/net-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/net-virtio-ccw.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-virtio-device.args
b/tests/qemuxml2argvdata/net-virtio-device.args
index e9170a8a90..d1afcbab95 100644
--- a/tests/qemuxml2argvdata/net-virtio-device.args
+++ b/tests/qemuxml2argvdata/net-virtio-device.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
index 0241fd7fd9..9176c3e73a 100644
--- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
+++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args
b/tests/qemuxml2argvdata/net-virtio-netdev.args
index 8cff93414b..5a91de867e 100644
--- a/tests/qemuxml2argvdata/net-virtio-netdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-netdev.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
index 0ad7fc5051..06711270e5 100644
--- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
+++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-virtio-s390.args
b/tests/qemuxml2argvdata/net-virtio-s390.args
index 3c3c2313d6..161ce122bc 100644
--- a/tests/qemuxml2argvdata/net-virtio-s390.args
+++ b/tests/qemuxml2argvdata/net-virtio-s390.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/net-virtio.args
b/tests/qemuxml2argvdata/net-virtio.args
index 58e07c48de..8df8817878 100644
--- a/tests/qemuxml2argvdata/net-virtio.args
+++ b/tests/qemuxml2argvdata/net-virtio.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/nosharepages.args
b/tests/qemuxml2argvdata/nosharepages.args
index 9616ac8f06..a135d1ff8d 100644
--- a/tests/qemuxml2argvdata/nosharepages.args
+++ b/tests/qemuxml2argvdata/nosharepages.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
index afec8ebca5..0be5d3e83a 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
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 afec8ebca5..0be5d3e83a 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
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
index afec8ebca5..0be5d3e83a 100644
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
index afec8ebca5..0be5d3e83a 100644
--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
+++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args
index afec8ebca5..0be5d3e83a 100644
--- a/tests/qemuxml2argvdata/numad.args
+++ b/tests/qemuxml2argvdata/numad.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
index afec8ebca5..0be5d3e83a 100644
--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
+++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.args
b/tests/qemuxml2argvdata/numatune-auto-prefer.args
index 0ec2456604..a6e6ae4f64 100644
--- a/tests/qemuxml2argvdata/numatune-auto-prefer.args
+++ b/tests/qemuxml2argvdata/numatune-auto-prefer.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
diff --git a/tests/qemuxml2argvdata/numatune-distances.args
b/tests/qemuxml2argvdata/numatune-distances.args
index a10dd7977a..57b33cd0d4 100644
--- a/tests/qemuxml2argvdata/numatune-distances.args
+++ b/tests/qemuxml2argvdata/numatune-distances.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
index 1d439dc8ee..cdb5fac9b0 100644
--- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
diff --git a/tests/qemuxml2argvdata/numatune-memnode.args
b/tests/qemuxml2argvdata/numatune-memnode.args
index 9b9d53f9f2..5a923fefef 100644
--- a/tests/qemuxml2argvdata/numatune-memnode.args
+++ b/tests/qemuxml2argvdata/numatune-memnode.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
diff --git a/tests/qemuxml2argvdata/numatune-memory.args
b/tests/qemuxml2argvdata/numatune-memory.args
index afec8ebca5..0be5d3e83a 100644
--- a/tests/qemuxml2argvdata/numatune-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memory.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args
b/tests/qemuxml2argvdata/pages-dimm-discard.args
index c81495c535..5d24c2d66b 100644
--- a/tests/qemuxml2argvdata/pages-dimm-discard.args
+++ b/tests/qemuxml2argvdata/pages-dimm-discard.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-fedora \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.args
b/tests/qemuxml2argvdata/pages-discard-hugepages.args
index ecf7ce1fc8..fb6dab30f9 100644
--- a/tests/qemuxml2argvdata/pages-discard-hugepages.args
+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
diff --git a/tests/qemuxml2argvdata/pages-discard.args
b/tests/qemuxml2argvdata/pages-discard.args
index 10c0c0ead0..b42f5603ca 100644
--- a/tests/qemuxml2argvdata/pages-discard.args
+++ b/tests/qemuxml2argvdata/pages-discard.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/panic-double.args
b/tests/qemuxml2argvdata/panic-double.args
index d838a248f1..19de00cc05 100644
--- a/tests/qemuxml2argvdata/panic-double.args
+++ b/tests/qemuxml2argvdata/panic-double.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/panic-no-address.args
b/tests/qemuxml2argvdata/panic-no-address.args
index 9c0d87368f..3b60a51853 100644
--- a/tests/qemuxml2argvdata/panic-no-address.args
+++ b/tests/qemuxml2argvdata/panic-no-address.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/panic.args b/tests/qemuxml2argvdata/panic.args
index b29d7a6f27..2757f594a5 100644
--- a/tests/qemuxml2argvdata/panic.args
+++ b/tests/qemuxml2argvdata/panic.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args
b/tests/qemuxml2argvdata/parallel-parport-chardev.args
index 40ef641a4c..1671c5e0af 100644
--- a/tests/qemuxml2argvdata/parallel-parport-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
index 709f321881..e1873a84a0 100644
--- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
index a8fe991bfa..b1ea53a468 100644
--- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args
b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args
index ab6e90b2f5..79c2b5e52e 100644
--- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args
b/tests/qemuxml2argvdata/pci-autoadd-addr.args
index e0353dc2f3..987bbea292 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-addr.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-fdr-br \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args
b/tests/qemuxml2argvdata/pci-autoadd-idx.args
index 7c832a1204..7a807c9489 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-idx.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-fdr-br \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args
b/tests/qemuxml2argvdata/pci-autofill-addr.args
index e32ad6e0ee..fd936acfe2 100644
--- a/tests/qemuxml2argvdata/pci-autofill-addr.args
+++ b/tests/qemuxml2argvdata/pci-autofill-addr.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-fdr-br \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
index 794e005dba..892e31cf32 100644
--- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
+++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-lots-of-disks \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-lots-of-disks/.local/share \
diff --git a/tests/qemuxml2argvdata/pci-bridge.args
b/tests/qemuxml2argvdata/pci-bridge.args
index 748c6ebcaa..11d7f30300 100644
--- a/tests/qemuxml2argvdata/pci-bridge.args
+++ b/tests/qemuxml2argvdata/pci-bridge.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-fdr-br \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args
b/tests/qemuxml2argvdata/pci-expander-bus.args
index 18a6a31f5e..ddcd52324c 100644
--- a/tests/qemuxml2argvdata/pci-expander-bus.args
+++ b/tests/qemuxml2argvdata/pci-expander-bus.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-expander-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-expander-test/.local/share \
diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args
index d6b5a33581..f735e28282 100644
--- a/tests/qemuxml2argvdata/pci-many.args
+++ b/tests/qemuxml2argvdata/pci-many.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-fdr-br \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args
b/tests/qemuxml2argvdata/pci-rom-disabled.args
index fa02fb4662..035b10b8b2 100644
--- a/tests/qemuxml2argvdata/pci-rom-disabled.args
+++ b/tests/qemuxml2argvdata/pci-rom-disabled.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args
index 4a3d963b78..f42587e61b 100644
--- a/tests/qemuxml2argvdata/pci-rom.args
+++ b/tests/qemuxml2argvdata/pci-rom.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
index f1279a9c2d..0387d04cc6 100644
--- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args
b/tests/qemuxml2argvdata/pcie-expander-bus.args
index c2b8102191..98fb24ca37 100644
--- a/tests/qemuxml2argvdata/pcie-expander-bus.args
+++ b/tests/qemuxml2argvdata/pcie-expander-bus.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-pcie-expander-bus-te \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-pcie-expander-bus-te/.local/share \
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
index cefad08474..f562ec60b2 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
index e537e9231c..9bf90e4292 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/pcie-root-port.args
b/tests/qemuxml2argvdata/pcie-root-port.args
index ce0752baa9..de5b4beab6 100644
--- a/tests/qemuxml2argvdata/pcie-root-port.args
+++ b/tests/qemuxml2argvdata/pcie-root-port.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
diff --git a/tests/qemuxml2argvdata/pcie-root.args
b/tests/qemuxml2argvdata/pcie-root.args
index cf487bc6ae..0ffce5d623 100644
--- a/tests/qemuxml2argvdata/pcie-root.args
+++ b/tests/qemuxml2argvdata/pcie-root.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
index 575a19b7b0..8bcf9d0a6d 100644
--- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
index 03eca9086a..63246d4d5f 100644
--- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args
b/tests/qemuxml2argvdata/pcihole64-q35.args
index fd9db5570b..5932159fbe 100644
--- a/tests/qemuxml2argvdata/pcihole64-q35.args
+++ b/tests/qemuxml2argvdata/pcihole64-q35.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
diff --git a/tests/qemuxml2argvdata/pcihole64.args
b/tests/qemuxml2argvdata/pcihole64.args
index 2e934d2a1c..6df57df2b9 100644
--- a/tests/qemuxml2argvdata/pcihole64.args
+++ b/tests/qemuxml2argvdata/pcihole64.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-foo \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args
b/tests/qemuxml2argvdata/pmu-feature-off.args
index c73d50b58b..5fae3e14bb 100644
--- a/tests/qemuxml2argvdata/pmu-feature-off.args
+++ b/tests/qemuxml2argvdata/pmu-feature-off.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pmu-feature.args
b/tests/qemuxml2argvdata/pmu-feature.args
index 7b6634c796..240beb51de 100644
--- a/tests/qemuxml2argvdata/pmu-feature.args
+++ b/tests/qemuxml2argvdata/pmu-feature.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/ppc-dtb.args b/tests/qemuxml2argvdata/ppc-dtb.args
index a7da6efeab..c7d0a3c87a 100644
--- a/tests/qemuxml2argvdata/ppc-dtb.args
+++ b/tests/qemuxml2argvdata/ppc-dtb.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
index b9f3384e4d..0d23710cf5 100644
--- a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
index fd70f74866..52195d423f 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
index 02b4e2d968..55d8b21c17 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller.args
b/tests/qemuxml2argvdata/ppc64-usb-controller.args
index 0755151bea..cf72090140 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/ppce500-serial.args
b/tests/qemuxml2argvdata/ppce500-serial.args
index f353acb308..da0f4121d0 100644
--- a/tests/qemuxml2argvdata/ppce500-serial.args
+++ b/tests/qemuxml2argvdata/ppce500-serial.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-basic.args
b/tests/qemuxml2argvdata/pseries-basic.args
index b5ddce9e12..675f12f359 100644
--- a/tests/qemuxml2argvdata/pseries-basic.args
+++ b/tests/qemuxml2argvdata/pseries-basic.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-console-virtio.args
b/tests/qemuxml2argvdata/pseries-console-virtio.args
index 8b7b8d1e83..6e6515b21d 100644
--- a/tests/qemuxml2argvdata/pseries-console-virtio.args
+++ b/tests/qemuxml2argvdata/pseries-console-virtio.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
index aed740fcf6..7ceb876401 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat.args
b/tests/qemuxml2argvdata/pseries-cpu-compat.args
index 42cbcd6d54..751c0d911c 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-compat.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-exact.args
b/tests/qemuxml2argvdata/pseries-cpu-exact.args
index 5bf0227a46..e9bb561c90 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-exact.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-exact.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-le.args
b/tests/qemuxml2argvdata/pseries-cpu-le.args
index 9dff2fc2e1..b118f3fcd5 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-le.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-le.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-features.args
b/tests/qemuxml2argvdata/pseries-features.args
index efcf457689..8c31da08c9 100644
--- a/tests/qemuxml2argvdata/pseries-features.args
+++ b/tests/qemuxml2argvdata/pseries-features.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-1.args
b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
index f3385eaf1c..b6b1d6a306 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-1.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-2.args
b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
index f085750fc9..90904cef1d 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-2.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-3.args
b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
index cf9890b90d..174e24ed4b 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-3.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
index b612c3c8f4..5957022258 100644
--- a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
+++ b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-many-buses-1.args
b/tests/qemuxml2argvdata/pseries-many-buses-1.args
index 46b3d28689..b64b006e6c 100644
--- a/tests/qemuxml2argvdata/pseries-many-buses-1.args
+++ b/tests/qemuxml2argvdata/pseries-many-buses-1.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-many-buses-2.args
b/tests/qemuxml2argvdata/pseries-many-buses-2.args
index 921477d864..344683654d 100644
--- a/tests/qemuxml2argvdata/pseries-many-buses-2.args
+++ b/tests/qemuxml2argvdata/pseries-many-buses-2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-many-devices.args
b/tests/qemuxml2argvdata/pseries-many-devices.args
index f9f7cdce25..292f964942 100644
--- a/tests/qemuxml2argvdata/pseries-many-devices.args
+++ b/tests/qemuxml2argvdata/pseries-many-devices.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-nvram.args
b/tests/qemuxml2argvdata/pseries-nvram.args
index e067db0594..3142312de2 100644
--- a/tests/qemuxml2argvdata/pseries-nvram.args
+++ b/tests/qemuxml2argvdata/pseries-nvram.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-panic-missing.args
b/tests/qemuxml2argvdata/pseries-panic-missing.args
index b5ddce9e12..675f12f359 100644
--- a/tests/qemuxml2argvdata/pseries-panic-missing.args
+++ b/tests/qemuxml2argvdata/pseries-panic-missing.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-panic-no-address.args
b/tests/qemuxml2argvdata/pseries-panic-no-address.args
index b5ddce9e12..675f12f359 100644
--- a/tests/qemuxml2argvdata/pseries-panic-no-address.args
+++ b/tests/qemuxml2argvdata/pseries-panic-no-address.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-phb-default-missing.args
b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
index 5f1f1ac3b5..5b240e9479 100644
--- a/tests/qemuxml2argvdata/pseries-phb-default-missing.args
+++ b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.args
b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
index b58ccfd22d..88e8a7b132 100644
--- a/tests/qemuxml2argvdata/pseries-phb-numa-node.args
+++ b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-phb-simple.args
b/tests/qemuxml2argvdata/pseries-phb-simple.args
index 5f1f1ac3b5..5b240e9479 100644
--- a/tests/qemuxml2argvdata/pseries-phb-simple.args
+++ b/tests/qemuxml2argvdata/pseries-phb-simple.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-serial-native.args
b/tests/qemuxml2argvdata/pseries-serial-native.args
index cedee6d56b..196da9d68c 100644
--- a/tests/qemuxml2argvdata/pseries-serial-native.args
+++ b/tests/qemuxml2argvdata/pseries-serial-native.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-serial-pci.args
b/tests/qemuxml2argvdata/pseries-serial-pci.args
index 6061d7eb16..69f622edfc 100644
--- a/tests/qemuxml2argvdata/pseries-serial-pci.args
+++ b/tests/qemuxml2argvdata/pseries-serial-pci.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-serial-usb.args
b/tests/qemuxml2argvdata/pseries-serial-usb.args
index fe78c51b8f..d2245be783 100644
--- a/tests/qemuxml2argvdata/pseries-serial-usb.args
+++ b/tests/qemuxml2argvdata/pseries-serial-usb.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-usb-default.args
b/tests/qemuxml2argvdata/pseries-usb-default.args
index d88f20f020..f4f87cc722 100644
--- a/tests/qemuxml2argvdata/pseries-usb-default.args
+++ b/tests/qemuxml2argvdata/pseries-usb-default.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-usb-kbd.args
b/tests/qemuxml2argvdata/pseries-usb-kbd.args
index 58f9d24052..e95452beb7 100644
--- a/tests/qemuxml2argvdata/pseries-usb-kbd.args
+++ b/tests/qemuxml2argvdata/pseries-usb-kbd.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-usb-multi.args
b/tests/qemuxml2argvdata/pseries-usb-multi.args
index d36d1528de..8ddff92a05 100644
--- a/tests/qemuxml2argvdata/pseries-usb-multi.args
+++ b/tests/qemuxml2argvdata/pseries-usb-multi.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
index d63979a388..09eaceb5c0 100644
--- a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
+++ b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pseries-vio.args
b/tests/qemuxml2argvdata/pseries-vio.args
index 39383a524b..1c278f29cd 100644
--- a/tests/qemuxml2argvdata/pseries-vio.args
+++ b/tests/qemuxml2argvdata/pseries-vio.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.args
b/tests/qemuxml2argvdata/pv-spinlock-disabled.args
index e1f829ac4f..9a47107fdb 100644
--- a/tests/qemuxml2argvdata/pv-spinlock-disabled.args
+++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.args
b/tests/qemuxml2argvdata/pv-spinlock-enabled.args
index d64e90501c..8bb709bd58 100644
--- a/tests/qemuxml2argvdata/pv-spinlock-enabled.args
+++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/q35-acpi-nouefi.args
b/tests/qemuxml2argvdata/q35-acpi-nouefi.args
index 8f8f9171a8..8e2c98f122 100644
--- a/tests/qemuxml2argvdata/q35-acpi-nouefi.args
+++ b/tests/qemuxml2argvdata/q35-acpi-nouefi.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.args
b/tests/qemuxml2argvdata/q35-acpi-uefi.args
index b71f9cad0f..970b5823c5 100644
--- a/tests/qemuxml2argvdata/q35-acpi-uefi.args
+++ b/tests/qemuxml2argvdata/q35-acpi-uefi.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.args
b/tests/qemuxml2argvdata/q35-default-devices-only.args
index 9d64da93cd..f68780bd0b 100644
--- a/tests/qemuxml2argvdata/q35-default-devices-only.args
+++ b/tests/qemuxml2argvdata/q35-default-devices-only.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
diff --git a/tests/qemuxml2argvdata/q35-multifunction.args
b/tests/qemuxml2argvdata/q35-multifunction.args
index d688f69931..439cfc746d 100644
--- a/tests/qemuxml2argvdata/q35-multifunction.args
+++ b/tests/qemuxml2argvdata/q35-multifunction.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
diff --git a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
index 6955a663d9..d93e3dcb95 100644
--- a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
+++ b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args
b/tests/qemuxml2argvdata/q35-pci-force-address.args
index 0ff49ee42f..823359d5a1 100644
--- a/tests/qemuxml2argvdata/q35-pci-force-address.args
+++ b/tests/qemuxml2argvdata/q35-pci-force-address.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.args
b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
index 0b73ae95da..a9b558f658 100644
--- a/tests/qemuxml2argvdata/q35-pcie-autoadd.args
+++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
diff --git a/tests/qemuxml2argvdata/q35-pcie.args b/tests/qemuxml2argvdata/q35-pcie.args
index 45557acf06..74a734c25b 100644
--- a/tests/qemuxml2argvdata/q35-pcie.args
+++ b/tests/qemuxml2argvdata/q35-pcie.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
index d5981fda90..b60e081612 100644
--- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35/.local/share \
diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args
b/tests/qemuxml2argvdata/q35-pm-disable.args
index 593cbdf91d..f842868848 100644
--- a/tests/qemuxml2argvdata/q35-pm-disable.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35/.local/share \
diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args
b/tests/qemuxml2argvdata/q35-usb2-multi.args
index 94616232f9..5b5244e253 100644
--- a/tests/qemuxml2argvdata/q35-usb2-multi.args
+++ b/tests/qemuxml2argvdata/q35-usb2-multi.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args
b/tests/qemuxml2argvdata/q35-usb2-reorder.args
index 81ca776a90..614305028e 100644
--- a/tests/qemuxml2argvdata/q35-usb2-reorder.args
+++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args
index a20c2097d9..291bfdd4ea 100644
--- a/tests/qemuxml2argvdata/q35-usb2.args
+++ b/tests/qemuxml2argvdata/q35-usb2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
index f556951a64..113871a8ed 100644
--- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-virt-manager-basic \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-virt-manager-basic/.local/share \
diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.args
b/tests/qemuxml2argvdata/q35-virtio-pci.args
index 8d7e756850..3b372810ac 100644
--- a/tests/qemuxml2argvdata/q35-virtio-pci.args
+++ b/tests/qemuxml2argvdata/q35-virtio-pci.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args
index a5712fe543..37de30ad74 100644
--- a/tests/qemuxml2argvdata/q35.args
+++ b/tests/qemuxml2argvdata/q35.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args
b/tests/qemuxml2argvdata/qemu-ns-alt.args
index e81a719b14..b215618998 100644
--- a/tests/qemuxml2argvdata/qemu-ns-alt.args
+++ b/tests/qemuxml2argvdata/qemu-ns-alt.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
index fa4852598e..e2dba686a9 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
index fa4852598e..e2dba686a9 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args
b/tests/qemuxml2argvdata/qemu-ns-commandline.args
index fa4852598e..e2dba686a9 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
index fa4852598e..e2dba686a9 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
index fa4852598e..e2dba686a9 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
index fa4852598e..e2dba686a9 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args
b/tests/qemuxml2argvdata/qemu-ns-no-env.args
index e2d8e54bc3..677f4a7d55 100644
--- a/tests/qemuxml2argvdata/qemu-ns-no-env.args
+++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/qemu-ns.args b/tests/qemuxml2argvdata/qemu-ns.args
index e81a719b14..b215618998 100644
--- a/tests/qemuxml2argvdata/qemu-ns.args
+++ b/tests/qemuxml2argvdata/qemu-ns.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
index 0a05742673..eaeb97e2d5 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
index e3894c5b78..e4637f6c17 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args
b/tests/qemuxml2argvdata/restore-v2-fd.args
index 724c3e450f..837088cfc6 100644
--- a/tests/qemuxml2argvdata/restore-v2-fd.args
+++ b/tests/qemuxml2argvdata/restore-v2-fd.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/restore-v2.args
b/tests/qemuxml2argvdata/restore-v2.args
index 549b00dd69..7cf35f4463 100644
--- a/tests/qemuxml2argvdata/restore-v2.args
+++ b/tests/qemuxml2argvdata/restore-v2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
index 90201dd9e4..7b03aef933 100644
--- a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
+++ b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.args
b/tests/qemuxml2argvdata/riscv64-virt-pci.args
index ed0073de82..15b01d031c 100644
--- a/tests/qemuxml2argvdata/riscv64-virt-pci.args
+++ b/tests/qemuxml2argvdata/riscv64-virt-pci.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-riscv64 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-riscv64/.local/share \
diff --git a/tests/qemuxml2argvdata/riscv64-virt.args
b/tests/qemuxml2argvdata/riscv64-virt.args
index f4a135c9ca..b4ebc2c7f1 100644
--- a/tests/qemuxml2argvdata/riscv64-virt.args
+++ b/tests/qemuxml2argvdata/riscv64-virt.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-riscv64 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-riscv64/.local/share \
diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args
b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args
index 5bd8374640..cef56280b4 100644
--- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args
+++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args
b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args
index 5bd8374640..cef56280b4 100644
--- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args
+++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
diff --git a/tests/qemuxml2argvdata/s390-panic-missing.args
b/tests/qemuxml2argvdata/s390-panic-missing.args
index d858359b96..577190e87d 100644
--- a/tests/qemuxml2argvdata/s390-panic-missing.args
+++ b/tests/qemuxml2argvdata/s390-panic-missing.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/s390-panic-no-address.args
b/tests/qemuxml2argvdata/s390-panic-no-address.args
index 80dd94c25c..6c1574cdd7 100644
--- a/tests/qemuxml2argvdata/s390-panic-no-address.args
+++ b/tests/qemuxml2argvdata/s390-panic-no-address.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/s390-serial-2.args
b/tests/qemuxml2argvdata/s390-serial-2.args
index ff1c20a689..4198dfec50 100644
--- a/tests/qemuxml2argvdata/s390-serial-2.args
+++ b/tests/qemuxml2argvdata/s390-serial-2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/s390-serial-console.args
b/tests/qemuxml2argvdata/s390-serial-console.args
index dab58366b1..4fbf296ac9 100644
--- a/tests/qemuxml2argvdata/s390-serial-console.args
+++ b/tests/qemuxml2argvdata/s390-serial-console.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/s390-serial.args
b/tests/qemuxml2argvdata/s390-serial.args
index dab58366b1..4fbf296ac9 100644
--- a/tests/qemuxml2argvdata/s390-serial.args
+++ b/tests/qemuxml2argvdata/s390-serial.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
index fab5656659..848273ac1b 100644
--- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
+++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args
b/tests/qemuxml2argvdata/seclabel-dac-none.args
index 21d141cb7c..e2fc6335b9 100644
--- a/tests/qemuxml2argvdata/seclabel-dac-none.args
+++ b/tests/qemuxml2argvdata/seclabel-dac-none.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
index 21d141cb7c..e2fc6335b9 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
index 21d141cb7c..e2fc6335b9 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
index a62a5bf9fc..179bac90c8 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
index 21d141cb7c..e2fc6335b9 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args
b/tests/qemuxml2argvdata/seclabel-dynamic.args
index 21d141cb7c..e2fc6335b9 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/seclabel-none.args
b/tests/qemuxml2argvdata/seclabel-none.args
index 21d141cb7c..e2fc6335b9 100644
--- a/tests/qemuxml2argvdata/seclabel-none.args
+++ b/tests/qemuxml2argvdata/seclabel-none.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
index 21d141cb7c..e2fc6335b9 100644
--- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args
b/tests/qemuxml2argvdata/seclabel-static-relabel.args
index 21d141cb7c..e2fc6335b9 100644
--- a/tests/qemuxml2argvdata/seclabel-static-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/seclabel-static.args
b/tests/qemuxml2argvdata/seclabel-static.args
index 21d141cb7c..e2fc6335b9 100644
--- a/tests/qemuxml2argvdata/seclabel-static.args
+++ b/tests/qemuxml2argvdata/seclabel-static.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
index 4e87ac355b..a0a09a0035 100644
--- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args
b/tests/qemuxml2argvdata/serial-dev-chardev.args
index 0e790be825..3f617ecd4b 100644
--- a/tests/qemuxml2argvdata/serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args
b/tests/qemuxml2argvdata/serial-file-chardev.args
index 46fed6d4a4..d043743754 100644
--- a/tests/qemuxml2argvdata/serial-file-chardev.args
+++ b/tests/qemuxml2argvdata/serial-file-chardev.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/serial-file-log.args
b/tests/qemuxml2argvdata/serial-file-log.args
index c414a7357e..3c72b28f04 100644
--- a/tests/qemuxml2argvdata/serial-file-log.args
+++ b/tests/qemuxml2argvdata/serial-file-log.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args
b/tests/qemuxml2argvdata/serial-many-chardev.args
index e54f929ee6..4abf043f57 100644
--- a/tests/qemuxml2argvdata/serial-many-chardev.args
+++ b/tests/qemuxml2argvdata/serial-many-chardev.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args
b/tests/qemuxml2argvdata/serial-pty-chardev.args
index 857dad6e27..97c858f04e 100644
--- a/tests/qemuxml2argvdata/serial-pty-chardev.args
+++ b/tests/qemuxml2argvdata/serial-pty-chardev.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.args
b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
index 21d141cb7c..e2fc6335b9 100644
--- a/tests/qemuxml2argvdata/serial-spiceport-nospice.args
+++ b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/serial-spiceport.args
b/tests/qemuxml2argvdata/serial-spiceport.args
index f535da15d2..e455dd234d 100644
--- a/tests/qemuxml2argvdata/serial-spiceport.args
+++ b/tests/qemuxml2argvdata/serial-spiceport.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-chardev.args
index 5829fc740c..0ef43efd76 100644
--- a/tests/qemuxml2argvdata/serial-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
index 13d1cbce98..4e34a95e89 100644
--- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
index ab9f83c64f..7d6a0e4d98 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
index 1f1bbd91b6..ecc9101f0d 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
index 1f1bbd91b6..ecc9101f0d 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
index 77f5872e63..58d661d86e 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args
b/tests/qemuxml2argvdata/serial-udp-chardev.args
index 991e5021f9..2c26efa02f 100644
--- a/tests/qemuxml2argvdata/serial-udp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-udp-chardev.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args
b/tests/qemuxml2argvdata/serial-unix-chardev.args
index 994ae224dd..bdbe82c1bf 100644
--- a/tests/qemuxml2argvdata/serial-unix-chardev.args
+++ b/tests/qemuxml2argvdata/serial-unix-chardev.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
index 43b0f29125..881a0d417a 100644
--- a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args
b/tests/qemuxml2argvdata/serial-vc-chardev.args
index 8a7b71c4b2..907f0f2ab3 100644
--- a/tests/qemuxml2argvdata/serial-vc-chardev.args
+++ b/tests/qemuxml2argvdata/serial-vc-chardev.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
index b5cf175580..1fe24c2ccc 100644
--- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
+++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/shmem.args b/tests/qemuxml2argvdata/shmem.args
index 156e1e7576..94c20ac5cd 100644
--- a/tests/qemuxml2argvdata/shmem.args
+++ b/tests/qemuxml2argvdata/shmem.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/smartcard-controller.args
b/tests/qemuxml2argvdata/smartcard-controller.args
index 1fd9a81979..30c0b110c1 100644
--- a/tests/qemuxml2argvdata/smartcard-controller.args
+++ b/tests/qemuxml2argvdata/smartcard-controller.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
index c6c95e3d92..d38ec8f1e2 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args
b/tests/qemuxml2argvdata/smartcard-host-certificates.args
index c109eaf852..4519debf8f 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/smartcard-host.args
b/tests/qemuxml2argvdata/smartcard-host.args
index 1fd9a81979..30c0b110c1 100644
--- a/tests/qemuxml2argvdata/smartcard-host.args
+++ b/tests/qemuxml2argvdata/smartcard-host.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
index 463cd6d750..3a1e180af9 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
index ba3cb7c8ce..469a65482a 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
index af5b134ca7..7eb54497ef 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args
b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args
index 1a621a5473..6cc68fb481 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args
index 6cc18760c3..384cd01e93 100644
--- a/tests/qemuxml2argvdata/smbios.args
+++ b/tests/qemuxml2argvdata/smbios.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args
index 23fb0d12b2..aeee956d47 100644
--- a/tests/qemuxml2argvdata/smp.args
+++ b/tests/qemuxml2argvdata/smp.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/sound-device.args
b/tests/qemuxml2argvdata/sound-device.args
index cd588736c8..00ae28af4c 100644
--- a/tests/qemuxml2argvdata/sound-device.args
+++ b/tests/qemuxml2argvdata/sound-device.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/sound.args b/tests/qemuxml2argvdata/sound.args
index 4e8a5982a4..26798bf1f8 100644
--- a/tests/qemuxml2argvdata/sound.args
+++ b/tests/qemuxml2argvdata/sound.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args
b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args
index 3f68cfa1b8..356ede2367 100644
--- a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-TPM-VM \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-TPM-VM/.local/share \
diff --git a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args
b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args
index 3f68cfa1b8..356ede2367 100644
--- a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-TPM-VM \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-TPM-VM/.local/share \
diff --git a/tests/qemuxml2argvdata/tpm-passthrough-crb.args
b/tests/qemuxml2argvdata/tpm-passthrough-crb.args
index 7de372d9a7..161b5b4c70 100644
--- a/tests/qemuxml2argvdata/tpm-passthrough-crb.args
+++ b/tests/qemuxml2argvdata/tpm-passthrough-crb.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-TPM-VM \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-TPM-VM/.local/share \
diff --git a/tests/qemuxml2argvdata/tpm-passthrough.args
b/tests/qemuxml2argvdata/tpm-passthrough.args
index c6c8a52b73..56dad7a147 100644
--- a/tests/qemuxml2argvdata/tpm-passthrough.args
+++ b/tests/qemuxml2argvdata/tpm-passthrough.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-TPM-VM \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-TPM-VM/.local/share \
diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
index f812e0c5b6..4b69bdddbb 100644
--- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args
b/tests/qemuxml2argvdata/usb-controller-default-q35.args
index f33195ac0b..7227b2b9ff 100644
--- a/tests/qemuxml2argvdata/usb-controller-default-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
index 25b2464973..6ac2fbc2f2 100644
--- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-q35-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
index da09509b58..f93dc7e1c8 100644
--- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args
b/tests/qemuxml2argvdata/usb-controller-xhci.args
index 6146f6441f..ccd76bf520 100644
--- a/tests/qemuxml2argvdata/usb-controller-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-xhci.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-controller.args
b/tests/qemuxml2argvdata/usb-controller.args
index ba3bc53353..0d04284ffd 100644
--- a/tests/qemuxml2argvdata/usb-controller.args
+++ b/tests/qemuxml2argvdata/usb-controller.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
index 737ede4ae1..22352b4ebd 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args
b/tests/qemuxml2argvdata/usb-hub-autoadd.args
index 912f9ce991..2c5c1e39c4 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args
index 1462d37020..0454b5c857 100644
--- a/tests/qemuxml2argvdata/usb-hub.args
+++ b/tests/qemuxml2argvdata/usb-hub.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
index bb20ac17b4..2c98e39c76 100644
--- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args
b/tests/qemuxml2argvdata/usb-ich9-companion.args
index e5fd181895..807e67728f 100644
--- a/tests/qemuxml2argvdata/usb-ich9-companion.args
+++ b/tests/qemuxml2argvdata/usb-ich9-companion.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
index 93d0cc1e5b..b0b733287d 100644
--- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
+++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args
b/tests/qemuxml2argvdata/usb-long-port-path.args
index 5bbf856e76..d6444c7f83 100644
--- a/tests/qemuxml2argvdata/usb-long-port-path.args
+++ b/tests/qemuxml2argvdata/usb-long-port-path.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.args
index e1c4016bb2..ef808070f6 100644
--- a/tests/qemuxml2argvdata/usb-none.args
+++ b/tests/qemuxml2argvdata/usb-none.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args
b/tests/qemuxml2argvdata/usb-piix3-controller.args
index 540f028eae..5380cb0f92 100644
--- a/tests/qemuxml2argvdata/usb-piix3-controller.args
+++ b/tests/qemuxml2argvdata/usb-piix3-controller.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args
b/tests/qemuxml2argvdata/usb-port-autoassign.args
index 90b39f355a..ee39736852 100644
--- a/tests/qemuxml2argvdata/usb-port-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-port-autoassign.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-port-missing.args
b/tests/qemuxml2argvdata/usb-port-missing.args
index f32d30cd8d..9b48283cb9 100644
--- a/tests/qemuxml2argvdata/usb-port-missing.args
+++ b/tests/qemuxml2argvdata/usb-port-missing.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-ports.args
b/tests/qemuxml2argvdata/usb-ports.args
index 8c18029bbc..3161c4dc5d 100644
--- a/tests/qemuxml2argvdata/usb-ports.args
+++ b/tests/qemuxml2argvdata/usb-ports.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args
b/tests/qemuxml2argvdata/usb-redir-boot.args
index 6625e19a1f..bd5565d519 100644
--- a/tests/qemuxml2argvdata/usb-redir-boot.args
+++ b/tests/qemuxml2argvdata/usb-redir-boot.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args
b/tests/qemuxml2argvdata/usb-redir-filter-version.args
index ef6a2291ba..d409c0bdcc 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter-version.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args
b/tests/qemuxml2argvdata/usb-redir-filter.args
index f85433d6f8..1646f12671 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
index ff0765c592..a8a90a81cb 100644
--- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args
b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args
index a4cbe7412c..fe57b0142c 100644
--- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-redir.args
b/tests/qemuxml2argvdata/usb-redir.args
index 0081a11424..737010bf0f 100644
--- a/tests/qemuxml2argvdata/usb-redir.args
+++ b/tests/qemuxml2argvdata/usb-redir.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
index 64600fc2d3..8bef4c7c8b 100644
--- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/usb1-usb2.args
b/tests/qemuxml2argvdata/usb1-usb2.args
index b5d3532a42..d541c8c293 100644
--- a/tests/qemuxml2argvdata/usb1-usb2.args
+++ b/tests/qemuxml2argvdata/usb1-usb2.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/user-aliases-usb.args
b/tests/qemuxml2argvdata/user-aliases-usb.args
index c1d661e02d..343c30503e 100644
--- a/tests/qemuxml2argvdata/user-aliases-usb.args
+++ b/tests/qemuxml2argvdata/user-aliases-usb.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-gentoo \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-gentoo/.local/share \
diff --git a/tests/qemuxml2argvdata/user-aliases.args
b/tests/qemuxml2argvdata/user-aliases.args
index 25ad216551..2d3fb1d389 100644
--- a/tests/qemuxml2argvdata/user-aliases.args
+++ b/tests/qemuxml2argvdata/user-aliases.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-gentoo \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-gentoo/.local/share \
diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.args
b/tests/qemuxml2argvdata/vcpu-placement-static.args
index 04e3b5b7dc..96bd8254f9 100644
--- a/tests/qemuxml2argvdata/vcpu-placement-static.args
+++ b/tests/qemuxml2argvdata/vcpu-placement-static.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-dummy2 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-dummy2/.local/share \
diff --git a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args
b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args
index 819a8aac9f..4b1c6aac7e 100644
--- a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
index 1da06de021..244c7013a6 100644
--- a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
index 23daf944d4..cba81a844e 100644
--- a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args
b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args
index d04d97cb50..6701aaab12 100644
--- a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
index 5ac34ddcd1..9887a35b13 100644
--- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
+++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-none-device.args
b/tests/qemuxml2argvdata/video-none-device.args
index 8cc3a8ec42..0025a7a0b6 100644
--- a/tests/qemuxml2argvdata/video-none-device.args
+++ b/tests/qemuxml2argvdata/video-none-device.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
index f78916b11e..a2bcce073c 100644
--- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args
b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args
index a5110bb979..a64cfe0102 100644
--- a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-qxl-device.args
b/tests/qemuxml2argvdata/video-qxl-device.args
index 59ed52764a..48d174a529 100644
--- a/tests/qemuxml2argvdata/video-qxl-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-device.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args
b/tests/qemuxml2argvdata/video-qxl-heads.args
index 7492755825..925d3204f7 100644
--- a/tests/qemuxml2argvdata/video-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-qxl-heads.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-qxl-nodevice.args
b/tests/qemuxml2argvdata/video-qxl-nodevice.args
index 1b55dc430d..ec4f9c7492 100644
--- a/tests/qemuxml2argvdata/video-qxl-nodevice.args
+++ b/tests/qemuxml2argvdata/video-qxl-nodevice.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args
b/tests/qemuxml2argvdata/video-qxl-noheads.args
index b8079bc2b1..1b60ccb6bb 100644
--- a/tests/qemuxml2argvdata/video-qxl-noheads.args
+++ b/tests/qemuxml2argvdata/video-qxl-noheads.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
index a94a0e34d2..3a3703b9a6 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args
b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args
index 3c79e640c5..d8026a0836 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args
b/tests/qemuxml2argvdata/video-qxl-sec-device.args
index 5ad0275b98..4a5aaca23e 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
index b6f57875c0..531c752b94 100644
--- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-vga-device.args
b/tests/qemuxml2argvdata/video-vga-device.args
index ace4908456..d384f2b9d5 100644
--- a/tests/qemuxml2argvdata/video-vga-device.args
+++ b/tests/qemuxml2argvdata/video-vga-device.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-vga-nodevice.args
b/tests/qemuxml2argvdata/video-vga-nodevice.args
index 05c3444945..4691492505 100644
--- a/tests/qemuxml2argvdata/video-vga-nodevice.args
+++ b/tests/qemuxml2argvdata/video-vga-nodevice.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
index 5c0c650cf7..343268b046 100644
--- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
index 6648339019..b14aa4db92 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
index a87ffac642..fe07454d40 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
index bc376b0b60..89a18f840e 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
index 32259c79a9..31104f11f5 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
index dedec18452..196cf52997 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
index b3847604da..1a3ff3adb8 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args
b/tests/qemuxml2argvdata/video-virtio-vga.args
index ae9caf9cf0..2a66d77c50 100644
--- a/tests/qemuxml2argvdata/video-virtio-vga.args
+++ b/tests/qemuxml2argvdata/video-virtio-vga.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args
b/tests/qemuxml2argvdata/virtio-input-passthrough.args
index 39db66c844..2db4121a2b 100644
--- a/tests/qemuxml2argvdata/virtio-input-passthrough.args
+++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/virtio-input.args
b/tests/qemuxml2argvdata/virtio-input.args
index 93d0ac77ff..db9f741ee8 100644
--- a/tests/qemuxml2argvdata/virtio-input.args
+++ b/tests/qemuxml2argvdata/virtio-input.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/virtio-lun.args
b/tests/qemuxml2argvdata/virtio-lun.args
index 0803905ec0..b88d8c02b3 100644
--- a/tests/qemuxml2argvdata/virtio-lun.args
+++ b/tests/qemuxml2argvdata/virtio-lun.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-test \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
index da8318d745..588f2e6d2a 100644
--- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
+++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
index cac21b8deb..03da24b0e4 100644
--- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/virtio-options.args
b/tests/qemuxml2argvdata/virtio-options.args
index 66e6184cd3..e3707bc7b4 100644
--- a/tests/qemuxml2argvdata/virtio-options.args
+++ b/tests/qemuxml2argvdata/virtio-options.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.args
b/tests/qemuxml2argvdata/virtio-rng-ccw.args
index b51890190e..d2b4d55487 100644
--- a/tests/qemuxml2argvdata/virtio-rng-ccw.args
+++ b/tests/qemuxml2argvdata/virtio-rng-ccw.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args
b/tests/qemuxml2argvdata/virtio-rng-default.args
index 3236a7ec86..8cd66cdcf8 100644
--- a/tests/qemuxml2argvdata/virtio-rng-default.args
+++ b/tests/qemuxml2argvdata/virtio-rng-default.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
index 0263b1191b..842d18de6c 100644
--- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args
b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args
index c68d1d3a67..42719f870a 100644
--- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args
b/tests/qemuxml2argvdata/virtio-rng-egd.args
index bc2bf60891..8e9f750fb0 100644
--- a/tests/qemuxml2argvdata/virtio-rng-egd.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args
b/tests/qemuxml2argvdata/virtio-rng-multiple.args
index 9181227e1e..98e7dba4ea 100644
--- a/tests/qemuxml2argvdata/virtio-rng-multiple.args
+++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args
b/tests/qemuxml2argvdata/virtio-rng-random.args
index 76a1da9a61..70d78e897b 100644
--- a/tests/qemuxml2argvdata/virtio-rng-random.args
+++ b/tests/qemuxml2argvdata/virtio-rng-random.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
index 954dd7053f..99d00c027c 100644
--- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
+++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
index 15aa8018fe..0060b77ee4 100644
--- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args
b/tests/qemuxml2argvdata/vmcoreinfo.args
index b1a1148a7c..5616d7dcc4 100644
--- a/tests/qemuxml2argvdata/vmcoreinfo.args
+++ b/tests/qemuxml2argvdata/vmcoreinfo.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/watchdog-device.args
b/tests/qemuxml2argvdata/watchdog-device.args
index ce9671857d..6b67cea70a 100644
--- a/tests/qemuxml2argvdata/watchdog-device.args
+++ b/tests/qemuxml2argvdata/watchdog-device.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/watchdog-diag288.args
b/tests/qemuxml2argvdata/watchdog-diag288.args
index 3191b64d3b..39d7edcc62 100644
--- a/tests/qemuxml2argvdata/watchdog-diag288.args
+++ b/tests/qemuxml2argvdata/watchdog-diag288.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/watchdog-dump.args
b/tests/qemuxml2argvdata/watchdog-dump.args
index 845afe982f..8d6131e754 100644
--- a/tests/qemuxml2argvdata/watchdog-dump.args
+++ b/tests/qemuxml2argvdata/watchdog-dump.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.args
b/tests/qemuxml2argvdata/watchdog-injectnmi.args
index d7865cb46d..40eb647774 100644
--- a/tests/qemuxml2argvdata/watchdog-injectnmi.args
+++ b/tests/qemuxml2argvdata/watchdog-injectnmi.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/watchdog.args
index 59964f8db5..d4fb6ab596 100644
--- a/tests/qemuxml2argvdata/watchdog.args
+++ b/tests/qemuxml2argvdata/watchdog.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
index 4fa139b64d..1fcb4af1fa 100644
--- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-kvm \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-kvm/.local/share \
diff --git a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args
b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args
index 6ea3fde68d..08a990dbd5 100644
--- a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
index ba0909462d..459e3229a6 100644
--- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
@@ -1,6 +1,6 @@
LC_ALL=C \
PATH=/bin \
-HOME=/home/test \
+HOME=/tmp/lib/domain--1-guest \
USER=test \
LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
--
2.20.1
10:05 a.m.
On Wed, Mar 06, 2019 at 03:41:16PM +0100, Erik Skultety wrote:
So, according to this report [1], Mesa enabled on-disk cache for its
shaders
which it tries to create either under XDG_CACHE_HOME/mesa_shader_cache or under
HOME/.cache/mesa_shader_cache. Since libvirt doesn't set XDGs and HOME is only
passed iff the QEMU process isn't run with SUID, Mesa will default to the home
directory specified in /etc/passwd.
Because of this, Mesa will fail to create the cache and QEMU refuses to start
the VM (interestingly enough, Intel reports the problem too, but Mesa disables
the cache and the VM starts). This series proposes usage of XDG variables to
fix the problem by pointing XDG variables to hypervisor specific directory
under libvirt's libDir. Additionally, HOME is also enforced for all VM
processes and points to the base hypervisor libDir directory.
To illustrate this further:
system qemu:
HOME=/var/lib/libvirt/qemu/domain-5-f-live \
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain-5-f-live/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain-5-f-live/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain-5-f-live/.config \
session qemu:
HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live \
XDG_DATA_HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live/.local/share \
XDG_CACHE_HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live/.cache \
XDG_CONFIG_HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live/.config \
For the bug report IIUC we should only need to set XDG_CACHE_HOME
as that's the one which needs to be writable and which SELinux quite
rightly denies. It is also safe to redefine this because cache data
is liable to be purged at any time, so apps must expect to see an
empty cache directory.
I'm very wary about setting HOME or XDG_DATA_HOME or XDG_CONFIG_HOME
as I think that is pretty likely to break valid usage.
For example, when QEMU is configured to use pulseaudio as its audio
backend, I believe this will want to read config files in normal
$HOME and/or $XDG_{CONFIG|DATA}_HOME.
Similary if using the GTK frontend these dirs are needed to load
the toolkit preferences such as theme.
I expect there are other relevant config files that would be
affected too.
From a security POV these files should not be a problem since they
would all be read-only from QEMU's POV.
[1] https://bugzilla.redhat.com/show_bug.cgi?id=1659484
Erik Skultety (3):
qemu: command: Introduce virCommandAddEnvXDG helper
qemu: Introduce qemuCommandEnvSetup helper
qemu: command: Override HOME variable for QEMU processes
src/libvirt_private.syms | 1 +
src/qemu/qemu_command.c | 26 ++++++++++++++++++-
src/qemu/qemu_command.h | 3 +++
src/util/vircommand.c | 21 +++++++++++++++
src/util/vircommand.h | 2 ++
.../aarch64-aavmf-virtio-mmio.args | 5 +++-
tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 5 +++-
.../aarch64-cpu-passthrough.args | 5 +++-
tests/qemuxml2argvdata/aarch64-gic-host.args | 5 +++-
.../aarch64-gic-none-tcg.args | 5 +++-
tests/qemuxml2argvdata/aarch64-gic-v2.args | 5 +++-
tests/qemuxml2argvdata/aarch64-gic-v3.args | 5 +++-
.../aarch64-kvm-32-on-64.args | 5 +++-
.../aarch64-noacpi-nouefi.args | 5 +++-
.../qemuxml2argvdata/aarch64-noacpi-uefi.args | 5 +++-
.../qemuxml2argvdata/aarch64-pci-serial.args | 5 +++-
.../aarch64-traditional-pci.args | 5 +++-
.../aarch64-usb-controller-nec-xhci.args | 5 +++-
.../aarch64-usb-controller-qemu-xhci.args | 5 +++-
.../aarch64-video-default.args | 5 +++-
.../aarch64-video-virtio-gpu-pci.args | 5 +++-
.../aarch64-virt-2.6-virtio-pci-default.args | 5 +++-
.../aarch64-virt-default-nic.args | 5 +++-
.../aarch64-virt-headless.aarch64-latest.args | 5 +++-
.../qemuxml2argvdata/aarch64-virt-virtio.args | 5 +++-
.../aarch64-virtio-pci-default.args | 5 +++-
.../aarch64-virtio-pci-manual-addresses.args | 5 +++-
tests/qemuxml2argvdata/acpi-table.args | 5 +++-
.../arm-vexpressa9-basic.args | 5 +++-
.../arm-vexpressa9-nodevs.args | 5 +++-
.../arm-vexpressa9-virtio.args | 5 +++-
tests/qemuxml2argvdata/arm-virt-virtio.args | 5 +++-
tests/qemuxml2argvdata/autoindex.args | 5 +++-
.../qemuxml2argvdata/balloon-ccw-deflate.args | 5 +++-
.../qemuxml2argvdata/balloon-device-auto.args | 5 +++-
.../balloon-device-deflate-off.args | 5 +++-
.../balloon-device-deflate.args | 5 +++-
.../balloon-device-period.args | 5 +++-
tests/qemuxml2argvdata/balloon-device.args | 5 +++-
.../balloon-mmio-deflate.args | 5 +++-
tests/qemuxml2argvdata/bios-nvram-secure.args | 5 +++-
tests/qemuxml2argvdata/bios-nvram.args | 5 +++-
tests/qemuxml2argvdata/bios.args | 5 +++-
.../blkdeviotune-group-num.args | 5 +++-
.../blkdeviotune-max-length.args | 5 +++-
tests/qemuxml2argvdata/blkdeviotune-max.args | 5 +++-
tests/qemuxml2argvdata/blkiotune-device.args | 5 +++-
tests/qemuxml2argvdata/blkiotune.args | 5 +++-
tests/qemuxml2argvdata/boot-cdrom.args | 5 +++-
tests/qemuxml2argvdata/boot-complex.args | 5 +++-
tests/qemuxml2argvdata/boot-floppy-q35.args | 5 +++-
tests/qemuxml2argvdata/boot-floppy.args | 5 +++-
.../boot-menu-disable-drive.args | 5 +++-
tests/qemuxml2argvdata/boot-menu-disable.args | 5 +++-
.../boot-menu-enable-with-timeout.args | 5 +++-
tests/qemuxml2argvdata/boot-menu-enable.args | 5 +++-
tests/qemuxml2argvdata/boot-multi.args | 5 +++-
tests/qemuxml2argvdata/boot-network.args | 5 +++-
tests/qemuxml2argvdata/boot-order.args | 5 +++-
tests/qemuxml2argvdata/boot-strict.args | 5 +++-
tests/qemuxml2argvdata/channel-guestfwd.args | 5 +++-
tests/qemuxml2argvdata/channel-spicevmc.args | 5 +++-
.../channel-unix-guestfwd.x86_64-2.5.0.args | 5 +++-
.../channel-unix-guestfwd.x86_64-latest.args | 5 +++-
.../qemuxml2argvdata/channel-virtio-auto.args | 5 +++-
.../channel-virtio-autoadd.args | 5 +++-
.../channel-virtio-autoassign.args | 5 +++-
.../channel-virtio-default.args | 5 +++-
.../channel-virtio-state.args | 5 +++-
.../qemuxml2argvdata/channel-virtio-unix.args | 5 +++-
tests/qemuxml2argvdata/channel-virtio.args | 5 +++-
tests/qemuxml2argvdata/chardev-reconnect.args | 5 +++-
tests/qemuxml2argvdata/clock-catchup.args | 5 +++-
tests/qemuxml2argvdata/clock-france.args | 5 +++-
tests/qemuxml2argvdata/clock-hpet-off.args | 5 +++-
.../clock-localtime-basis-localtime.args | 5 +++-
tests/qemuxml2argvdata/clock-localtime.args | 5 +++-
.../clock-timer-hyperv-rtc.args | 5 +++-
tests/qemuxml2argvdata/clock-utc.args | 5 +++-
tests/qemuxml2argvdata/clock-variable.args | 5 +++-
.../qemuxml2argvdata/console-compat-auto.args | 5 +++-
.../console-compat-chardev.args | 5 +++-
tests/qemuxml2argvdata/console-compat.args | 5 +++-
tests/qemuxml2argvdata/console-sclp.args | 5 +++-
.../qemuxml2argvdata/console-virtio-ccw.args | 5 +++-
.../qemuxml2argvdata/console-virtio-many.args | 5 +++-
.../qemuxml2argvdata/console-virtio-s390.args | 5 +++-
.../console-virtio-unix.x86_64-2.5.0.args | 5 +++-
.../console-virtio-unix.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/console-virtio.args | 5 +++-
tests/qemuxml2argvdata/controller-order.args | 5 +++-
.../controller-virtio-scsi.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 5 +++-
tests/qemuxml2argvdata/cpu-Haswell.args | 5 +++-
tests/qemuxml2argvdata/cpu-Haswell2.args | 5 +++-
tests/qemuxml2argvdata/cpu-Haswell3.args | 5 +++-
tests/qemuxml2argvdata/cpu-cache-disable.args | 5 +++-
.../qemuxml2argvdata/cpu-cache-disable2.args | 5 +++-
.../qemuxml2argvdata/cpu-cache-disable3.args | 5 +++-
.../cpu-cache-emulate-l3.args | 5 +++-
.../cpu-cache-passthrough.args | 5 +++-
.../cpu-cache-passthrough2.args | 5 +++-
.../cpu-check-default-none.args | 5 +++-
.../cpu-check-default-none2.args | 5 +++-
.../cpu-check-default-partial.args | 5 +++-
.../cpu-check-default-partial2.args | 5 +++-
tests/qemuxml2argvdata/cpu-check-none.args | 5 +++-
tests/qemuxml2argvdata/cpu-eoi-disabled.args | 5 +++-
tests/qemuxml2argvdata/cpu-eoi-enabled.args | 5 +++-
tests/qemuxml2argvdata/cpu-exact1.args | 5 +++-
.../cpu-exact2-nofallback.args | 5 +++-
tests/qemuxml2argvdata/cpu-exact2.args | 5 +++-
tests/qemuxml2argvdata/cpu-fallback.args | 5 +++-
tests/qemuxml2argvdata/cpu-host-kvmclock.args | 5 +++-
.../qemuxml2argvdata/cpu-host-model-cmt.args | 5 +++-
.../cpu-host-model-fallback.args | 5 +++-
.../cpu-host-model-vendor.args | 5 +++-
tests/qemuxml2argvdata/cpu-host-model.args | 5 +++-
.../cpu-host-passthrough-features.args | 5 +++-
.../cpu-host-passthrough.args | 5 +++-
.../qemuxml2argvdata/cpu-hotplug-startup.args | 5 +++-
tests/qemuxml2argvdata/cpu-kvmclock.args | 5 +++-
tests/qemuxml2argvdata/cpu-minimum1.args | 5 +++-
tests/qemuxml2argvdata/cpu-minimum2.args | 5 +++-
tests/qemuxml2argvdata/cpu-numa-disjoint.args | 5 +++-
.../qemuxml2argvdata/cpu-numa-memshared.args | 5 +++-
.../cpu-numa-no-memory-element.args | 5 +++-
tests/qemuxml2argvdata/cpu-numa1.args | 5 +++-
tests/qemuxml2argvdata/cpu-numa2.args | 5 +++-
tests/qemuxml2argvdata/cpu-s390-features.args | 5 +++-
tests/qemuxml2argvdata/cpu-s390-zEC12.args | 5 +++-
tests/qemuxml2argvdata/cpu-strict1.args | 5 +++-
tests/qemuxml2argvdata/cpu-topology1.args | 5 +++-
tests/qemuxml2argvdata/cpu-topology2.args | 5 +++-
tests/qemuxml2argvdata/cpu-topology3.args | 5 +++-
tests/qemuxml2argvdata/cpu-tsc-frequency.args | 5 +++-
tests/qemuxml2argvdata/cputune-numatune.args | 5 +++-
.../qemuxml2argvdata/cputune-zero-shares.args | 5 +++-
tests/qemuxml2argvdata/cputune.args | 5 +++-
tests/qemuxml2argvdata/debug-threads.args | 5 +++-
.../default-kvm-host-arch.args | 5 +++-
.../default-qemu-host-arch.args | 5 +++-
tests/qemuxml2argvdata/disk-aio.args | 5 +++-
.../disk-aio.x86_64-2.12.0.args | 5 +++-
.../disk-aio.x86_64-latest.args | 5 +++-
...-backing-chains-noindex.x86_64-2.12.0.args | 5 +++-
...-backing-chains-noindex.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-blockio.args | 5 +++-
tests/qemuxml2argvdata/disk-boot-cdrom.args | 5 +++-
tests/qemuxml2argvdata/disk-boot-disk.args | 5 +++-
.../disk-cache.x86_64-1.5.3.args | 5 +++-
.../disk-cache.x86_64-2.12.0.args | 5 +++-
.../disk-cache.x86_64-2.6.0.args | 5 +++-
.../disk-cache.x86_64-2.7.0.args | 5 +++-
.../disk-cache.x86_64-latest.args | 5 +++-
.../disk-cdrom-bus-other.x86_64-latest.args | 5 +++-
.../qemuxml2argvdata/disk-cdrom-network.args | 5 +++-
.../disk-cdrom-network.x86_64-2.12.0.args | 5 +++-
.../disk-cdrom-network.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-cdrom-tray.args | 5 +++-
.../disk-cdrom-tray.x86_64-2.12.0.args | 5 +++-
.../disk-cdrom-tray.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-cdrom.args | 5 +++-
.../disk-cdrom.x86_64-2.12.0.args | 5 +++-
.../disk-cdrom.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-copy_on_read.args | 5 +++-
.../disk-copy_on_read.x86_64-2.12.0.args | 5 +++-
.../disk-copy_on_read.x86_64-latest.args | 5 +++-
.../qemuxml2argvdata/disk-detect-zeroes.args | 5 +++-
.../disk-detect-zeroes.x86_64-2.12.0.args | 5 +++-
.../disk-detect-zeroes.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-discard.args | 5 +++-
tests/qemuxml2argvdata/disk-error-policy.args | 5 +++-
.../disk-error-policy.x86_64-2.12.0.args | 5 +++-
.../disk-error-policy.x86_64-latest.args | 5 +++-
.../disk-floppy-q35-2_11.x86_64-2.12.0.args | 5 +++-
.../disk-floppy-q35-2_11.x86_64-latest.args | 5 +++-
.../disk-floppy-q35-2_9.x86_64-2.12.0.args | 5 +++-
.../disk-floppy-q35-2_9.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-floppy-tray.args | 5 +++-
tests/qemuxml2argvdata/disk-floppy.args | 5 +++-
.../disk-floppy.x86_64-2.12.0.args | 5 +++-
.../disk-floppy.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-fmt-qcow.args | 5 +++-
tests/qemuxml2argvdata/disk-geometry.args | 5 +++-
...sk-hostdev-scsi-virtio-iscsi-auth-AES.args | 5 +++-
tests/qemuxml2argvdata/disk-ide-split.args | 5 +++-
tests/qemuxml2argvdata/disk-ide-wwn.args | 5 +++-
tests/qemuxml2argvdata/disk-ioeventfd.args | 5 +++-
tests/qemuxml2argvdata/disk-iscsi.args | 5 +++-
.../disk-network-gluster.args | 5 +++-
.../disk-network-gluster.x86_64-2.12.0.args | 5 +++-
.../disk-network-gluster.x86_64-latest.args | 5 +++-
.../disk-network-iscsi-modern.args | 5 +++-
.../qemuxml2argvdata/disk-network-iscsi.args | 5 +++-
.../disk-network-iscsi.x86_64-2.12.0.args | 5 +++-
.../disk-network-iscsi.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-network-nbd.args | 5 +++-
.../disk-network-nbd.x86_64-2.12.0.args | 5 +++-
.../disk-network-nbd.x86_64-latest.args | 5 +++-
.../disk-network-rbd.x86_64-2.12.0.args | 5 +++-
.../disk-network-rbd.x86_64-2.5.0.args | 5 +++-
.../disk-network-rbd.x86_64-latest.args | 5 +++-
.../disk-network-sheepdog.args | 5 +++-
.../disk-network-sheepdog.x86_64-2.12.0.args | 5 +++-
.../disk-network-sheepdog.x86_64-latest.args | 5 +++-
.../disk-network-source-auth.args | 5 +++-
...isk-network-source-auth.x86_64-2.12.0.args | 5 +++-
...isk-network-source-auth.x86_64-latest.args | 5 +++-
.../disk-network-tlsx509.args | 5 +++-
.../disk-network-tlsx509.x86_64-2.12.0.args | 5 +++-
.../disk-network-tlsx509.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-network-vxhs.args | 5 +++-
tests/qemuxml2argvdata/disk-no-boot.args | 5 +++-
tests/qemuxml2argvdata/disk-order.args | 5 +++-
.../qemuxml2argvdata/disk-readonly-disk.args | 5 +++-
.../disk-readonly-disk.x86_64-2.12.0.args | 5 +++-
.../disk-readonly-disk.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-sata-device.args | 5 +++-
.../disk-scsi-device-auto.x86_64-1.5.3.args | 5 +++-
.../disk-scsi-device-auto.x86_64-latest.args | 5 +++-
.../disk-scsi-disk-split.args | 5 +++-
.../qemuxml2argvdata/disk-scsi-disk-vpd.args | 5 +++-
.../qemuxml2argvdata/disk-scsi-disk-wwn.args | 5 +++-
.../disk-scsi-lun-passthrough.args | 5 +++-
.../disk-scsi.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-serial.args | 5 +++-
.../disk-shared.x86_64-2.12.0.args | 5 +++-
.../disk-shared.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-snapshot.args | 5 +++-
.../disk-source-pool-mode.args | 5 +++-
tests/qemuxml2argvdata/disk-source-pool.args | 5 +++-
.../disk-usb-device-removable.args | 5 +++-
tests/qemuxml2argvdata/disk-usb-device.args | 5 +++-
.../disk-virtio-ccw-many.args | 5 +++-
tests/qemuxml2argvdata/disk-virtio-ccw.args | 5 +++-
.../qemuxml2argvdata/disk-virtio-queues.args | 5 +++-
.../disk-virtio-s390-zpci.args | 5 +++-
tests/qemuxml2argvdata/disk-virtio-s390.args | 5 +++-
...irtio-scsi-reservations.x86_64-2.12.0.args | 5 +++-
...irtio-scsi-reservations.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/disk-virtio.args | 5 +++-
.../encrypted-disk-usage.args | 5 +++-
tests/qemuxml2argvdata/encrypted-disk.args | 5 +++-
tests/qemuxml2argvdata/eoi-disabled.args | 5 +++-
tests/qemuxml2argvdata/eoi-enabled.args | 5 +++-
tests/qemuxml2argvdata/event_idx.args | 5 +++-
.../fd-memory-no-numa-topology.args | 5 +++-
.../fd-memory-numa-topology.args | 5 +++-
.../fd-memory-numa-topology2.args | 5 +++-
.../fd-memory-numa-topology3.args | 5 +++-
tests/qemuxml2argvdata/fips-enabled.args | 5 +++-
tests/qemuxml2argvdata/floppy-drive-fat.args | 5 +++-
.../floppy-drive-fat.x86_64-2.12.0.args | 5 +++-
.../floppy-drive-fat.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/fs9p-ccw.args | 5 +++-
tests/qemuxml2argvdata/fs9p.args | 5 +++-
.../genid-auto.x86_64-latest.args | 5 +++-
.../qemuxml2argvdata/genid.x86_64-latest.args | 5 +++-
...egl-headless-rendernode.x86_64-latest.args | 5 +++-
.../graphics-egl-headless.args | 5 +++-
.../graphics-egl-headless.x86_64-latest.args | 5 +++-
.../graphics-sdl-fullscreen.args | 5 +++-
tests/qemuxml2argvdata/graphics-sdl.args | 5 +++-
.../graphics-spice-agent-file-xfer.args | 5 +++-
.../graphics-spice-agentmouse.args | 5 +++-
.../graphics-spice-auto-socket-cfg.args | 5 +++-
.../graphics-spice-auto-socket.args | 5 +++-
.../graphics-spice-compression.args | 5 +++-
.../graphics-spice-egl-headless.args | 5 +++-
...pice-gl-auto-rendernode.x86_64-latest.args | 5 +++-
.../graphics-spice-no-args.args | 5 +++-
.../graphics-spice-qxl-vga.args | 5 +++-
.../qemuxml2argvdata/graphics-spice-sasl.args | 5 +++-
.../graphics-spice-socket.args | 5 +++-
.../graphics-spice-timeout.args | 5 +++-
.../graphics-spice-usb-redir.args | 5 +++-
tests/qemuxml2argvdata/graphics-spice.args | 5 +++-
.../graphics-vnc-auto-socket-cfg.args | 5 +++-
.../graphics-vnc-auto-socket.args | 5 +++-
.../graphics-vnc-egl-headless.args | 5 +++-
.../graphics-vnc-no-listen-attr.args | 5 +++-
tests/qemuxml2argvdata/graphics-vnc-none.args | 5 +++-
.../qemuxml2argvdata/graphics-vnc-policy.args | 5 +++-
.../graphics-vnc-remove-generated-socket.args | 5 +++-
tests/qemuxml2argvdata/graphics-vnc-sasl.args | 5 +++-
.../graphics-vnc-socket-new-cmdline.args | 5 +++-
.../qemuxml2argvdata/graphics-vnc-socket.args | 5 +++-
...graphics-vnc-tls-secret.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/graphics-vnc-tls.args | 5 +++-
.../graphics-vnc-tls.x86_64-2.4.0.args | 5 +++-
.../graphics-vnc-tls.x86_64-latest.args | 5 +++-
.../graphics-vnc-websocket.args | 5 +++-
tests/qemuxml2argvdata/graphics-vnc.args | 5 +++-
...play-spice-egl-headless.x86_64-latest.args | 5 +++-
...ev-display-spice-opengl.x86_64-latest.args | 5 +++-
...isplay-vnc-egl-headless.x86_64-latest.args | 5 +++-
...ostdev-mdev-display-vnc.x86_64-latest.args | 5 +++-
.../hostdev-mdev-precreated.args | 5 +++-
.../hostdev-pci-address-device.args | 5 +++-
.../qemuxml2argvdata/hostdev-pci-address.args | 5 +++-
.../hostdev-scsi-lsi-iscsi-auth.args | 5 +++-
.../hostdev-scsi-lsi-iscsi.args | 5 +++-
tests/qemuxml2argvdata/hostdev-scsi-lsi.args | 5 +++-
.../hostdev-scsi-readonly.args | 5 +++-
.../hostdev-scsi-vhost-scsi-ccw.args | 5 +++-
.../hostdev-scsi-vhost-scsi-pci.args | 5 +++-
.../hostdev-scsi-vhost-scsi-pcie.args | 5 +++-
.../hostdev-scsi-virtio-iscsi-auth.args | 5 +++-
.../hostdev-scsi-virtio-iscsi.args | 5 +++-
.../hostdev-scsi-virtio-scsi.args | 5 +++-
.../hostdev-subsys-mdev-vfio-ccw.args | 5 +++-
.../hostdev-usb-address-device-boot.args | 5 +++-
.../hostdev-usb-address-device.args | 5 +++-
.../qemuxml2argvdata/hostdev-usb-address.args | 5 +++-
.../hostdev-vfio-multidomain.args | 5 +++-
.../hostdev-vfio-zpci-autogenerate.args | 5 +++-
.../hostdev-vfio-zpci-boundaries.args | 5 +++-
.../hostdev-vfio-zpci-multidomain-many.args | 5 +++-
tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 5 +++-
tests/qemuxml2argvdata/hostdev-vfio.args | 5 +++-
tests/qemuxml2argvdata/hotplug-base.args | 5 +++-
.../hugepages-default-2M.args | 5 +++-
.../hugepages-default-system-size.args | 5 +++-
tests/qemuxml2argvdata/hugepages-default.args | 5 +++-
.../qemuxml2argvdata/hugepages-memaccess.args | 5 +++-
.../hugepages-memaccess2.args | 5 +++-
tests/qemuxml2argvdata/hugepages-nodeset.args | 5 +++-
.../hugepages-numa-default-2M.args | 5 +++-
.../hugepages-numa-default-dimm.args | 5 +++-
.../hugepages-numa-default.args | 5 +++-
.../hugepages-numa-nodeset-part.args | 5 +++-
.../hugepages-numa-nodeset.args | 5 +++-
.../hugepages-nvdimm.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/hugepages-shared.args | 5 +++-
tests/qemuxml2argvdata/hyperv-off.args | 5 +++-
tests/qemuxml2argvdata/hyperv-panic.args | 5 +++-
tests/qemuxml2argvdata/hyperv.args | 5 +++-
.../qemuxml2argvdata/input-usbmouse-addr.args | 5 +++-
tests/qemuxml2argvdata/input-usbmouse.args | 5 +++-
tests/qemuxml2argvdata/input-usbtablet.args | 5 +++-
tests/qemuxml2argvdata/input-virtio-ccw.args | 5 +++-
.../intel-iommu-caching-mode.args | 5 +++-
.../intel-iommu-device-iotlb.args | 5 +++-
tests/qemuxml2argvdata/intel-iommu-eim.args | 5 +++-
.../qemuxml2argvdata/intel-iommu-machine.args | 5 +++-
tests/qemuxml2argvdata/intel-iommu.args | 5 +++-
.../iothreads-disk-virtio-ccw.args | 5 +++-
tests/qemuxml2argvdata/iothreads-disk.args | 5 +++-
.../iothreads-ids-partial.args | 5 +++-
tests/qemuxml2argvdata/iothreads-ids.args | 5 +++-
...othreads-virtio-scsi-ccw.s390x-latest.args | 5 +++-
...threads-virtio-scsi-pci.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/iothreads.args | 5 +++-
tests/qemuxml2argvdata/kvm-features-off.args | 5 +++-
tests/qemuxml2argvdata/kvm-features.args | 5 +++-
tests/qemuxml2argvdata/kvm-pit-delay.args | 5 +++-
tests/qemuxml2argvdata/kvm-pit-discard.args | 5 +++-
.../kvmclock+eoi-disabled.args | 5 +++-
tests/qemuxml2argvdata/kvmclock.args | 5 +++-
.../launch-security-sev.x86_64-2.12.0.args | 5 +++-
.../luks-disks-source-qcow2.args | 5 +++-
tests/qemuxml2argvdata/luks-disks-source.args | 5 +++-
tests/qemuxml2argvdata/luks-disks.args | 5 +++-
.../mach-virt-console-virtio.args | 5 +++-
.../mach-virt-serial-native.args | 5 +++-
.../mach-virt-serial-pci.args | 5 +++-
.../mach-virt-serial-usb.args | 5 +++-
.../machine-aeskeywrap-off-cap.args | 5 +++-
.../machine-aeskeywrap-off-caps.args | 5 +++-
.../machine-aeskeywrap-on-cap.args | 5 +++-
.../machine-aeskeywrap-on-caps.args | 5 +++-
tests/qemuxml2argvdata/machine-aliases1.args | 5 +++-
tests/qemuxml2argvdata/machine-aliases2.args | 5 +++-
tests/qemuxml2argvdata/machine-core-off.args | 5 +++-
tests/qemuxml2argvdata/machine-core-on.args | 5 +++-
.../machine-deakeywrap-off-cap.args | 5 +++-
.../machine-deakeywrap-off-caps.args | 5 +++-
.../machine-deakeywrap-on-cap.args | 5 +++-
.../machine-deakeywrap-on-caps.args | 5 +++-
.../machine-keywrap-none-caps.args | 5 +++-
.../machine-keywrap-none.args | 5 +++-
...ine-loadparm-multiple-disks-nets-s390.args | 5 +++-
.../machine-loadparm-net-s390.args | 5 +++-
.../machine-loadparm-s390.args | 5 +++-
tests/qemuxml2argvdata/machine-smm-opt.args | 5 +++-
.../qemuxml2argvdata/machine-vmport-opt.args | 5 +++-
tests/qemuxml2argvdata/master-key.args | 5 +++-
.../memfd-memory-numa.x86_64-latest.args | 5 +++-
.../memory-hotplug-dimm-addr.args | 5 +++-
.../qemuxml2argvdata/memory-hotplug-dimm.args | 5 +++-
...y-hotplug-nvdimm-access.x86_64-latest.args | 5 +++-
...ry-hotplug-nvdimm-align.x86_64-latest.args | 5 +++-
...ry-hotplug-nvdimm-label.x86_64-latest.args | 5 +++-
...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 5 +++-
...hotplug-nvdimm-readonly.x86_64-latest.args | 5 +++-
.../memory-hotplug-nvdimm.x86_64-latest.args | 5 +++-
.../memory-hotplug-ppc64-nonuma.args | 5 +++-
tests/qemuxml2argvdata/memory-hotplug.args | 5 +++-
tests/qemuxml2argvdata/memtune-unlimited.args | 5 +++-
tests/qemuxml2argvdata/memtune.args | 5 +++-
.../migrate-numa-unaligned.args | 5 +++-
tests/qemuxml2argvdata/migrate.args | 5 +++-
.../minimal-msg-timestamp.args | 5 +++-
tests/qemuxml2argvdata/minimal-sandbox.args | 5 +++-
tests/qemuxml2argvdata/minimal.args | 5 +++-
tests/qemuxml2argvdata/misc-acpi.args | 5 +++-
tests/qemuxml2argvdata/misc-disable-s3.args | 5 +++-
.../misc-disable-suspends.args | 5 +++-
tests/qemuxml2argvdata/misc-enable-s4.args | 5 +++-
tests/qemuxml2argvdata/misc-no-reboot.args | 5 +++-
tests/qemuxml2argvdata/misc-uuid.args | 5 +++-
tests/qemuxml2argvdata/mlock-off.args | 5 +++-
tests/qemuxml2argvdata/mlock-on.args | 5 +++-
tests/qemuxml2argvdata/mlock-unsupported.args | 5 +++-
tests/qemuxml2argvdata/monitor-json.args | 5 +++-
.../multifunction-pci-device.args | 5 +++-
tests/qemuxml2argvdata/name-escape.args | 5 +++-
tests/qemuxml2argvdata/net-client.args | 5 +++-
tests/qemuxml2argvdata/net-eth-hostip.args | 5 +++-
tests/qemuxml2argvdata/net-eth-ifname.args | 5 +++-
tests/qemuxml2argvdata/net-eth-names.args | 5 +++-
tests/qemuxml2argvdata/net-eth.args | 5 +++-
.../net-hostdev-bootorder.args | 5 +++-
.../net-hostdev-multidomain.args | 5 +++-
.../net-hostdev-vfio-multidomain.args | 5 +++-
tests/qemuxml2argvdata/net-hostdev-vfio.args | 5 +++-
tests/qemuxml2argvdata/net-hostdev.args | 5 +++-
tests/qemuxml2argvdata/net-mcast.args | 5 +++-
tests/qemuxml2argvdata/net-server.args | 5 +++-
tests/qemuxml2argvdata/net-udp.args | 5 +++-
tests/qemuxml2argvdata/net-user-addr.args | 5 +++-
tests/qemuxml2argvdata/net-user.args | 5 +++-
.../net-vhostuser-multiq.args | 5 +++-
tests/qemuxml2argvdata/net-vhostuser.args | 5 +++-
.../net-vhostuser.x86_64-2.5.0.args | 5 +++-
.../net-vhostuser.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/net-virtio-ccw.args | 5 +++-
tests/qemuxml2argvdata/net-virtio-device.args | 5 +++-
.../net-virtio-disable-offloads.args | 5 +++-
tests/qemuxml2argvdata/net-virtio-netdev.args | 5 +++-
.../net-virtio-rxtxqueuesize.args | 5 +++-
tests/qemuxml2argvdata/net-virtio-s390.args | 5 +++-
tests/qemuxml2argvdata/net-virtio.args | 5 +++-
tests/qemuxml2argvdata/nosharepages.args | 5 +++-
.../numad-auto-memory-vcpu-cpuset.args | 5 +++-
...o-memory-vcpu-no-cpuset-and-placement.args | 5 +++-
.../numad-auto-vcpu-static-numatune.args | 5 +++-
.../numad-static-memory-auto-vcpu.args | 5 +++-
tests/qemuxml2argvdata/numad.args | 5 +++-
.../numatune-auto-nodeset-invalid.args | 5 +++-
.../numatune-auto-prefer.args | 5 +++-
.../qemuxml2argvdata/numatune-distances.args | 5 +++-
.../numatune-memnode-no-memory.args | 5 +++-
tests/qemuxml2argvdata/numatune-memnode.args | 5 +++-
tests/qemuxml2argvdata/numatune-memory.args | 5 +++-
.../qemuxml2argvdata/pages-dimm-discard.args | 5 +++-
.../pages-discard-hugepages.args | 5 +++-
tests/qemuxml2argvdata/pages-discard.args | 5 +++-
tests/qemuxml2argvdata/panic-double.args | 5 +++-
tests/qemuxml2argvdata/panic-no-address.args | 5 +++-
tests/qemuxml2argvdata/panic.args | 5 +++-
.../parallel-parport-chardev.args | 5 +++-
.../parallel-tcp-chardev.args | 5 +++-
.../parallel-unix-chardev.x86_64-2.5.0.args | 5 +++-
.../parallel-unix-chardev.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/pci-autoadd-addr.args | 5 +++-
tests/qemuxml2argvdata/pci-autoadd-idx.args | 5 +++-
tests/qemuxml2argvdata/pci-autofill-addr.args | 5 +++-
.../pci-bridge-many-disks.args | 5 +++-
tests/qemuxml2argvdata/pci-bridge.args | 5 +++-
tests/qemuxml2argvdata/pci-expander-bus.args | 5 +++-
tests/qemuxml2argvdata/pci-many.args | 5 +++-
tests/qemuxml2argvdata/pci-rom-disabled.args | 5 +++-
tests/qemuxml2argvdata/pci-rom.args | 5 +++-
.../pci-serial-dev-chardev.args | 5 +++-
tests/qemuxml2argvdata/pcie-expander-bus.args | 5 +++-
.../pcie-root-port-model-generic.args | 5 +++-
.../pcie-root-port-model-ioh3420.args | 5 +++-
tests/qemuxml2argvdata/pcie-root-port.args | 5 +++-
tests/qemuxml2argvdata/pcie-root.args | 5 +++-
.../pcie-switch-downstream-port.args | 5 +++-
.../pcie-switch-upstream-port.args | 5 +++-
tests/qemuxml2argvdata/pcihole64-q35.args | 5 +++-
tests/qemuxml2argvdata/pcihole64.args | 5 +++-
tests/qemuxml2argvdata/pmu-feature-off.args | 5 +++-
tests/qemuxml2argvdata/pmu-feature.args | 5 +++-
tests/qemuxml2argvdata/ppc-dtb.args | 5 +++-
.../ppc64-pseries-headless.ppc64-latest.args | 5 +++-
.../ppc64-usb-controller-legacy.args | 5 +++-
.../ppc64-usb-controller-qemu-xhci.args | 5 +++-
.../ppc64-usb-controller.args | 5 +++-
tests/qemuxml2argvdata/ppce500-serial.args | 5 +++-
tests/qemuxml2argvdata/pseries-basic.args | 5 +++-
.../pseries-console-virtio.args | 5 +++-
.../pseries-cpu-compat-power9.args | 5 +++-
.../qemuxml2argvdata/pseries-cpu-compat.args | 5 +++-
tests/qemuxml2argvdata/pseries-cpu-exact.args | 5 +++-
tests/qemuxml2argvdata/pseries-cpu-le.args | 5 +++-
tests/qemuxml2argvdata/pseries-features.args | 5 +++-
.../qemuxml2argvdata/pseries-hostdevs-1.args | 5 +++-
.../qemuxml2argvdata/pseries-hostdevs-2.args | 5 +++-
.../qemuxml2argvdata/pseries-hostdevs-3.args | 5 +++-
.../pseries-machine-max-cpu-compat.args | 5 +++-
.../pseries-many-buses-1.args | 5 +++-
.../pseries-many-buses-2.args | 5 +++-
.../pseries-many-devices.args | 5 +++-
tests/qemuxml2argvdata/pseries-nvram.args | 5 +++-
.../pseries-panic-missing.args | 5 +++-
.../pseries-panic-no-address.args | 5 +++-
.../pseries-phb-default-missing.args | 5 +++-
.../pseries-phb-numa-node.args | 5 +++-
.../qemuxml2argvdata/pseries-phb-simple.args | 5 +++-
.../pseries-serial-native.args | 5 +++-
.../qemuxml2argvdata/pseries-serial-pci.args | 5 +++-
.../qemuxml2argvdata/pseries-serial-usb.args | 5 +++-
.../qemuxml2argvdata/pseries-usb-default.args | 5 +++-
tests/qemuxml2argvdata/pseries-usb-kbd.args | 5 +++-
tests/qemuxml2argvdata/pseries-usb-multi.args | 5 +++-
.../pseries-vio-user-assigned.args | 5 +++-
tests/qemuxml2argvdata/pseries-vio.args | 5 +++-
.../pv-spinlock-disabled.args | 5 +++-
.../qemuxml2argvdata/pv-spinlock-enabled.args | 5 +++-
tests/qemuxml2argvdata/q35-acpi-nouefi.args | 5 +++-
tests/qemuxml2argvdata/q35-acpi-uefi.args | 5 +++-
.../q35-default-devices-only.args | 5 +++-
tests/qemuxml2argvdata/q35-multifunction.args | 5 +++-
tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 5 +++-
.../q35-pci-force-address.args | 5 +++-
tests/qemuxml2argvdata/q35-pcie-autoadd.args | 5 +++-
tests/qemuxml2argvdata/q35-pcie.args | 5 +++-
.../q35-pm-disable-fallback.args | 5 +++-
tests/qemuxml2argvdata/q35-pm-disable.args | 5 +++-
tests/qemuxml2argvdata/q35-usb2-multi.args | 5 +++-
tests/qemuxml2argvdata/q35-usb2-reorder.args | 5 +++-
tests/qemuxml2argvdata/q35-usb2.args | 5 +++-
.../q35-virt-manager-basic.args | 5 +++-
tests/qemuxml2argvdata/q35-virtio-pci.args | 5 +++-
tests/qemuxml2argvdata/q35.args | 5 +++-
tests/qemuxml2argvdata/qemu-ns-alt.args | 5 +++-
.../qemu-ns-commandline-ns0.args | 5 +++-
.../qemu-ns-commandline-ns1.args | 5 +++-
.../qemuxml2argvdata/qemu-ns-commandline.args | 5 +++-
.../qemu-ns-domain-commandline-ns0.args | 5 +++-
.../qemu-ns-domain-commandline.args | 5 +++-
.../qemuxml2argvdata/qemu-ns-domain-ns0.args | 5 +++-
tests/qemuxml2argvdata/qemu-ns-no-env.args | 5 +++-
tests/qemuxml2argvdata/qemu-ns.args | 5 +++-
.../reboot-timeout-disabled.args | 5 +++-
.../reboot-timeout-enabled.args | 5 +++-
tests/qemuxml2argvdata/restore-v2-fd.args | 5 +++-
tests/qemuxml2argvdata/restore-v2.args | 5 +++-
.../riscv64-virt-headless.riscv64-latest.args | 5 +++-
tests/qemuxml2argvdata/riscv64-virt-pci.args | 5 +++-
tests/qemuxml2argvdata/riscv64-virt.args | 5 +++-
.../s390-allow-bogus-usb-controller.args | 5 +++-
.../s390-allow-bogus-usb-none.args | 5 +++-
.../qemuxml2argvdata/s390-panic-missing.args | 5 +++-
.../s390-panic-no-address.args | 5 +++-
tests/qemuxml2argvdata/s390-serial-2.args | 5 +++-
.../qemuxml2argvdata/s390-serial-console.args | 5 +++-
tests/qemuxml2argvdata/s390-serial.args | 5 +++-
.../s390x-ccw-headless.s390x-latest.args | 5 +++-
tests/qemuxml2argvdata/seclabel-dac-none.args | 5 +++-
.../seclabel-dynamic-baselabel.args | 5 +++-
.../seclabel-dynamic-labelskip.args | 5 +++-
.../seclabel-dynamic-override.args | 5 +++-
.../seclabel-dynamic-relabel.args | 5 +++-
tests/qemuxml2argvdata/seclabel-dynamic.args | 5 +++-
tests/qemuxml2argvdata/seclabel-none.args | 5 +++-
.../seclabel-static-labelskip.args | 5 +++-
.../seclabel-static-relabel.args | 5 +++-
tests/qemuxml2argvdata/seclabel-static.args | 5 +++-
.../serial-dev-chardev-iobase.args | 5 +++-
.../qemuxml2argvdata/serial-dev-chardev.args | 5 +++-
.../qemuxml2argvdata/serial-file-chardev.args | 5 +++-
tests/qemuxml2argvdata/serial-file-log.args | 5 +++-
.../qemuxml2argvdata/serial-many-chardev.args | 5 +++-
.../qemuxml2argvdata/serial-pty-chardev.args | 5 +++-
.../serial-spiceport-nospice.args | 5 +++-
tests/qemuxml2argvdata/serial-spiceport.args | 5 +++-
.../qemuxml2argvdata/serial-tcp-chardev.args | 5 +++-
.../serial-tcp-telnet-chardev.args | 5 +++-
.../serial-tcp-tlsx509-chardev-notls.args | 5 +++-
.../serial-tcp-tlsx509-chardev-verify.args | 5 +++-
.../serial-tcp-tlsx509-chardev.args | 5 +++-
.../serial-tcp-tlsx509-secret-chardev.args | 5 +++-
.../qemuxml2argvdata/serial-udp-chardev.args | 5 +++-
.../qemuxml2argvdata/serial-unix-chardev.args | 5 +++-
.../serial-unix-chardev.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/serial-vc-chardev.args | 5 +++-
.../shmem-plain-doorbell.args | 5 +++-
tests/qemuxml2argvdata/shmem.args | 5 +++-
.../smartcard-controller.args | 5 +++-
.../smartcard-host-certificates-database.args | 5 +++-
.../smartcard-host-certificates.args | 5 +++-
tests/qemuxml2argvdata/smartcard-host.args | 5 +++-
.../smartcard-passthrough-spicevmc.args | 5 +++-
.../smartcard-passthrough-tcp.args | 5 +++-
...artcard-passthrough-unix.x86_64-2.5.0.args | 5 +++-
...rtcard-passthrough-unix.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/smbios.args | 5 +++-
tests/qemuxml2argvdata/smp.args | 5 +++-
tests/qemuxml2argvdata/sound-device.args | 5 +++-
tests/qemuxml2argvdata/sound.args | 5 +++-
.../tpm-emulator-tpm2.x86_64-latest.args | 5 +++-
.../tpm-emulator.x86_64-latest.args | 5 +++-
.../qemuxml2argvdata/tpm-passthrough-crb.args | 5 +++-
tests/qemuxml2argvdata/tpm-passthrough.args | 5 +++-
.../tseg-explicit-size.x86_64-latest.args | 5 +++-
.../usb-controller-default-q35.args | 5 +++-
.../usb-controller-explicit-q35.args | 5 +++-
.../usb-controller-qemu-xhci.args | 5 +++-
.../qemuxml2argvdata/usb-controller-xhci.args | 5 +++-
tests/qemuxml2argvdata/usb-controller.args | 5 +++-
.../usb-hub-autoadd-deluxe.args | 5 +++-
tests/qemuxml2argvdata/usb-hub-autoadd.args | 5 +++-
tests/qemuxml2argvdata/usb-hub.args | 5 +++-
.../qemuxml2argvdata/usb-ich9-autoassign.args | 5 +++-
.../qemuxml2argvdata/usb-ich9-companion.args | 5 +++-
.../qemuxml2argvdata/usb-ich9-ehci-addr.args | 5 +++-
.../qemuxml2argvdata/usb-long-port-path.args | 5 +++-
tests/qemuxml2argvdata/usb-none.args | 5 +++-
.../usb-piix3-controller.args | 5 +++-
.../qemuxml2argvdata/usb-port-autoassign.args | 5 +++-
tests/qemuxml2argvdata/usb-port-missing.args | 5 +++-
tests/qemuxml2argvdata/usb-ports.args | 5 +++-
tests/qemuxml2argvdata/usb-redir-boot.args | 5 +++-
.../usb-redir-filter-version.args | 5 +++-
tests/qemuxml2argvdata/usb-redir-filter.args | 5 +++-
.../usb-redir-unix.x86_64-2.5.0.args | 5 +++-
.../usb-redir-unix.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/usb-redir.args | 5 +++-
.../qemuxml2argvdata/usb-xhci-autoassign.args | 5 +++-
tests/qemuxml2argvdata/usb1-usb2.args | 5 +++-
tests/qemuxml2argvdata/user-aliases-usb.args | 5 +++-
tests/qemuxml2argvdata/user-aliases.args | 5 +++-
.../vcpu-placement-static.args | 5 +++-
.../vhost-vsock-auto.x86_64-latest.args | 5 +++-
.../vhost-vsock-ccw-auto.s390x-latest.args | 5 +++-
.../vhost-vsock-ccw.s390x-latest.args | 5 +++-
.../vhost-vsock.x86_64-latest.args | 5 +++-
.../video-device-pciaddr-default.args | 5 +++-
tests/qemuxml2argvdata/video-none-device.args | 5 +++-
.../video-qxl-device-vgamem.args | 5 +++-
...video-qxl-device-vram64.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/video-qxl-device.args | 5 +++-
tests/qemuxml2argvdata/video-qxl-heads.args | 5 +++-
.../qemuxml2argvdata/video-qxl-nodevice.args | 5 +++-
tests/qemuxml2argvdata/video-qxl-noheads.args | 5 +++-
.../video-qxl-sec-device-vgamem.args | 5 +++-
...o-qxl-sec-device-vram64.x86_64-latest.args | 5 +++-
.../video-qxl-sec-device.args | 5 +++-
.../video-vga-device-vgamem.args | 5 +++-
tests/qemuxml2argvdata/video-vga-device.args | 5 +++-
.../qemuxml2argvdata/video-vga-nodevice.args | 5 +++-
.../qemuxml2argvdata/video-vga-qxl-heads.args | 5 +++-
.../video-virtio-gpu-ccw.args | 5 +++-
.../video-virtio-gpu-device.args | 5 +++-
.../video-virtio-gpu-sdl-gl.args | 5 +++-
.../video-virtio-gpu-secondary.args | 5 +++-
.../video-virtio-gpu-spice-gl.args | 5 +++-
.../video-virtio-gpu-virgl.args | 5 +++-
tests/qemuxml2argvdata/video-virtio-vga.args | 5 +++-
.../virtio-input-passthrough.args | 5 +++-
tests/qemuxml2argvdata/virtio-input.args | 5 +++-
tests/qemuxml2argvdata/virtio-lun.args | 5 +++-
.../virtio-non-transitional.x86_64-3.1.0.args | 5 +++-
...virtio-non-transitional.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/virtio-options.args | 5 +++-
tests/qemuxml2argvdata/virtio-rng-ccw.args | 5 +++-
.../qemuxml2argvdata/virtio-rng-default.args | 5 +++-
.../virtio-rng-egd-unix.x86_64-2.5.0.args | 5 +++-
.../virtio-rng-egd-unix.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/virtio-rng-egd.args | 5 +++-
.../qemuxml2argvdata/virtio-rng-multiple.args | 5 +++-
tests/qemuxml2argvdata/virtio-rng-random.args | 5 +++-
.../virtio-transitional.x86_64-3.1.0.args | 5 +++-
.../virtio-transitional.x86_64-latest.args | 5 +++-
tests/qemuxml2argvdata/vmcoreinfo.args | 5 +++-
tests/qemuxml2argvdata/watchdog-device.args | 5 +++-
tests/qemuxml2argvdata/watchdog-diag288.args | 5 +++-
tests/qemuxml2argvdata/watchdog-dump.args | 5 +++-
.../qemuxml2argvdata/watchdog-injectnmi.args | 5 +++-
tests/qemuxml2argvdata/watchdog.args | 5 +++-
tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 5 +++-
.../x86_64-pc-headless.x86_64-latest.args | 5 +++-
.../x86_64-q35-headless.x86_64-latest.args | 5 +++-
688 files changed, 2784 insertions(+), 684 deletions(-)
--
2.20.1
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
2:27 a.m.
On Wed, Mar 06, 2019 at 04:05:13PM +0000, Daniel P. Berrangé wrote:
On Wed, Mar 06, 2019 at 03:41:16PM +0100, Erik Skultety wrote:
> So, according to this report [1], Mesa enabled on-disk cache for its shaders
> which it tries to create either under XDG_CACHE_HOME/mesa_shader_cache or under
> HOME/.cache/mesa_shader_cache. Since libvirt doesn't set XDGs and HOME is only
> passed iff the QEMU process isn't run with SUID, Mesa will default to the home
> directory specified in /etc/passwd.
> Because of this, Mesa will fail to create the cache and QEMU refuses to start
> the VM (interestingly enough, Intel reports the problem too, but Mesa disables
> the cache and the VM starts). This series proposes usage of XDG variables to
> fix the problem by pointing XDG variables to hypervisor specific directory
> under libvirt's libDir. Additionally, HOME is also enforced for all VM
> processes and points to the base hypervisor libDir directory.
> To illustrate this further:
>
> system qemu:
> HOME=/var/lib/libvirt/qemu/domain-5-f-live \
> XDG_DATA_HOME=/var/lib/libvirt/qemu/domain-5-f-live/.local/share \
> XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain-5-f-live/.cache \
> XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain-5-f-live/.config \
>
> session qemu:
> HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live \
> XDG_DATA_HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live/.local/share
\
> XDG_CACHE_HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live/.cache \
> XDG_CONFIG_HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live/.config \
For the bug report IIUC we should only need to set XDG_CACHE_HOME
as that's the one which needs to be writable and which SELinux quite
rightly denies. It is also safe to redefine this because cache data
is liable to be purged at any time, so apps must expect to see an
empty cache directory.
Yes, XDG_CACHE_HOME is the only one needed to fix the BZ.
I'm very wary about setting HOME or XDG_DATA_HOME or XDG_CONFIG_HOME
as I think that is pretty likely to break valid usage.
For example, when QEMU is configured to use pulseaudio as its audio
backend, I believe this will want to read config files in normal
$HOME and/or $XDG_{CONFIG|DATA}_HOME.
I'm glad you mentioned pulseaudio, it's a good example, because pulseaudio
should never run as root, instead, it will run in context of the 'qemu' user,
right? This is all fine in session mode, but in system mode, having set none of
the above apart from cache, pulseaudio might try to read from '/' as that's
QEMU's home dir. Any reasonable app should default to reading configs and data
from /etc or /usr/local if there's nothing found in HOME or XDG location. But
when it comes to writing, having apps write anything to root's home doesn't
seem like a good idea to me, so I believe that at least for system mode, we
want to override all of the variables.
I'd also be okay with not redefining the variables for session mode, but the
following motivated me to do so:
1) consistency, if we do it in 1 mode, why not the other (although
personally, I don't like enforcing session mode that much)
2) isolation, configs are fine, but any data an app wants to write, I'm
really not sure how they handle multiple instances, so I approached this
like non-shared filesystems, any 2 apps need to have their own view of
the location and I also don't want them to even think of trying to write
something to root's home
Similary if using the GTK frontend these dirs are needed to load
the toolkit preferences such as theme.
You mean for <graphics>? If so, we don't support GTK.
I expect there are other relevant config files that would be
affected too.
>From a security POV these files should not be a problem since they
would all be read-only from QEMU's POV.
Erik
4:37 a.m.
On Thu, Mar 07, 2019 at 09:27:29AM +0100, Erik Skultety wrote:
On Wed, Mar 06, 2019 at 04:05:13PM +0000, Daniel P. Berrangé wrote:
> On Wed, Mar 06, 2019 at 03:41:16PM +0100, Erik Skultety wrote:
> > So, according to this report [1], Mesa enabled on-disk cache for its shaders
> > which it tries to create either under XDG_CACHE_HOME/mesa_shader_cache or
under
> > HOME/.cache/mesa_shader_cache. Since libvirt doesn't set XDGs and HOME is
only
> > passed iff the QEMU process isn't run with SUID, Mesa will default to the
home
> > directory specified in /etc/passwd.
> > Because of this, Mesa will fail to create the cache and QEMU refuses to start
> > the VM (interestingly enough, Intel reports the problem too, but Mesa disables
> > the cache and the VM starts). This series proposes usage of XDG variables to
> > fix the problem by pointing XDG variables to hypervisor specific directory
> > under libvirt's libDir. Additionally, HOME is also enforced for all VM
> > processes and points to the base hypervisor libDir directory.
> > To illustrate this further:
> >
> > system qemu:
> > HOME=/var/lib/libvirt/qemu/domain-5-f-live \
> > XDG_DATA_HOME=/var/lib/libvirt/qemu/domain-5-f-live/.local/share \
> > XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain-5-f-live/.cache \
> > XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain-5-f-live/.config \
> >
> > session qemu:
> > HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live \
> >
XDG_DATA_HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live/.local/share \
> > XDG_CACHE_HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live/.cache
\
> > XDG_CONFIG_HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live/.config
\
>
> For the bug report IIUC we should only need to set XDG_CACHE_HOME
> as that's the one which needs to be writable and which SELinux quite
> rightly denies. It is also safe to redefine this because cache data
> is liable to be purged at any time, so apps must expect to see an
> empty cache directory.
Yes, XDG_CACHE_HOME is the only one needed to fix the BZ.
>
> I'm very wary about setting HOME or XDG_DATA_HOME or XDG_CONFIG_HOME
> as I think that is pretty likely to break valid usage.
>
> For example, when QEMU is configured to use pulseaudio as its audio
> backend, I believe this will want to read config files in normal
> $HOME and/or $XDG_{CONFIG|DATA}_HOME.
I'm glad you mentioned pulseaudio, it's a good example, because pulseaudio
should never run as root, instead, it will run in context of the 'qemu' user,
right? This is all fine in session mode, but in system mode, having set none of
the above apart from cache, pulseaudio might try to read from '/' as that's
QEMU's home dir. Any reasonable app should default to reading configs and data
from /etc or /usr/local if there's nothing found in HOME or XDG location. But
when it comes to writing, having apps write anything to root's home doesn't
seem like a good idea to me, so I believe that at least for system mode, we
want to override all of the variables.
Yes, ok, for system mode setting all of them is sensible for the reasons
you say.
I'd also be okay with not redefining the variables for session
mode, but the
following motivated me to do so:
1) consistency, if we do it in 1 mode, why not the other (although
personally, I don't like enforcing session mode that much)
To me one of key reasons for session mode (aside from access to disk images
in $HOME) is that it allows VMs to integrate with services / apps in that
users session, such as PA. So isolating them is going to eliminate that
key feture of session mode & break valid usage IMHO.
2) isolation, configs are fine, but any data an app wants to
write, I'm
really not sure how they handle multiple instances, so I approached this
like non-shared filesystems, any 2 apps need to have their own view of
the location and I also don't want them to even think of trying to write
something to root's home
We don't really expect QEMU (or things it links to) to write to these
dirs, but if they did try SELinux would block it. IMHO if you wanted
stricter isolation then QEMU needs to be running a different UID.
> Similary if using the GTK frontend these dirs are needed to
load
> the toolkit preferences such as theme.
You mean for <graphics>? If so, we don't support GTK.
Yes for graphics. Lack of GTK support is a bug :-)
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
4:57 a.m.
On Thu, Mar 07, 2019 at 10:37:14AM +0000, Daniel P. Berrangé wrote:
On Thu, Mar 07, 2019 at 09:27:29AM +0100, Erik Skultety wrote:
> On Wed, Mar 06, 2019 at 04:05:13PM +0000, Daniel P. Berrangé wrote:
> > On Wed, Mar 06, 2019 at 03:41:16PM +0100, Erik Skultety wrote:
> > > So, according to this report [1], Mesa enabled on-disk cache for its
shaders
> > > which it tries to create either under XDG_CACHE_HOME/mesa_shader_cache or
under
> > > HOME/.cache/mesa_shader_cache. Since libvirt doesn't set XDGs and HOME
is only
> > > passed iff the QEMU process isn't run with SUID, Mesa will default to
the home
> > > directory specified in /etc/passwd.
> > > Because of this, Mesa will fail to create the cache and QEMU refuses to
start
> > > the VM (interestingly enough, Intel reports the problem too, but Mesa
disables
> > > the cache and the VM starts). This series proposes usage of XDG variables
to
> > > fix the problem by pointing XDG variables to hypervisor specific
directory
> > > under libvirt's libDir. Additionally, HOME is also enforced for all
VM
> > > processes and points to the base hypervisor libDir directory.
> > > To illustrate this further:
> > >
> > > system qemu:
> > > HOME=/var/lib/libvirt/qemu/domain-5-f-live \
> > > XDG_DATA_HOME=/var/lib/libvirt/qemu/domain-5-f-live/.local/share \
> > > XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain-5-f-live/.cache \
> > > XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain-5-f-live/.config \
> > >
> > > session qemu:
> > > HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live \
> > >
XDG_DATA_HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live/.local/share \
> > >
XDG_CACHE_HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live/.cache \
> > >
XDG_CONFIG_HOME=/home/eskultet/.config/libvirt/qemu/lib/domain-4-f-live/.config \
> >
> > For the bug report IIUC we should only need to set XDG_CACHE_HOME
> > as that's the one which needs to be writable and which SELinux quite
> > rightly denies. It is also safe to redefine this because cache data
> > is liable to be purged at any time, so apps must expect to see an
> > empty cache directory.
>
> Yes, XDG_CACHE_HOME is the only one needed to fix the BZ.
>
> >
> > I'm very wary about setting HOME or XDG_DATA_HOME or XDG_CONFIG_HOME
> > as I think that is pretty likely to break valid usage.
> >
> > For example, when QEMU is configured to use pulseaudio as its audio
> > backend, I believe this will want to read config files in normal
> > $HOME and/or $XDG_{CONFIG|DATA}_HOME.
>
> I'm glad you mentioned pulseaudio, it's a good example, because pulseaudio
> should never run as root, instead, it will run in context of the 'qemu'
user,
> right? This is all fine in session mode, but in system mode, having set none of
> the above apart from cache, pulseaudio might try to read from '/' as
that's
> QEMU's home dir. Any reasonable app should default to reading configs and data
> from /etc or /usr/local if there's nothing found in HOME or XDG location. But
> when it comes to writing, having apps write anything to root's home doesn't
> seem like a good idea to me, so I believe that at least for system mode, we
> want to override all of the variables.
Yes, ok, for system mode setting all of them is sensible for the reasons
you say.
> I'd also be okay with not redefining the variables for session mode, but the
> following motivated me to do so:
> 1) consistency, if we do it in 1 mode, why not the other (although
> personally, I don't like enforcing session mode that much)
To me one of key reasons for session mode (aside from access to disk images
in $HOME) is that it allows VMs to integrate with services / apps in that
users session, such as PA. So isolating them is going to eliminate that
key feture of session mode & break valid usage IMHO.
> 2) isolation, configs are fine, but any data an app wants to write, I'm
> really not sure how they handle multiple instances, so I approached this
> like non-shared filesystems, any 2 apps need to have their own view of
> the location and I also don't want them to even think of trying to write
> something to root's home
We don't really expect QEMU (or things it links to) to write to these
dirs, but if they did try SELinux would block it. IMHO if you wanted
stricter isolation then QEMU needs to be running a different UID.
> > Similary if using the GTK frontend these dirs are needed to load
> > the toolkit preferences such as theme.
>
> You mean for <graphics>? If so, we don't support GTK.
Yes for graphics. Lack of GTK support is a bug :-)
Alright, thanks for comments, I'll respin with the changes we talked about.
Erik
2123
days inactive
2124
days old
7 comments
2 participants
participants (2)
-
Daniel P. Berrangé -
Erik Skultety