qemu_command: Separate domain memory building into a helper

The qemuBuildMachineCommandLine() function is needlessly long. Separate out parts that generate memory related arguments into qemuAppendDomainMemoryMachineParams(). Unfortunately, expected outputs for some qemuxml2argvdata cases needed to be updated because the order in which arguments are generated is changed. But there's no functional change. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2025-01-11 09:17:52 +03:00 · 2022-07-26 15:53:07 +02:00 · 2022-07-26 15:53:07 +02:00 · 23d4684640
commit 23d4684640
parent b185abe9d9
79 changed files with 128 additions and 115 deletions
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@ -7073,6 +7073,54 @@ qemuAppendDomainFeaturesMachineParam(virBuffer *buf,
 }


+static int
+qemuAppendDomainMemoryMachineParams(virBuffer *buf,
+                                    virQEMUDriverConfig *cfg,
+                                    const virDomainDef *def,
+                                    virQEMUCaps *qemuCaps)
+{
+    size_t i;
+
+    if (def->mem.dump_core) {
+        virBufferAsprintf(buf, ",dump-guest-core=%s",
+                          virTristateSwitchTypeToString(def->mem.dump_core));
+    } else {
+        virBufferAsprintf(buf, ",dump-guest-core=%s",
+                          cfg->dumpGuestCore ? "on" : "off");
+    }
+
+    if (def->mem.nosharepages)
+        virBufferAddLit(buf, ",mem-merge=off");
+
+    for (i = 0; i < def->nmems; i++) {
+        if (def->mems[i]->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM) {
+            virBufferAddLit(buf, ",nvdimm=on");
+            break;
+        }
+    }
+
+    if (!virDomainNumaGetNodeCount(def->numa)) {
+        const char *defaultRAMid = NULL;
+
+        /* QEMU is obsoleting -mem-path and -mem-prealloc. That means we have
+         * to switch to memory-backend-* even for regular RAM and to keep
+         * domain migratable we have to set the same ID as older QEMUs would.
+         * If domain has no NUMA nodes and QEMU is new enough to expose ID of
+         * the default RAM we want to use it for default RAM (construct
+         * memory-backend-* with corresponding attributes instead of obsolete
+         * -mem-path and -mem-prealloc).
+         * This generates only reference for the memory-backend-* object added
+         * later in qemuBuildMemCommandLine() */
+        defaultRAMid = virQEMUCapsGetMachineDefaultRAMid(qemuCaps,
+                                                         def->virtType,
+                                                         def->os.machine);
+        if (defaultRAMid)
+            virBufferAsprintf(buf, ",memory-backend=%s", defaultRAMid);
+    }
+
+    return 0;
+}
+
 static int
 qemuBuildMachineCommandLine(virCommand *cmd,
                            virQEMUDriverConfig *cfg,
@ -7082,7 +7130,6 @@ qemuBuildMachineCommandLine(virCommand *cmd,
 {
    virCPUDef *cpu = def->cpu;
    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-    size_t i;

    virCommandAddArg(cmd, "-machine");
    virBufferAdd(&buf, def->os.machine, -1);
@ -7092,17 +7139,6 @@ qemuBuildMachineCommandLine(virCommand *cmd,
     */
    virBufferAddLit(&buf, ",usb=off");

-    if (def->mem.dump_core) {
-        virBufferAsprintf(&buf, ",dump-guest-core=%s",
-                          virTristateSwitchTypeToString(def->mem.dump_core));
-    } else {
-        virBufferAsprintf(&buf, ",dump-guest-core=%s",
-                          cfg->dumpGuestCore ? "on" : "off");
-    }
-
-    if (def->mem.nosharepages)
-        virBufferAddLit(&buf, ",mem-merge=off");
-
    if (def->keywrap &&
        !qemuAppendKeyWrapMachineParms(&buf, qemuCaps, def->keywrap))
        return -1;
@ -7128,12 +7164,8 @@ qemuBuildMachineCommandLine(virCommand *cmd,
        }
    }

-    for (i = 0; i < def->nmems; i++) {
-        if (def->mems[i]->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM) {
-            virBufferAddLit(&buf, ",nvdimm=on");
-            break;
-        }
-    }
+    if (qemuAppendDomainMemoryMachineParams(&buf, cfg, def, qemuCaps) < 0)
+        return -1;

    if (cpu && cpu->model &&
        cpu->mode == VIR_CPU_MODE_HOST_MODEL &&
@ -7174,25 +7206,6 @@ qemuBuildMachineCommandLine(virCommand *cmd,
    if (virDomainNumaHasHMAT(def->numa))
        virBufferAddLit(&buf, ",hmat=on");

-    if (!virDomainNumaGetNodeCount(def->numa)) {
-        const char *defaultRAMid = NULL;
-
-        /* QEMU is obsoleting -mem-path and -mem-prealloc. That means we have
-         * to switch to memory-backend-* even for regular RAM and to keep
-         * domain migratable we have to set the same ID as older QEMUs would.
-         * If domain has no NUMA nodes and QEMU is new enough to expose ID of
-         * the default RAM we want to use it for default RAM (construct
-         * memory-backend-* with corresponding attributes instead of obsolete
-         * -mem-path and -mem-prealloc).
-         * This generates only reference for the memory-backend-* object added
-         * later in qemuBuildMemCommandLine() */
-        defaultRAMid = virQEMUCapsGetMachineDefaultRAMid(qemuCaps,
-                                                         def->virtType,
-                                                         def->os.machine);
-        if (defaultRAMid)
-            virBufferAsprintf(&buf, ",memory-backend=%s", defaultRAMid);
-    }
-
    /* On x86 targets, graphics=off activates the serial console
     * output mode in the firmware. On non-x86 targets it has
     * various other undesirable effects that we certainly do
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a53 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
+++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel kvm \
 -cpu host \
 -m 1024 \
--- a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args
@ -10,7 +10,7 @@ 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-4.2,usb=off,dump-guest-core=off,gic-version=3,memory-backend=mach-virt.ram \
+-machine virt-4.2,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram \
 -accel kvm \
 -m 4096 \
 -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294967296}' \
--- a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args
@ -10,7 +10,7 @@ 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-4.2,usb=off,dump-guest-core=off,gic-version=2,memory-backend=mach-virt.ram \
+-machine virt-4.2,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram \
 -accel tcg \
 -cpu cortex-a15 \
 -m 4096 \
--- a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args
@ -10,7 +10,7 @@ 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,dump-guest-core=off,gic-version=3,memory-backend=mach-virt.ram \
+-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram \
 -accel kvm \
 -cpu host,sve512=on,sve384=off,sve256=on,sve128=on,sve=on \
 -m 1024 \
--- a/tests/qemuxml2argvdata/aarch64-gic-host.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-host.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=host \
+-machine virt,usb=off,gic-version=host,dump-guest-core=off \
 -accel kvm \
 -cpu host \
 -m 1024 \
--- a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a57 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/aarch64-gic-v2.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v2.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel kvm \
 -cpu host \
 -m 1024 \
--- a/tests/qemuxml2argvdata/aarch64-gic-v3.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v3.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=3 \
+-machine virt,usb=off,gic-version=3,dump-guest-core=off \
 -accel kvm \
 -cpu host \
 -m 1024 \
--- a/tests/qemuxml2argvdata/aarch64-pci-serial.args
+++ b/tests/qemuxml2argvdata/aarch64-pci-serial.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -m 1024 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args
@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-aarch64test/master-key.aes"}' \
-machine virt,usb=off,dump-guest-core=off,gic-version=2,memory-backend=mach-virt.ram \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram \
 -accel tcg \
 -cpu cortex-a15 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/aarch64-traditional-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -m 1024 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/aarch64-video-default.args
+++ b/tests/qemuxml2argvdata/aarch64-video-default.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64-vgpu,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64-vgpu/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a57 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64-vgpu,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64-vgpu/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a57 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt-2.6,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt-2.6,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a53 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64-virt-default-nic,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64-virt-default/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a53 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -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 '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
-machine virt,usb=off,dump-guest-core=off,gic-version=2,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=mach-virt.ram \
+-machine virt,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 4096 \
--- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -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 '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
-machine virt,usb=off,dump-guest-core=off,gic-version=2,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=mach-virt.ram \
+-machine virt,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 4096 \
--- a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a53 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a53 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a53 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/balloon-mmio-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a53 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
@ -10,7 +10,7 @@ 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,dump-guest-core=off,gic-version=3,memory-backend=mach-virt.ram \
+-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram \
 -accel kvm \
 -cpu host,kvm-no-adjvtime=on \
 -m 4096 \
--- a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args
@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-default-video-type-a/.config \
 -name guest=default-video-type-aarch64-test,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-default-video-type-a/master-key.aes"}' \
-machine virt,usb=off,dump-guest-core=off,gic-version=3,memory-backend=mach-virt.ram \
+-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram \
 -accel kvm \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \
--- a/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args
@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 -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 '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
-machine virt-4.0,usb=off,dump-guest-core=off,gic-version=2,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=mach-virt.ram \
+-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 \
--- a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args
@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -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 '{"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,smm=on,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-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 \
--- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args
@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -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 '{"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,smm=on,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-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 \
--- a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args
@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -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 '{"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,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-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 \
--- a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args
@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -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 '{"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,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-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 \
--- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args
@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -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 '{"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,smm=on,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-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 \
--- a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args
@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -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 '{"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,smm=on,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-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 \
--- a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args
@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/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,pflash0=libvirt-pflash0-format,memory-backend=pc.ram \
+-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 \
--- a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args
@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -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 '{"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,smm=on,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-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 \
--- a/tests/qemuxml2argvdata/firmware-manual-bios-rw-implicit.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-bios-rw-implicit.x86_64-latest.args
@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/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 '{"node-name":"libvirt-pflash0-format","read-only":false,"driver":"raw","file":"libvirt-pflash0-storage"}' \
-machine pc,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,memory-backend=pc.ram \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/firmware-manual-bios-rw.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-bios-rw.x86_64-latest.args
@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/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 '{"node-name":"libvirt-pflash0-format","read-only":false,"driver":"raw","file":"libvirt-pflash0-storage"}' \
-machine pc,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,memory-backend=pc.ram \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
 -drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \
--- a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
 -drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \
--- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.args
@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -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 '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
-machine pc,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args
@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -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,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args
@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -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,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-latest.args
@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -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 '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
-machine pc,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=test-bios,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes \
-machine q35,usb=off,dump-guest-core=off,smm=on \
+-machine q35,usb=off,smm=on,dump-guest-core=off \
 -accel tcg \
 -global driver=cfi.pflash01,property=secure,value=on \
 -drive file=/usr/share/OVMF/OVMF_CODE.secboot.fd,if=pflash,format=raw,unit=0,readonly=on \
--- a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args
@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/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,pflash0=libvirt-pflash0-format,memory-backend=pc.ram \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args
+++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -m 1024 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
+++ b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel hvf \
 -drive file=/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw,if=pflash,format=raw,unit=0,readonly=on \
 -drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \
--- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args
@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,memory-backend=pc.ram \
+-machine q35,usb=off,kernel_irqchip=split,dump-guest-core=off,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -m 214 \
--- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,memory-backend=pc.ram \
+-machine q35,usb=off,kernel_irqchip=split,dump-guest-core=off,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -m 214 \
--- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,memory-backend=pc.ram \
+-machine q35,usb=off,kernel_irqchip=split,dump-guest-core=off,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -m 214 \
--- a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,memory-backend=pc.ram \
+-machine q35,usb=off,kernel_irqchip=split,dump-guest-core=off,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -m 214 \
--- a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args
@ -10,7 +10,7 @@ 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,dump-guest-core=off,gic-version=2,iommu=smmuv3,memory-backend=mach-virt.ram \
+-machine virt,usb=off,gic-version=2,iommu=smmuv3,dump-guest-core=off,memory-backend=mach-virt.ram \
 -accel tcg \
 -cpu cortex-a15 \
 -m 1024 \
--- a/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args
+++ b/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args
@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,confidential-guest-support=lsec0,memory-backend=s390.ram \
+-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram,confidential-guest-support=lsec0 \
 -accel kvm \
 -cpu gen15a-base,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apqi=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \
 -m 214 \
--- a/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-latest.args
@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
-machine pc,usb=off,dump-guest-core=off,confidential-guest-support=lsec0,memory-backend=pc.ram \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,confidential-guest-support=lsec0 \
 -accel kvm \
 -cpu qemu64 \
 -m 214 \
--- a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args
+++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args
@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
-machine pc-i440fx-6.0,usb=off,dump-guest-core=off,confidential-guest-support=lsec0,memory-backend=pc.ram \
+-machine pc-i440fx-6.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,confidential-guest-support=lsec0 \
 -accel kvm \
 -cpu qemu64 \
 -m 214 \
--- a/tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args
+++ b/tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args
@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
-machine pc-i440fx-6.0,usb=off,dump-guest-core=off,confidential-guest-support=lsec0,memory-backend=pc.ram \
+-machine pc-i440fx-6.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,confidential-guest-support=lsec0 \
 -accel kvm \
 -cpu qemu64 \
 -m 214 \
--- a/tests/qemuxml2argvdata/mach-virt-console-virtio.args
+++ b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -m 512 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/mach-virt-serial-native.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-native.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -m 512 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/mach-virt-serial-pci.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -m 512 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/mach-virt-serial-usb.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -m 512 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,aes-key-wrap=off \
+-machine s390-ccw-virtio,usb=off,aes-key-wrap=off,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,aes-key-wrap=off \
+-machine s390-ccw-virtio,usb=off,aes-key-wrap=off,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,aes-key-wrap=on \
+-machine s390-ccw-virtio,usb=off,aes-key-wrap=on,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,aes-key-wrap=on \
+-machine s390-ccw-virtio,usb=off,aes-key-wrap=on,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,dea-key-wrap=off \
+-machine s390-ccw-virtio,usb=off,dea-key-wrap=off,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,dea-key-wrap=off \
+-machine s390-ccw-virtio,usb=off,dea-key-wrap=off,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,dea-key-wrap=on \
+-machine s390-ccw-virtio,usb=off,dea-key-wrap=on,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,dea-key-wrap=on \
+-machine s390-ccw-virtio,usb=off,dea-key-wrap=on,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args
@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
-machine q35,usb=off,dump-guest-core=off,smm=off,memory-backend=pc.ram \
+-machine q35,usb=off,smm=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
 -cpu qemu64 \
 -m 214 \
--- a/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args
@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
-machine q35,usb=off,dump-guest-core=off,smm=on,memory-backend=pc.ram \
+-machine q35,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
 -cpu qemu64 \
 -m 214 \
--- a/tests/qemuxml2argvdata/machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine pc,usb=off,dump-guest-core=off,vmport=off \
+-machine pc,usb=off,vmport=off,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args
@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-pcie-expander-bus-te/.config \
 -name guest=pcie-expander-bus-test,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-pcie-expander-bus-te/master-key.aes"}' \
-machine virt,usb=off,dump-guest-core=off,gic-version=2,memory-backend=mach-virt.ram \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram \
 -accel tcg \
 -cpu cortex-a15 \
 -m 2048 \
--- a/tests/qemuxml2argvdata/pseries-cpu-compat-power10.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat-power10.ppc64-latest.args
@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
-machine pseries,usb=off,dump-guest-core=off,max-cpu-compat=power10,memory-backend=ppc_spapr.ram \
+-machine pseries,usb=off,dump-guest-core=off,memory-backend=ppc_spapr.ram,max-cpu-compat=power10 \
 -accel kvm \
 -cpu host \
 -m 256 \
--- a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.ppc64-latest.args
@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
-machine pseries,usb=off,dump-guest-core=off,max-cpu-compat=power9,memory-backend=ppc_spapr.ram \
+-machine pseries,usb=off,dump-guest-core=off,memory-backend=ppc_spapr.ram,max-cpu-compat=power9 \
 -accel kvm \
 -cpu host \
 -m 256 \
--- a/tests/qemuxml2argvdata/pseries-features.args
+++ b/tests/qemuxml2argvdata/pseries-features.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
-machine pseries,usb=off,dump-guest-core=off,resize-hpt=required,cap-hpt-max-page-size=1048576k,cap-htm=on,cap-nested-hv=off,cap-ccf-assist=on,cap-cfpc=fixed,cap-sbbc=broken,cap-ibs=fixed-ccd \
+-machine pseries,usb=off,resize-hpt=required,cap-hpt-max-page-size=1048576k,cap-htm=on,cap-nested-hv=off,cap-ccf-assist=on,cap-cfpc=fixed,cap-sbbc=broken,cap-ibs=fixed-ccd,dump-guest-core=off \
 -accel tcg \
 -m 512 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=spice \
 -name guest=virt-manager-basic,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-virt-manager-basic/master-key.aes \
-machine q35,usb=off,dump-guest-core=off,vmport=off \
+-machine q35,usb=off,vmport=off,dump-guest-core=off \
 -accel kvm \
 -m 4096 \
 -overcommit mem-lock=off \
--- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
-machine pc-q35-2.10,usb=off,dump-guest-core=off,smm=on,memory-backend=pc.ram \
+-machine pc-q35-2.10,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
 -global mch.extended-tseg-mbytes=48 \
 -cpu qemu64 \
--- a/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args
@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -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-6.0,usb=off,dump-guest-core=off,gic-version=2,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=mach-virt.ram \
+-machine virt-6.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 \