qemu: command: Override HOME variable for system QEMU

By default, qemu user's home dir points to '/' which shouldn't be used
at all. We therefore pass the HOME variable from the current variable
iff not running as SUID, which means that for systemd we never set it.
This patch makes sure, that for system QEMU this is always set to
libDir/<driver>, session mode is left untouched.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

src/qemu/qemu_command.c

@@ -10673,6 +10673,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
         virCommandAddEnvFormat(cmd, "XDG_CACHE_HOME=%s/%s",
                                priv->libDir, ".cache");
     } else {
+        virCommandAddEnvPair(cmd, "HOME", priv->libDir);
         virCommandAddEnvXDG(cmd, priv->libDir);
     }
 

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

tests/qemuxml2argvdata/aarch64-virt-graphics.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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \