tests: Unify input files for firmware tests

Most of the differences, such as those in the domain name or
amount of memory, are fairly harmless, but they still make it
more cumbersome than necessary to directly compare different
input (and output) files.

More importantly, the use of unversioned machine types in some
of the test cases results in the descriptor-based autoselection
logic being effectively skipped, because the compatible machine
types as listed in them are only the versioned variants.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml

@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='bios'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2argvdata/firmware-auto-bios-nvram.xml

@@ -1,11 +1,11 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='bios'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
-    <nvram>/path/to/fedora_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
   <features>
     <acpi/>

tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args

@@ -1,21 +1,21 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -bios /usr/share/seabios/bios-256k.bin \
--m 8 \
+-m 1024 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \

tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml

@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='bios'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args

@@ -1,21 +1,21 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -bios /usr/share/seabios/bios-256k.bin \
--m 8 \
+-m 1024 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \

tests/qemuxml2argvdata/firmware-auto-bios.xml

@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='bios'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args

@@ -1,18 +1,18 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-aarch64test \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-aarch64 \
--name guest=aarch64test,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-aarch64test/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/aarch64test_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
 -machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \

tests/qemuxml2argvdata/firmware-auto-efi-aarch64.xml

@@ -1,6 +1,6 @@
 <domain type='qemu'>
-  <name>aarch64test</name>
+  <name>guest</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>

tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys-no-secboot.xml

@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args

@@ -1,25 +1,25 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
 -machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
--m 8 \
+-m 1024 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \

tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.xml

@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2argvdata/firmware-auto-efi-loader-insecure.xml

@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2argvdata/firmware-auto-efi-loader-path.xml

@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args

@@ -1,25 +1,25 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
 -machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
--m 8 \
+-m 1024 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \

tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.xml

@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args

@@ -1,24 +1,24 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
 -machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel kvm \
 -cpu qemu64 \
--m 8 \
+-m 1024 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \

tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.xml

@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args

@@ -1,24 +1,24 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
 -machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel kvm \
 -cpu qemu64 \
--m 8 \
+-m 1024 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \

tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.xml

@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args

@@ -1,25 +1,25 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--blockdev '{"driver":"file","filename":"/path/to/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
 -machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
--m 8 \
+-m 1024 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \

tests/qemuxml2argvdata/firmware-auto-efi-nvram.xml

@@ -1,11 +1,11 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
-    <nvram>/path/to/fedora_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
   <features>
     <acpi/>

tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args

@@ -1,25 +1,25 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
 -machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
--m 8 \
+-m 1024 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \

tests/qemuxml2argvdata/firmware-auto-efi-secboot.xml

@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args

@@ -1,22 +1,22 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF.sev.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format \
 -accel kvm \
 -cpu qemu64 \
--m 8 \
+-m 1024 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \

tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml

@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args

@@ -1,25 +1,25 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-fedora \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=fedora,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
 -machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
--m 8 \
+-m 1024 \
--object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \

tests/qemuxml2argvdata/firmware-auto-efi.xml

@@ -1,7 +1,7 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml

@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader stateless='no'>/usr/share/seabios/bios.bin</loader>
   </os>
   <devices>

tests/qemuxml2argvdata/firmware-manual-bios-stateless.x86_64-latest.args

@@ -1,16 +1,16 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
--machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
 -cpu qemu64 \
 -bios /usr/share/seabios/bios.bin \
@@ -18,7 +18,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \

tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml

@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader stateless='yes'>/usr/share/seabios/bios.bin</loader>
   </os>
   <devices>

tests/qemuxml2argvdata/firmware-manual-bios.x86_64-latest.args

@@ -1,16 +1,16 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
--machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
 -cpu qemu64 \
 -bios /usr/share/seabios/bios.bin \
@@ -18,7 +18,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \

tests/qemuxml2argvdata/firmware-manual-bios.xml

@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader>/usr/share/seabios/bios.bin</loader>
   </os>
   <devices>

tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args

@@ -12,16 +12,16 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
+-machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu cortex-a15 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \

tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.xml

@@ -1,12 +1,12 @@
 <domain type='qemu'>
   <name>guest</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='virt'>hvm</type>
+    <type arch='aarch64' machine='virt-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader>
-    <nvram>/some/user/nvram/path/guest_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
   <features>
     <acpi/>

tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.x86_64-latest.args

@@ -12,16 +12,16 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
+-machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \

tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.xml

@@ -1,12 +1,12 @@
 <domain type='qemu'>
   <name>guest</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='q35'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
-    <nvram>/some/user/nvram/path/guest_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
   <features>
     <acpi/>

tests/qemuxml2argvdata/firmware-manual-efi-features.xml

@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <firmware>
       <feature enabled='no' name='enrolled-keys'/>

tests/qemuxml2argvdata/firmware-manual-efi-no-path.xml

@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'/>
   </os>
   <features>

tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args

@@ -12,16 +12,16 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
+-machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu cortex-a15 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \

tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.xml

@@ -1,12 +1,12 @@
 <domain type='qemu'>
   <name>guest</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='virt'>hvm</type>
+    <type arch='aarch64' machine='virt-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader>
-    <nvram>/some/user/nvram/path/guest_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>

tests/qemuxml2argvdata/firmware-manual-efi-noacpi-q35.xml

@@ -1,12 +1,12 @@
 <domain type='qemu'>
   <name>guest</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='q35'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
-    <nvram>/some/user/nvram/path/guest_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>

tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.args

@@ -1,27 +1,27 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--blockdev '{"driver":"file","filename":"/var/lib/libvirt/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \

tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.xml

@@ -1,13 +1,13 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram type='file'>
-      <source file='/var/lib/libvirt/nvram/guest_VARS.fd'/>
+      <source file='/path/to/guest_VARS.fd'/>
     </nvram>
   </os>
   <features>

tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args

@@ -1,28 +1,28 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -object '{"qom-type":"secret","id":"libvirt-pflash1-storage-auth-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}' \
 -blockdev '{"driver":"iscsi","portal":"example.com:6000","target":"iqn.2013-07.com.example:iscsi-nopool","lun":0,"transport":"tcp","user":"myname","password-secret":"libvirt-pflash1-storage-auth-secret0","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \

tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.xml

@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram type='network'>
       <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool'>

tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args

@@ -1,27 +1,27 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","port":"6000"},"export":"bar","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \

tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.xml

@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram type='network'>
       <source protocol='nbd' name='bar'>

tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml

@@ -1,13 +1,13 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader stateless='yes' readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram type='file'>
-      <source file='/var/lib/libvirt/nvram/guest_VARS.fd'/>
+      <source file='/path/to/guest_VARS.fd'/>
     </nvram>
   </os>
   <features>

tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.xml

@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader stateless='yes' readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram template="/usr/share/OVMF/OVMF_VARS.fd"/>
   </os>

tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-latest.args

@@ -1,27 +1,27 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/test-bios_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \

tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.xml

@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram template="/usr/share/OVMF/OVMF_VARS.fd"/>
   </os>

tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.x86_64-latest.args

@@ -1,25 +1,25 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
--blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/test-bios.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"driver":"file","filename":"/path/to/guest_BOTH.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":false,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format \
+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \

tests/qemuxml2argvdata/firmware-manual-efi-rw-implicit.xml

@@ -1,11 +1,11 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
-    <loader type='pflash'>/var/lib/libvirt/qemu/nvram/test-bios.fd</loader>
+    <loader type='pflash'>/path/to/guest_BOTH.fd</loader>
   </os>
   <features>
     <acpi/>

tests/qemuxml2argvdata/firmware-manual-efi-rw.x86_64-latest.args

@@ -1,25 +1,25 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
--blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/test-bios.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"driver":"file","filename":"/path/to/guest_BOTH.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":false,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format \
+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \

tests/qemuxml2argvdata/firmware-manual-efi-rw.xml

@@ -1,11 +1,11 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
-    <loader readonly='no' type='pflash'>/var/lib/libvirt/qemu/nvram/test-bios.fd</loader>
+    <loader readonly='no' type='pflash'>/path/to/guest_BOTH.fd</loader>
   </os>
   <features>
     <acpi/>

tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.args

@@ -1,20 +1,20 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine q35,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
+-machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \

tests/qemuxml2argvdata/firmware-manual-efi-secure.xml

@@ -1,12 +1,12 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='q35'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
     <loader readonly='yes' secure='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.secboot.fd</loader>
-    <nvram>/some/user/nvram/path/guest_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
   <features>
     <acpi/>

tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args

@@ -1,25 +1,25 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format \
+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \

tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml

@@ -1,10 +1,10 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash' stateless='yes'>/usr/share/OVMF/OVMF_CODE.fd</loader>
   </os>
   <features>

tests/qemuxml2argvdata/firmware-manual-efi.x86_64-latest.args

@@ -1,27 +1,27 @@
 LC_ALL=C \
 PATH=/bin \
-HOME=/tmp/lib/domain--1-test-bios \
+HOME=/tmp/lib/domain--1-guest \
 USER=test \
 LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 /usr/bin/qemu-system-x86_64 \
--name guest=test-bios,debug-threads=on \
+-name guest=guest,debug-threads=on \
 -S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \

tests/qemuxml2argvdata/firmware-manual-efi.xml

@@ -1,12 +1,12 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
-    <nvram>/some/user/nvram/path/guest_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
   </os>
   <features>
     <acpi/>

tests/qemuxml2argvdata/firmware-manual-noefi-acpi-aarch64.xml

@@ -1,10 +1,10 @@
 <domain type='qemu'>
   <name>guest</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='virt'>hvm</type>
+    <type arch='aarch64' machine='virt-4.0'>hvm</type>
   </os>
   <features>
     <acpi/>

tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args

@@ -10,14 +10,14 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -name guest=guest,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
--machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \

tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.xml

@@ -1,10 +1,10 @@
 <domain type='qemu'>
   <name>guest</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='q35'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
   </os>
   <features>
     <acpi/>

tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args

@@ -10,14 +10,14 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -name guest=guest,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
--machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram \
+-machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram \
 -accel tcg \
 -cpu cortex-a15 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \

tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.xml

@@ -1,10 +1,10 @@
 <domain type='qemu'>
   <name>guest</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='aarch64' machine='virt'>hvm</type>
+    <type arch='aarch64' machine='virt-4.0'>hvm</type>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>

tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args

@@ -10,14 +10,14 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -name guest=guest,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
--machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
--uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
 -display none \
 -no-user-config \
 -nodefaults \

tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.xml

@@ -1,10 +1,10 @@
 <domain type='qemu'>
   <name>guest</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='q35'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
   </os>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>

tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.xml

@@ -1,8 +1,8 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>8192</currentMemory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='bios'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml

@@ -1,8 +1,8 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>8192</currentMemory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='bios'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2xmloutdata/firmware-auto-efi-aarch64.aarch64-latest.xml

@@ -1,6 +1,6 @@
 <domain type='qemu'>
-  <name>aarch64test</name>
+  <name>guest</name>
-  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>

tests/qemuxml2xmloutdata/firmware-auto-efi-enrolled-keys.x86_64-latest.xml

@@ -1,8 +1,8 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>8192</currentMemory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_64-latest.xml

@@ -1,8 +1,8 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>8192</currentMemory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml

@@ -1,8 +1,8 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>8192</currentMemory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2xmloutdata/firmware-auto-efi-no-secboot.x86_64-latest.xml

@@ -1,8 +1,8 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>8192</currentMemory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2xmloutdata/firmware-auto-efi-nvram.x86_64-latest.xml

@@ -1,12 +1,12 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>8192</currentMemory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
-    <nvram>/path/to/fedora_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
     <boot dev='hd'/>
   </os>
   <features>

tests/qemuxml2xmloutdata/firmware-auto-efi-secboot.x86_64-latest.xml

@@ -1,8 +1,8 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>8192</currentMemory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml

@@ -1,8 +1,8 @@
 <domain type='kvm'>
-  <name>fedora</name>
+  <name>guest</name>
   <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
-  <memory unit='KiB'>8192</memory>
+  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>8192</currentMemory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>

tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.x86_64-latest.xml

@@ -1,11 +1,11 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader type='rom' stateless='yes'>/usr/share/seabios/bios.bin</loader>
     <boot dev='hd'/>
   </os>

tests/qemuxml2xmloutdata/firmware-manual-bios.x86_64-latest.xml

@@ -1,11 +1,11 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader type='rom'>/usr/share/seabios/bios.bin</loader>
     <boot dev='hd'/>
   </os>

tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-file.x86_64-latest.xml

@@ -1,14 +1,14 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram type='file'>
-      <source file='/var/lib/libvirt/nvram/guest_VARS.fd'/>
+      <source file='/path/to/guest_VARS.fd'/>
     </nvram>
     <boot dev='hd'/>
   </os>

tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.xml

@@ -1,11 +1,11 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram type='network'>
       <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool'>

tests/qemuxml2xmloutdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.xml

@@ -1,11 +1,11 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
     <nvram type='network'>
       <source protocol='nbd' name='bar'>

tests/qemuxml2xmloutdata/firmware-manual-efi.x86_64-latest.xml

@@ -1,13 +1,13 @@
 <domain type='qemu'>
-  <name>test-bios</name>
+  <name>guest</name>
-  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
   <memory unit='KiB'>1048576</memory>
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc'>hvm</type>
+    <type arch='x86_64' machine='pc-i440fx-4.0'>hvm</type>
     <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
-    <nvram>/some/user/nvram/path/guest_VARS.fd</nvram>
+    <nvram>/path/to/guest_VARS.fd</nvram>
     <boot dev='hd'/>
   </os>
   <features>