qemu: use long on|off syntax for -chardev boolean option values

The preferred syntax for boolean options is to set the value "on" or
"off". QEMU 7.1.0 will deprecate the short format we currently use.

The long format has been supported with -chardev since at least 1.5.3,
so we don't need to check for it.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index d19756dc0772179695877480d6738e57a90de9cf..0fed6e9bdedb7bacdb08fe57ed7e6a2c9abddb10 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4899,12 +4899,12 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
                           charAlias,
                           dev->data.tcp.host,
                           dev->data.tcp.service,
-                          telnet ? ",telnet" : "");
+                          telnet ? ",telnet=on" : "");
 
         if (dev->data.tcp.listen) {
-            virBufferAddLit(&buf, ",server");
+            virBufferAddLit(&buf, ",server=on");
             if (cdevflags & QEMU_BUILD_CHARDEV_TCP_NOWAIT)
-                virBufferAddLit(&buf, ",nowait");
+                virBufferAddLit(&buf, ",wait=off");
         }
 
         qemuBuildChrChardevReconnectStr(&buf, &dev->data.tcp.reconnect);
@@ -4965,9 +4965,9 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
             virQEMUBuildBufferEscapeComma(&buf, dev->data.nix.path);
         }
         if (dev->data.nix.listen) {
-            virBufferAddLit(&buf, ",server");
+            virBufferAddLit(&buf, ",server=on");
             if (cdevflags & QEMU_BUILD_CHARDEV_TCP_NOWAIT)
-                virBufferAddLit(&buf, ",nowait");
+                virBufferAddLit(&buf, ",wait=off");
         }
 
         qemuBuildChrChardevReconnectStr(&buf, &dev->data.nix.reconnect);

diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index 41a1dd185de88ca4ffeaf3f620d421adf182a357..02b63052920fe6620c656e74eb0784c9a21d7880 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
index 0f74e87bd4874d106432b8fe28a312c6487cd92f..83cc6df3120ab7595a5bd0c8a95af88053ca72a7 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
+++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
@@ -24,7 +24,7 @@ unit=1 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown

diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
index ae92ab0dea872ae3fd80f9a49eef102947a870e5..edd32da45f36e16d5fdfc98f469fc84c464747e1 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
+++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git 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
index 0c1fe71619fea3bc55338037380b7ea73e9e08ed..39f4702e991f1318205eda9e0b3e1cdc10196986 100644 (file)
--- 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
@@ -22,7 +22,7 @@ memory-backend=mach-virt.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git 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
index 858eadc2573c262d78cae2bb1e9893c7b1e1518f..84beed0dffae2b61c93bb32505780c412ab90222 100644 (file)
--- 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
@@ -23,7 +23,7 @@ memory-backend=mach-virt.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args
index ba7980470718ffa9b7c9212db8ddd538520ed198..8619fcd5f3903a6b6753a53f8c98dfc092ccbb95 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args
@@ -23,7 +23,7 @@ memory-backend=mach-virt.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.args b/tests/qemuxml2argvdata/aarch64-gic-host.args
index 2baf4b9d7843174bd3bd050d1e274628995aad9f..9d453d7828b9d45245b0530097a8355334c548b5 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-gic-host.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-host.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
index 18a0ac2df388d31c32ec6da491b8f16571804418..4e7d9888ac1171d6173b0132af0ff597f4d7b097 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.args b/tests/qemuxml2argvdata/aarch64-gic-v2.args
index 6cf583935d725ff887d0345b4bce4db9594594c8..997c06fc7f4288769f72e9861a11e35fb6f0bc4b 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-gic-v2.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v2.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args b/tests/qemuxml2argvdata/aarch64-gic-v3.args
index 2049250b0701691edc823691710e1901d6100e78..7a3d9e33cfecf6b9b74a051bd9b3cbbcddf9c318 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-gic-v3.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v3.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
index e660b783972f86210388924d1c35a6526222b418..f3649138d9e2496c4ad74ffdf66e3dfc8512279a 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
index cab7600693330cbb37308f0d69a48ebbeac84a0f..8294b7452122204bcc2a09c1c6762c9921304d53 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
+++ b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
index 51669190db8f16b019efc7897110cd0a6af96326..60ad6f1f582d30ec976a40bf78027f3d3853c8a8 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
+++ b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
@@ -24,7 +24,7 @@ unit=1 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args
index 1ff234cc890ed114a0757a0e564725c9ec67cb25..c5c7234a8639ba82b1a89296ca0cf01d59cc164f 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args
@@ -35,7 +35,7 @@ memory-backend=mach-virt.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-pci-serial.args b/tests/qemuxml2argvdata/aarch64-pci-serial.args
index 3d89ab0b7e09b9758e2802cd45182868f2f65fca..2324498a45db11b64ec9c57637011040d484f4cc 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-pci-serial.args
+++ b/tests/qemuxml2argvdata/aarch64-pci-serial.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args
index 94a083d8168e0dd096abd8ecd42d2b5a5db52214..2419d6b22fe2315e22736c6fa8209ccf72f4170c 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args
@@ -23,7 +23,7 @@ memory-backend=mach-virt.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-traditional-pci.args b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
index 853723f4de733f9e98ae84036efe3acf5d2fa7b7..9c49b42275cc5d02aeb81c023a02c1eb4d0d52f7 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-traditional-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
index 4c5ea313e4abd735b1a8f91ee609b6e91da0b689..73b1f9b727f043e4af8b8f513479d16bd5ee8336 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
index 56c66fc399c84468ad73cb3eb0430d639041d8b6..ce13bc4575b1167bc09dd8adda6c314ef7c232ed 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-video-default.args b/tests/qemuxml2argvdata/aarch64-video-default.args
index 8cf06402ed3772496b9428f54074957ca21e1c38..0a5082246144e60bd884d3064e9fe33d1595ef51 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-video-default.args
+++ b/tests/qemuxml2argvdata/aarch64-video-default.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-aarch64-vgpu/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-aarch64-vgpu/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
index 95a6b5154f7a9f2a30a5d13b6c53e9dcd9b8271f..cff849f07a7fb1715b2911b6807000317982956e 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-aarch64-vgpu/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-aarch64-vgpu/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
index 6c997100da691cfb99d134ad4f26705a0049e379..7dbe18c0214c7ed740f266ec4b09d346eba1f534 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
index 0d423783e68e5d689043f5eff0f3ca3a86dd627a..90b0a41dca11b8e0e07843c373df25b1816b1a4a 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-aarch64-virt-default/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-aarch64-virt-default/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
index 70be61bb33adf5b01c7a610111acb581a5f452f0..c8cff9500ca0ff3f83119e9cd3583fc54e821f01 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
@@ -34,7 +34,7 @@ memory-backend=mach-virt.ram \
 -uuid 33844184-97c0-4cc0-aa7d-206f5803530b \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -61,7 +61,7 @@ id=virtio-disk0,bootindex=1 \
 addr=0x0 \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
--chardev socket,id=charchannel0,fd=1729,server,nowait \
+-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
 -device usb-tablet,id=input0,bus=usb.0,port=1 \

diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
index d4b4f05f957646406166f49644bbf7b9f17a1ccb..fe25594c92ea47b60fbaa1e31e612048c8d05d66 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
@@ -35,7 +35,7 @@ memory-backend=mach-virt.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -61,7 +61,7 @@ id=virtio-disk0,bootindex=1 \
 addr=0x0 \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
--chardev socket,id=charchannel0,fd=1729,server,nowait \
+-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.5,addr=0x0 \

diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.args b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
index 15fb5f319e3ba44c4d9ccc21e904f96d4b129a19..832332307c66539b1f0bc7cdcf4e56565ba16aee 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
index cf39101b8d90b9efe6053cf181b5b4fc181bb91b..0a7a4ae98c842a07839a8ce0459b88353d3e84e7 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
index 7ed55510c4adad2f74119d540a12550b495fe67d..b6e72fe8eaa45003742b60b0e8118fc0eff7d284 100644 (file)
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/acpi-table.args b/tests/qemuxml2argvdata/acpi-table.args
index 13218881c35573fa20643efa21112e062ab0bbbd..0d4b91e578af0e1558dac15fcb776fe53c78fe0f 100644 (file)
--- a/tests/qemuxml2argvdata/acpi-table.args
+++ b/tests/qemuxml2argvdata/acpi-table.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
index d6143c5e5dd957f7177fba4b3b54754f6ebba2db..1c5817fb1b3750c170af36225d921b40a5154f55 100644 (file)
--- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
index c1a9fd84f34de61505627bf93ae10c8a7fdbf64e..35dd2c8bbde78d7fbe49b75155ff5d7237337277 100644 (file)
--- a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
index 0a9ff6b7d0df00d85625255a9c58b7b994b4ddd3..8fe3f911b4eeb87ff3db94e2fca3f8b548425c16 100644 (file)
--- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.args b/tests/qemuxml2argvdata/arm-virt-virtio.args
index 75ca00f779c87d35c8a20c5a742452d2f6894419..afb5c1b5e168236f699474a8cef103f3fa89d227 100644 (file)
--- a/tests/qemuxml2argvdata/arm-virt-virtio.args
+++ b/tests/qemuxml2argvdata/arm-virt-virtio.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata/autoindex.args
index 7cdca083ced0ff8d2021bc20c3f991853c3e4274..8a736b296420b5943c14a50df2f18680cd6bd5be 100644 (file)
--- a/tests/qemuxml2argvdata/autoindex.args
+++ b/tests/qemuxml2argvdata/autoindex.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.args b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
index 2b4e280686fa56b8d22e661074391a0198ae7cda..243e123d8aeefcef828fa418fc15812052b70c52 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-ccw-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxml2argvdata/balloon-device-auto.args
index 60253f43ec6e495558d004e3a22e50194b3fde10..b2aebf53027b70aa316c4cf7f6d3ce2ce869b5cb 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/balloon-device-auto.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
index e81db15972876ce2ae21c5b3fa794e59a2dc299e..faed586dc28844da26104b17fb053a5b21df2f53 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qemuxml2argvdata/balloon-device-deflate.args
index 3aa255187b1bebea13152589f14b951888016cfa..bfe8b301f37b407642a1f5719aa2f23780beac26 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-device-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemuxml2argvdata/balloon-device-period.args
index 8a6cc8dec52d3a94dee2de7390701965b9383a1b..74e45da6b2c1a3513b7d8463cf3bfb40e4a3b677 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-device-period.args
+++ b/tests/qemuxml2argvdata/balloon-device-period.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2argvdata/balloon-device.args
index 8a6cc8dec52d3a94dee2de7390701965b9383a1b..74e45da6b2c1a3513b7d8463cf3bfb40e4a3b677 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-device.args
+++ b/tests/qemuxml2argvdata/balloon-device.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.args b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
index 33f480e2a4ce3d874bd0cc9c41f1e8292de0aae2..5e25c78b1e860b7c8772912645c802bf42f28363 100644 (file)
--- a/tests/qemuxml2argvdata/balloon-mmio-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args b/tests/qemuxml2argvdata/bios-nvram-secure.args
index 6627d90bf72e01cb6de3acd40d98810663c7ef0e..0fe52c2e6fd3e275f20b28d075fce862445e21ef 100644 (file)
--- a/tests/qemuxml2argvdata/bios-nvram-secure.args
+++ b/tests/qemuxml2argvdata/bios-nvram-secure.args
@@ -23,7 +23,7 @@ readonly=on \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test-bios/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/bios-nvram.args b/tests/qemuxml2argvdata/bios-nvram.args
index 45e2a7a5a5f3ca3c4910a656c046dac99a8d0b6d..2e293a04347cc7632d886fccf342a62c1ca14d8a 100644 (file)
--- a/tests/qemuxml2argvdata/bios-nvram.args
+++ b/tests/qemuxml2argvdata/bios-nvram.args
@@ -22,7 +22,7 @@ readonly=on \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test-bios/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/bios.args b/tests/qemuxml2argvdata/bios.args
index 6b636575b149982cc2a9a3666094692787f51f0c..55fb7de312346c22ff517a10cb40b9af4a98c4d9 100644 (file)
--- a/tests/qemuxml2argvdata/bios.args
+++ b/tests/qemuxml2argvdata/bios.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -nodefaults \
 -device sga \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test-bios/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args
index 8aa4c2be7d9fd2a3d63c9ad20a42c46121ac6fed..4e04deec3c2d28bde21ea6c3baacee0569a56eee 100644 (file)
--- a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args
index 79012e5b60836cad1c7c971e996010093488fe61..f62ddf9bc7e7be87bc61f9b00c8d66f860ebed6e 100644 (file)
--- a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args
index b8416ef3b078dcaf87a6f78b598086da22b80096..6cffe5ccfe1ae4f897bc6a30b84f7c11d8aed553 100644 (file)
--- a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args
index 79012e5b60836cad1c7c971e996010093488fe61..f62ddf9bc7e7be87bc61f9b00c8d66f860ebed6e 100644 (file)
--- a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args
index b03fe20d3086d779fc06e88d0ec612bef9392bc6..4f68063cd28eaf3af62c4b92ee018fc02267910e 100644 (file)
--- a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args
index 79012e5b60836cad1c7c971e996010093488fe61..f62ddf9bc7e7be87bc61f9b00c8d66f860ebed6e 100644 (file)
--- a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.args
index 60253f43ec6e495558d004e3a22e50194b3fde10..b2aebf53027b70aa316c4cf7f6d3ce2ce869b5cb 100644 (file)
--- a/tests/qemuxml2argvdata/blkiotune-device.args
+++ b/tests/qemuxml2argvdata/blkiotune-device.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata/blkiotune.args
index 60253f43ec6e495558d004e3a22e50194b3fde10..b2aebf53027b70aa316c4cf7f6d3ce2ce869b5cb 100644 (file)
--- a/tests/qemuxml2argvdata/blkiotune.args
+++ b/tests/qemuxml2argvdata/blkiotune.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/boot-cdrom.args b/tests/qemuxml2argvdata/boot-cdrom.args
index c5d66e7b827853b49cfcd5a11fa2fa231fd569bb..00c6e37ccc54923b883e163c63ed99096c9cb3a7 100644 (file)
--- a/tests/qemuxml2argvdata/boot-cdrom.args
+++ b/tests/qemuxml2argvdata/boot-cdrom.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/boot-complex.args b/tests/qemuxml2argvdata/boot-complex.args
index 0fbfc3c242cbecf3cd291e4501da19f3e5f9f17a..616ccbc619323861e7ffbb85d21df79453af5531 100644 (file)
--- a/tests/qemuxml2argvdata/boot-complex.args
+++ b/tests/qemuxml2argvdata/boot-complex.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.args b/tests/qemuxml2argvdata/boot-floppy-q35.args
index cfc396cba6a921c97b869065cd9b3dc194effaf2..4d975e4e3948b6ef66670edbaad96a07f9c3377f 100644 (file)
--- a/tests/qemuxml2argvdata/boot-floppy-q35.args
+++ b/tests/qemuxml2argvdata/boot-floppy-q35.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/boot-floppy.args b/tests/qemuxml2argvdata/boot-floppy.args
index a2b70dc96a6f95f6dbed797ffa0d49daa1de8475..c929e56780dd6c1247061008a2a62fd6a9da7c1f 100644 (file)
--- a/tests/qemuxml2argvdata/boot-floppy.args
+++ b/tests/qemuxml2argvdata/boot-floppy.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
index f3e2c9753750fb34032c350479e667eab0e3da09..90341e654f8dca98b495aa3d8f4ff2e0f0a83c9f 100644 (file)
--- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args b/tests/qemuxml2argvdata/boot-menu-disable.args
index f3e2c9753750fb34032c350479e667eab0e3da09..90341e654f8dca98b495aa3d8f4ff2e0f0a83c9f 100644 (file)
--- a/tests/qemuxml2argvdata/boot-menu-disable.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
index 4df0ae4624a1ed32dc853d8235fb383451cf4f08..d58d292c26eba6a891a06a257d1c528783130273 100644 (file)
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args b/tests/qemuxml2argvdata/boot-menu-enable.args
index 83b4fbde440892994619351e0ce829f60a6196f0..73bc9caee9cb0f9e6a0a0b6519f9e150f1b96f49 100644 (file)
--- a/tests/qemuxml2argvdata/boot-menu-enable.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/boot-multi.args b/tests/qemuxml2argvdata/boot-multi.args
index 83b4fbde440892994619351e0ce829f60a6196f0..73bc9caee9cb0f9e6a0a0b6519f9e150f1b96f49 100644 (file)
--- a/tests/qemuxml2argvdata/boot-multi.args
+++ b/tests/qemuxml2argvdata/boot-multi.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/boot-network.args b/tests/qemuxml2argvdata/boot-network.args
index 9ca3f75df3a1a30b4f6cbd165eae2590b77d20c7..a8487d67dc2df4aafd54702f15b3a00c9921231d 100644 (file)
--- a/tests/qemuxml2argvdata/boot-network.args
+++ b/tests/qemuxml2argvdata/boot-network.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdata/boot-order.args
index 57d4b88989e2798b6f6dce0a9308adaef1919ee6..10aa34abf5e5d123d37102e394f71efc2d01cfbf 100644 (file)
--- a/tests/qemuxml2argvdata/boot-order.args
+++ b/tests/qemuxml2argvdata/boot-order.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/boot-strict.args b/tests/qemuxml2argvdata/boot-strict.args
index 827814cbb9f4b9b3a4f4570752e795d580dce038..5681863d3e98300560e9518f157fa18b4914f5b8 100644 (file)
--- a/tests/qemuxml2argvdata/boot-strict.args
+++ b/tests/qemuxml2argvdata/boot-strict.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args
index 0338d0c5e342cf4e33f2ccb777aa4a08d5d7db48..19d1aa5563552b3e773898f7f747aca1bb48692a 100644 (file)
--- a/tests/qemuxml2argvdata/channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/channel-guestfwd.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.args
index adb770727033159c94a9df8ea5f5aeb0715c2717..e82da078e80b75ef185b31023f7908e36ddcc0b9 100644 (file)
--- a/tests/qemuxml2argvdata/channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/channel-spicevmc.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
index bbaa384ff2a7f8302689d497a46d2a821c6567b3..88d492b2eac0b3832e126c1a8063c86b9cfaa65c 100644 (file)
--- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
@@ -19,14 +19,15 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--chardev socket,id=charchannel0,path=/tmp/guestfwd-listen.socket,server,nowait \
+-chardev socket,id=charchannel0,path=/tmp/guestfwd-listen.socket,server=on,\
+wait=off \
 -netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=channel0 \
 -chardev socket,id=charchannel1,path=/tmp/guestfwd-connect.socket \
 -netdev user,guestfwd=tcp:10.0.2.1:4601-chardev:charchannel1,id=channel1 \

diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args
index f500bfe2aecdec002673e61ffa5017e7b2b32499..14f0987cf6631881c9c7a7aa8bf3508cfe543d39 100644 (file)
--- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args
@@ -22,14 +22,14 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--chardev socket,id=charchannel0,fd=1729,server,nowait \
+-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
 -netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=channel0 \
 -chardev socket,id=charchannel1,path=/tmp/guestfwd-connect.socket \
 -netdev user,guestfwd=tcp:10.0.2.1:4601-chardev:charchannel1,id=channel1 \

diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.args
index e7d6531021a59210aac53e09338353d5d908a984..197f0c3de5f516bf4efec6becfae8e40164a9bd8 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/channel-virtio-auto.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
index 9daac162d03a195a3a7abba717979a49ba911a8f..8141cd5acbcb70336c336d89538a3d3201d6b8e7 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
index 67d16620965d140dcc54b2e8b7fef211d61fc6de..e3d5ed1629308745972f72906ac0a88a15cb5e04 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qemuxml2argvdata/channel-virtio-default.args
index f3e0f591be5abbd00a6d8c136f2d4287d1000325..6e94be9793e50ff06cde4bd013f43b195c0606ad 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-default.args
+++ b/tests/qemuxml2argvdata/channel-virtio-default.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemuxml2argvdata/channel-virtio-state.args
index 38a9f41b1ef21232550064cabfaebea3bbb12672..78c351360313e9f3efb8f9b2bc8d7ec447bf610c 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-state.args
+++ b/tests/qemuxml2argvdata/channel-virtio-state.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxml2argvdata/channel-virtio-unix.args
index fd42b897fd2da5a02f79c2450cb01b4a11cefa9a..3e0383c795d035f07741c7617da40ef6c40a39ec 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio-unix.args
+++ b/tests/qemuxml2argvdata/channel-virtio-unix.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -30,18 +30,19 @@ server,nowait \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev socket,id=charchannel0,\
-path=/tmp/channel/domain--1-QEMUGuest1/org.qemu.guest_agent.0,server,nowait \
+path=/tmp/channel/domain--1-QEMUGuest1/org.qemu.guest_agent.0,server=on,\
+wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
 -chardev socket,id=charchannel1,\
-path=/tmp/channel/domain--1-QEMUGuest1/vioser-00-00-02.sock,server,nowait \
+path=/tmp/channel/domain--1-QEMUGuest1/vioser-00-00-02.sock,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,\
 id=channel1 \
 -chardev socket,id=charchannel2,path=/tmp/channel/domain--1-QEMUGuest1/ble,\
-server,nowait \
+server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=3,chardev=charchannel2,\
 id=channel2,name=ble \
 -chardev socket,id=charchannel3,path=/tmp/channel/domain--1-QEMUGuest1/fdsa,\
-server,nowait \
+server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=4,chardev=charchannel3,\
 id=channel3,name=fdsa

diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2argvdata/channel-virtio.args
index 1d22c3633fed407bf8b9daba5ca9abc86910b30e..13d416fbf0be7abdaf139aa02bf0fa0130c3b086 100644 (file)
--- a/tests/qemuxml2argvdata/channel-virtio.args
+++ b/tests/qemuxml2argvdata/channel-virtio.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2argvdata/chardev-reconnect.args
index 851052d5a52769898bb5723628623318e847303d..e50ba18cb5ade9fb367c7e971ba7ec2e8a194de7 100644 (file)
--- a/tests/qemuxml2argvdata/chardev-reconnect.args
+++ b/tests/qemuxml2argvdata/chardev-reconnect.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argvdata/clock-catchup.args
index 4cf109a0e81c5c9dc2c779ae1c729e5e35577660..217f61a4a1ff70dacad0c4de417daeed421aef29 100644 (file)
--- a/tests/qemuxml2argvdata/clock-catchup.args
+++ b/tests/qemuxml2argvdata/clock-catchup.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,driftfix=slew \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvdata/clock-france.args
index f814906c018a6eef4ba74bc010f39175c3c07796..54015426c8990eda0b439db2c2dd1c85b70fbba3 100644 (file)
--- a/tests/qemuxml2argvdata/clock-france.args
+++ b/tests/qemuxml2argvdata/clock-france.args
@@ -20,7 +20,7 @@ TZ=Europe/Paris \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=localtime \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2argvdata/clock-hpet-off.args
index 89e510e977658e024b6685d272439e4b81c63a19..8235dac4bfa018dbcfbcb912c0bcde577084d84d 100644 (file)
--- a/tests/qemuxml2argvdata/clock-hpet-off.args
+++ b/tests/qemuxml2argvdata/clock-hpet-off.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,driftfix=slew \
 -no-hpet \

diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
index 4b78d2ac23b4bdb9e745bc0aa3fd3b98acfdd9ec..79677ba15bd2198e02921ee40650abf2fbe4e33c 100644 (file)
--- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=2009-02-14T00:01:30 \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2argvdata/clock-localtime.args
index e6f80f00859d9e3aef400c3eb4bb62a9d7149706..e4a239aff4535f12be34ec0cb2978531178f7615 100644 (file)
--- a/tests/qemuxml2argvdata/clock-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=localtime \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/clock-realtime.args b/tests/qemuxml2argvdata/clock-realtime.args
index bdff45bec8e01022bca8cd241bfc541961160e86..0db06be54b571768b7ba2633d278341f3d33a186 100644 (file)
--- a/tests/qemuxml2argvdata/clock-realtime.args
+++ b/tests/qemuxml2argvdata/clock-realtime.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,clock=rt \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
index fd6098b8e17e2fddf76c6ffdeff62f4b593a240b..2a4dd152dd7d91c65123091eee20f206323f5eca 100644 (file)
--- a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
@@ -23,7 +23,7 @@ memory-backend=mach-virt.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
index cb96ffbef303f1a47270d27fbfdc7d11e21c404d..ad92525893d760e675cdf818060821aed4ea203d 100644 (file)
--- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata/clock-utc.args
index e38898e335ff059a6db24a8f108056f989643a8e..bc9d1adfc526f225a263c4e19ab6d023846734e9 100644 (file)
--- a/tests/qemuxml2argvdata/clock-utc.args
+++ b/tests/qemuxml2argvdata/clock-utc.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2argvdata/clock-variable.args
index 9fd990da1f768d494fb0cc484c24c231db9169f1..c4a01fc7874ba59f23d4438605ee6a693dd98a3e 100644 (file)
--- a/tests/qemuxml2argvdata/clock-variable.args
+++ b/tests/qemuxml2argvdata/clock-variable.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=2009-02-15T09:49:06 \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/console-compat-auto.args b/tests/qemuxml2argvdata/console-compat-auto.args
index 4d6d6e376cc5aac1dc1f271b486ad73c6ec91636..92804e504666e47f4ce22b46431dca44ec8ab5fd 100644 (file)
--- a/tests/qemuxml2argvdata/console-compat-auto.args
+++ b/tests/qemuxml2argvdata/console-compat-auto.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args b/tests/qemuxml2argvdata/console-compat-chardev.args
index 4d6d6e376cc5aac1dc1f271b486ad73c6ec91636..92804e504666e47f4ce22b46431dca44ec8ab5fd 100644 (file)
--- a/tests/qemuxml2argvdata/console-compat-chardev.args
+++ b/tests/qemuxml2argvdata/console-compat-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/console-compat.args b/tests/qemuxml2argvdata/console-compat.args
index 8a6d72fb6e9f794c62b390f45adaf9eb8b693321..dd23b463303c203bdc9b1b8d0d1925419ab1cf08 100644 (file)
--- a/tests/qemuxml2argvdata/console-compat.args
+++ b/tests/qemuxml2argvdata/console-compat.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/console-sclp.args b/tests/qemuxml2argvdata/console-sclp.args
index 73965531fd36b0e66ab79426a01718fc60652162..4ec67afabfbe77cbde06f3728ddbc3352d867ad8 100644 (file)
--- a/tests/qemuxml2argvdata/console-sclp.args
+++ b/tests/qemuxml2argvdata/console-sclp.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.args b/tests/qemuxml2argvdata/console-virtio-ccw.args
index ab9e1c187e9b9588bdd262141dbca0b487f64f68..0a0ba3a6bef8db80bf799fbacbfad8d0a4475f39 100644 (file)
--- a/tests/qemuxml2argvdata/console-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/console-virtio-ccw.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxml2argvdata/console-virtio-many.args
index ec81652e2077d42aeff00b8d9386e30489719475..87c11b2f87d9fe0bfff1ccea0860b28f3e6bee0f 100644 (file)
--- a/tests/qemuxml2argvdata/console-virtio-many.args
+++ b/tests/qemuxml2argvdata/console-virtio-many.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/console-virtio-s390.args b/tests/qemuxml2argvdata/console-virtio-s390.args
index 7357923e371068d2260a42d9cd9601104c7e08da..f2ee592de27fd31fe6426d443d521f16867f04ec 100644 (file)
--- a/tests/qemuxml2argvdata/console-virtio-s390.args
+++ b/tests/qemuxml2argvdata/console-virtio-s390.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
index 648dc7493e2b4f93d2b15ddc445b81d0e296123c..c14318bf94f267b391242e0e874579465222a753 100644 (file)
--- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -27,7 +27,7 @@ server,nowait \
 -boot strict=on \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
--chardev socket,id=charconsole0,path=/tmp/listen.socket,server,nowait \
+-chardev socket,id=charconsole0,path=/tmp/listen.socket,server=on,wait=off \
 -device virtconsole,chardev=charconsole0,id=console0 \
 -chardev socket,id=charconsole1,path=/tmp/connect.socket \
 -device virtconsole,chardev=charconsole1,id=console1 \

diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args
index 5e645989599b37259223aab2face6e5082871622..3fbb87dea1361a33fb6d24588b8d0cfda6fac1f0 100644 (file)
--- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -30,7 +30,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -boot strict=on \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
--chardev socket,id=charconsole0,fd=1729,server,nowait \
+-chardev socket,id=charconsole0,fd=1729,server=on,wait=off \
 -device virtconsole,chardev=charconsole0,id=console0 \
 -chardev socket,id=charconsole1,path=/tmp/connect.socket \
 -device virtconsole,chardev=charconsole1,id=console1 \

diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2argvdata/console-virtio.args
index 30a47a915ba6b4d437a6946ef352d9ad6389c42f..029c5a00b0aa5b5a076f0a30956b2bddafe20fae 100644 (file)
--- a/tests/qemuxml2argvdata/console-virtio.args
+++ b/tests/qemuxml2argvdata/console-virtio.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2argvdata/controller-order.args
index ff88df04d82246015395d1b7ad71f29611d1900c..d79f752003091e1ef46a19274882d2a61b36c46c 100644 (file)
--- a/tests/qemuxml2argvdata/controller-order.args
+++ b/tests/qemuxml2argvdata/controller-order.args
@@ -17,8 +17,8 @@ QEMU_AUDIO_DRV=spice \
 -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fdr/monitor.sock,server,\
-nowait \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fdr/monitor.sock,\
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
index 1d7583b98169fed33854e9976f3a562f8e0d1f33..7f7c2df76211f3ba53e518220898a83308f168ad 100644 (file)
--- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
index 3cb634d0c7ffdd2a02b8d3089b8a4aac96322396..652aa0ff9357dcb0a2966d7fb312ab7d42a2fdf9 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvdata/cpu-Haswell.args
index a33b16f7ce9070c4f286c6c95d1cefdea49cd8e0..02f0b6338fe6685cde4eadadecfa87b8699a581d 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-Haswell.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args b/tests/qemuxml2argvdata/cpu-Haswell2.args
index 4e989ed2f5e397baea6207ac9476d3d0c7198242..269a4f5fe0990f2b81e4059fb70cf11ef29b8ec5 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-Haswell2.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell2.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args b/tests/qemuxml2argvdata/cpu-Haswell3.args
index d35de5ea58f07c0f0dffb9a824487a2dac89685f..fb31815d8f917f35c66fc84efc93176c4e14a022 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-Haswell3.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell3.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args
index b69bfe0f0fa20583d6c2e95a325bf222bc874bf4..0bfb73fa5ff6732cd06dab320454758d8d246c9e 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args
+++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-test/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
index 64f223bee342f71fa6a4dc72bb3fcf395ca2b7c2..2444404ddcaa28492a641cc996fb7c2f4a7f6bbb 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-test/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args b/tests/qemuxml2argvdata/cpu-cache-disable.args
index 03347b66cce94272ffd3ae9cc88fb845158165cc..273b3e9d9db3cc7cc2da4a7db6ee5494ebf04b02 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-cache-disable.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable.args
@@ -19,8 +19,8 @@ QEMU_AUDIO_DRV=none \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,server,\
-nowait \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,\
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-cache-disable2.args b/tests/qemuxml2argvdata/cpu-cache-disable2.args
index 375b00cc67b296626f0f316b7e2b0a088f81aac4..b6a3948786828bfb1c09667761ce9db858bc06eb 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-cache-disable2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable2.args
@@ -19,8 +19,8 @@ QEMU_AUDIO_DRV=none \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,server,\
-nowait \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,\
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args b/tests/qemuxml2argvdata/cpu-cache-disable3.args
index b597da4d6f4f98d3e286b836df95966e09fb4bc8..14efec48e0dfe5aa8ad5eeda845f1c3f92197f5c 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-cache-disable3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args
@@ -20,8 +20,8 @@ QEMU_AUDIO_DRV=none \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,server,\
-nowait \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,\
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
index 3d2a4baa51856691327386a5d804bcfa124bb436..feb50db32378583c039415ca4949c36c66a758fc 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
@@ -19,8 +19,8 @@ QEMU_AUDIO_DRV=none \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,server,\
-nowait \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,\
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
index 5bb2269b34635a9a2699db2663f192995f7d2513..41f232cf88636019c8b864bed04a7a1c4626b8c7 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
@@ -19,8 +19,8 @@ QEMU_AUDIO_DRV=none \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,server,\
-nowait \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,\
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
index 9ddad45b9f680527fef2ea155b277fb23fa4f031..6d67e992fab44a7bfd80d659cb808213abd42b3a 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
@@ -19,8 +19,8 @@ QEMU_AUDIO_DRV=none \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,server,\
-nowait \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,\
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args b/tests/qemuxml2argvdata/cpu-check-default-none.args
index 14b02d5dbdd696a4adf9a52eeb27e72dac8e1c3d..c659f4cd44df4880c7053241bc2d3df0aa6a9cbe 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-check-default-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args b/tests/qemuxml2argvdata/cpu-check-default-none2.args
index b24a74e54c609e88b493b6e65c47b04222e3b082..6b5fbf579d20825a7ddbc4c4e2c92c31a4f908f2 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-check-default-none2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args b/tests/qemuxml2argvdata/cpu-check-default-partial.args
index f215c45fad449134e39fed173d9351b78866b782..577d96ee7d937c86e9cf6eb54ea9d5afb5ec0ca7 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-check-default-partial.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
index 1e4af63dc30e47285fbc04d5d99489145eb4e45e..835f8b619ecc528b3710f4b3565c791611ecc2ba 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-check-none.args b/tests/qemuxml2argvdata/cpu-check-none.args
index 1e4af63dc30e47285fbc04d5d99489145eb4e45e..835f8b619ecc528b3710f4b3565c791611ecc2ba 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-check-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-none.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.args b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
index 786f9b693cf218d932fd4494b7d62f68f8b11dab..d263912b2b5a47053a65f81c685136c25a70855a 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.args b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
index 90bacb02242eeef814d9eee9dfe722118169769f..e8cc858e03397f29700e3afb48a50a4391c4add0 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-exact1.args b/tests/qemuxml2argvdata/cpu-exact1.args
index a2e4dcaf91154756d9c3a1c03a839822078cabdf..18795ece2eedd865ab4edf5af15ffa877435b826 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-exact1.args
+++ b/tests/qemuxml2argvdata/cpu-exact1.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
index 93f178751bbaec8c3e90aba47efec5679a09c1f6..33637d8eae68daac7dd030d33868d241edfea50a 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
+++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-exact2.args b/tests/qemuxml2argvdata/cpu-exact2.args
index 93f178751bbaec8c3e90aba47efec5679a09c1f6..33637d8eae68daac7dd030d33868d241edfea50a 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-exact2.args
+++ b/tests/qemuxml2argvdata/cpu-exact2.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-fallback.args b/tests/qemuxml2argvdata/cpu-fallback.args
index 40e0246031d42c734cefe6a44b6bdb0c8df71b92..87e3972aff58890257ffe14394056191a3e30360 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-fallback.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
index 23cb82113afcb530843c2dbcacecf90b545cf52d..57ea49fc5da94d55e93f1d870f36d6847c5c6561 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
index 42f969fd62ef131228e0aa39cae55aeb46cb9061..db005d25cb665f847da6b9c3e710fa8627cce9d9 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
index 017e7a6c060bc4365f03a60c0c4f87031e7776ef..96ea4641368b37d80fdccbf53149e61f6f3038dd 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
@@ -24,7 +24,7 @@ misalignsse=off,3dnowprefetch=off,osvw=off,topoext=off,nrip-save=off \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
index 5f38b72f9265542e07c2afcc70f0c2ab542a75d4..dc1ab5505a9daaf4ebcc0e9cbcca15516fff88ee 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
index 8ba238de3c40413596e1dc4c8e3aa750a999ff0d..a0f73ab1dc32cf97f1a176f83a2b04e94c83055c 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-host-model.args b/tests/qemuxml2argvdata/cpu-host-model.args
index 32e192421f1be2bc8a146b3bfa84f1772536e9f1..0abcc2f50ef16603ccee04999df4d0eaa63ceed1 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-model.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
index a4de9d3de9f7363a0a2c56483f1e01ef029a99a7..98bfe76fd8e7cade691f144ce51548ad54503b8e 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args b/tests/qemuxml2argvdata/cpu-host-passthrough.args
index 14b02d5dbdd696a4adf9a52eeb27e72dac8e1c3d..c659f4cd44df4880c7053241bc2d3df0aa6a9cbe 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-host-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.args b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
index 78c03cfad5284b2a43113add58375cc1e212c3c8..d8bf6dc49107555786a4f71a5f1b615e9e5d1630 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-hotplug-startup.args
+++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvdata/cpu-kvmclock.args
index 39d368a35964b0fe01f1dc24458d9d450c61403e..a3c572b36c5d478d8532dae50c1b040ee0c86972 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-kvmclock.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args b/tests/qemuxml2argvdata/cpu-minimum1.args
index 8246efd5634c1b65633ec0a0e81714f00521e83a..04eb6fd37a4723235bcccddd9aa79deb3821412e 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-minimum1.args
+++ b/tests/qemuxml2argvdata/cpu-minimum1.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args b/tests/qemuxml2argvdata/cpu-minimum2.args
index 900d7486a68fbdd8ecdf83b28de14ea8d954fdb8..01663b1d908404ed40b5631e5319855131d817cc 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-minimum2.args
+++ b/tests/qemuxml2argvdata/cpu-minimum2.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args b/tests/qemuxml2argvdata/cpu-no-removed-features.args
index 1e4af63dc30e47285fbc04d5d99489145eb4e45e..835f8b619ecc528b3710f4b3565c791611ecc2ba 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-no-removed-features.args
+++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
index 79ee74718443da0c4319aaa32aa7dc57e9f384a9..48acab53e278cc5b224cb48301bb43ee34f67be2 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args
+++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args b/tests/qemuxml2argvdata/cpu-numa-memshared.args
index 8e214189db038c201dc7b0ed8fcf381ca56efeaf..fa029c9314fbc75a3564098efe7e6bf6aa2311a3 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-numa-memshared.args
+++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args
@@ -27,7 +27,7 @@ size=112197632 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
index c7e403441fd31b4094f26810bfcd7d1679c52412..d4d2ea77f7094af5389576d9be69f85f96fe5cad 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
+++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-numa1.args b/tests/qemuxml2argvdata/cpu-numa1.args
index c7e403441fd31b4094f26810bfcd7d1679c52412..d4d2ea77f7094af5389576d9be69f85f96fe5cad 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-numa1.args
+++ b/tests/qemuxml2argvdata/cpu-numa1.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-numa2.args b/tests/qemuxml2argvdata/cpu-numa2.args
index c7e403441fd31b4094f26810bfcd7d1679c52412..d4d2ea77f7094af5389576d9be69f85f96fe5cad 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-numa2.args
+++ b/tests/qemuxml2argvdata/cpu-numa2.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-s390-features.args b/tests/qemuxml2argvdata/cpu-s390-features.args
index 97ad063a522fcead6014e4ca27d6ec784c375fe9..5ba59d545f67f2a72f77697b916e2e8cd801181c 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-s390-features.args
+++ b/tests/qemuxml2argvdata/cpu-s390-features.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown

diff --git a/tests/qemuxml2argvdata/cpu-s390-zEC12.args b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
index 3f035da711a095f47c887998fda19639f509c413..81b89cf78d142ee14103de022b26b30af6daf545 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-s390-zEC12.args
+++ b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown

diff --git a/tests/qemuxml2argvdata/cpu-strict1.args b/tests/qemuxml2argvdata/cpu-strict1.args
index ac174e8f51f54543a2851be63c55cbcd8dd93e62..29bc178886733184d943fc3188e4eb5e814ada55 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-strict1.args
+++ b/tests/qemuxml2argvdata/cpu-strict1.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-topology1.args b/tests/qemuxml2argvdata/cpu-topology1.args
index 56e4e8ee40a4c1a7c4607ebceed30a7582dd3410..7472baecf0d273fe23747654b32b9d9c27924447 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-topology1.args
+++ b/tests/qemuxml2argvdata/cpu-topology1.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-topology2.args b/tests/qemuxml2argvdata/cpu-topology2.args
index ac99ae3f5834baf830abbea63f8f873519b012ab..733d02a00f2f670e69535a629cc3cbd5c7529c17 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-topology2.args
+++ b/tests/qemuxml2argvdata/cpu-topology2.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-topology3.args b/tests/qemuxml2argvdata/cpu-topology3.args
index 56e4e8ee40a4c1a7c4607ebceed30a7582dd3410..7472baecf0d273fe23747654b32b9d9c27924447 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-topology3.args
+++ b/tests/qemuxml2argvdata/cpu-topology3.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args
index f8e19fca2433097edb53a158964c82cd4294413a..c0998475b577a9901237c752dc2b9b2e62a8e4d5 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args
@@ -23,7 +23,7 @@ kvm_pv_unhalt=on \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args
index 84c0d05b3455a93ebfd42faf8645a830a4c0b633..d2e13311873f52559e821187ccbfaaa92c709cb9 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args
@@ -24,7 +24,7 @@ kvm-pv-unhalt=on \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
index 55b72b4404604f7db1cde511504d1f683eae56df..9572833bcd036d7297b608c11f4276356831832e 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
+++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
@@ -22,7 +22,7 @@ tsc-frequency=3504000000 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
index b0e6d05b6cc2b41da1fa68a1a70e1077d2c945b8..0755272fe44d679fe770547f455d844a7b17ab8d 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
@@ -23,7 +23,7 @@ tsc-frequency=3504000000 \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args
index 16a4282ab1f13cdb0ac7566bcb162804723e6fb0..628ca2680aa37d3c3ee5f6cbf3abba816ce2e22b 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args
@@ -25,7 +25,7 @@ tsc-frequency=4567890000 \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args
index 0ec8ba038da73c82f1904e4d5b41ab01d573cce9..38c152503685596a3c5ea5a8416ba1528721019b 100644 (file)
--- a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cputune-numatune.args b/tests/qemuxml2argvdata/cputune-numatune.args
index 787d5879b5eef4781c5bef0e456cdf88b077ef85..6ce724cb74cc54adf12dae5a53c666fda84d8566 100644 (file)
--- a/tests/qemuxml2argvdata/cputune-numatune.args
+++ b/tests/qemuxml2argvdata/cputune-numatune.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-dummy2/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args b/tests/qemuxml2argvdata/cputune-zero-shares.args
index 7270aafeb73dfc99cbaf24a40b0061cec4c53574..b5e316a9a61c930607abc27936d1b076c894230a 100644 (file)
--- a/tests/qemuxml2argvdata/cputune-zero-shares.args
+++ b/tests/qemuxml2argvdata/cputune-zero-shares.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/cputune.args
index 7270aafeb73dfc99cbaf24a40b0061cec4c53574..b5e316a9a61c930607abc27936d1b076c894230a 100644 (file)
--- a/tests/qemuxml2argvdata/cputune.args
+++ b/tests/qemuxml2argvdata/cputune.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/debug-threads.args b/tests/qemuxml2argvdata/debug-threads.args
index d73625e94e31d6d7446f34ec9891af0931933735..ea5e585527178ee16508904186c24299414a28aa 100644 (file)
--- a/tests/qemuxml2argvdata/debug-threads.args
+++ b/tests/qemuxml2argvdata/debug-threads.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args b/tests/qemuxml2argvdata/default-kvm-host-arch.args
index 2a4fc70f67ce10ba4387fe133ca31503572cf71c..61a45c854182c304e30779be812fe60a10244351 100644 (file)
--- a/tests/qemuxml2argvdata/default-kvm-host-arch.args
+++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args
@@ -18,8 +18,8 @@ QEMU_AUDIO_DRV=none \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-kvm/monitor.sock,server,\
-nowait \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-kvm/monitor.sock,\
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args b/tests/qemuxml2argvdata/default-qemu-host-arch.args
index f9e7398a12ec131a4eaa1129a07965c03ac08302..8bd5c67bbe31aff9dded9bb1b61b959c1605c5ca 100644 (file)
--- a/tests/qemuxml2argvdata/default-qemu-host-arch.args
+++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-qemu-host/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args
index 8a27403f92f31630a694ae1c6894a71a7df399e2..bcd6e534e405728188cb5aba3efa78919fd7d8fe 100644 (file)
--- a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args
@@ -21,7 +21,7 @@ memory-backend=mach-virt.ram \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args
index 7a491a6bd1573786b91f48e4be91f42cca79bbae..ead604874a5d471f39fa4394d13a651e089bd3e8 100644 (file)
--- a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args
@@ -22,7 +22,7 @@ memory-backend=ppc_spapr.ram \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args b/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args
index c4acaaff0f7292f866bfc2fa800900ccc492a72d..cc332b369b1bfa23e65a3f57e0b7f8b1df43e65f 100644 (file)
--- a/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args
+++ b/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args
@@ -19,7 +19,7 @@ file=/tmp/lib/domain--1-default-video-type-r/master-key.aes \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args
index 9eef70cf72fa51b301c20d45716421255b0d9630..2cbd533c5204b68b88f30780fec9fa46314ffc6f 100644 (file)
--- a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args
+++ b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args
@@ -27,7 +27,7 @@ cmm=on \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args b/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args
index 69c8742e956f2da81bddffda4e0dadafb34c0a0d..933cbdf37e60cb12aeccb6a197d5f1371a17dee2 100644 (file)
--- a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-aio.args b/tests/qemuxml2argvdata/disk-aio.args
index 1b4dffc84ccba701cbe6bfbc84e7e0264f6310cf..93daa6f86d8787c11b52b73494b8aaf1205205f7 100644 (file)
--- a/tests/qemuxml2argvdata/disk-aio.args
+++ b/tests/qemuxml2argvdata/disk-aio.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
index f8a89493f69990580482c7535fcdb0bf28348680..2bb3321c62b17b418a5c549611a5bcf8d066e7c6 100644 (file)
--- a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
index 6f9b81071a6357e32968fe67f3d45188c7459de2..a26086db2241fd88ef731ecedee3c882acda1f57 100644 (file)
--- a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args
index 3c2a7cf2408200eb3d08d3e37c06e36ef762dd2b..27f37fe3f29a5341cc5f6f61309e38c2b7358de7 100644 (file)
--- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args
+++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-armtest/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args
index c3007e147e17cdbb9425b857f42d70a8eb714ae2..fa1749e94fbce1357729d6d8760f3aa3e793acff 100644 (file)
--- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args
@@ -23,7 +23,7 @@ memory-backend=vexpress.highmem \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
index 47691339d6416dc5e23584490d9bf924494ac766..0919eedd21203412805b8367e079ca32be15e2e9 100644 (file)
--- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
index 0f6d70a855e8ec2c7041d553b0cdc2a0b8300dcc..927b338380e440a77498ab6c73b3dde33c5ee0b5 100644 (file)
--- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-blockio.args b/tests/qemuxml2argvdata/disk-blockio.args
index 72aa592fef1099c17acb201ef47769c077fcbb93..739a6191d98be8a1e4b4d6252f5fd052d9aa35a3 100644 (file)
--- a/tests/qemuxml2argvdata/disk-blockio.args
+++ b/tests/qemuxml2argvdata/disk-blockio.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.args b/tests/qemuxml2argvdata/disk-boot-cdrom.args
index c574cb02e6aeeb325f7817c5c516027365596df2..611b7d13e4d03e9ec28a4e4d9a89ab21a309fb9d 100644 (file)
--- a/tests/qemuxml2argvdata/disk-boot-cdrom.args
+++ b/tests/qemuxml2argvdata/disk-boot-cdrom.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-boot-disk.args b/tests/qemuxml2argvdata/disk-boot-disk.args
index 435ddd619448cc07cb62e05c5d612e00ca9ff4b9..02f22c87669b096640438e711975032a954da458 100644 (file)
--- a/tests/qemuxml2argvdata/disk-boot-disk.args
+++ b/tests/qemuxml2argvdata/disk-boot-disk.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
index 25360071e3458000ccf229a271f777bb50c5a45c..fba2716671c4bf0022645abcf21e3cdebd3157c2 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
index 538df9e5ca743f958c1440594777058b29909ecc..4044ee2170681c1788a44708f775b72ee2486ff3 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
index 9854454a7ee95ee7d5312bb661eed4b758f3b0d1..dcca8a081c875fe33118e2761e32f013f721dda1 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
index 3d034ae488ea6f5cc0c3d05db1f22202671d1676..5750b7025e9fa3bcee7634028e806b8559ea41b7 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
index c93e8d4653998b411c1fa53d717c523209becf14..d05b3689e5c9e21de733ffd3a2b2daeb25bf3013 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args
index a77a85194110f7d35f32a605d5528f0dd3710964..2daaec89b910912482ce962861c47cdde1434f3f 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args
index 94ffa9f9e481ca9093e47a0a2a97af6370d123f4..f386baf748b7a915aaf394cd849246356ffdc841 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.args b/tests/qemuxml2argvdata/disk-cdrom-network.args
index 53940d00764eef9ba9fcd1768e12296e5bd78029..5938b1c9f63bbf31028577828d0205ff307cdeff 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom-network.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-network.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
index ce885cb98acfa9d3e364efb2b73355ca72a8b941..a8fb9dfe98883eec529c7b5aaa7324cd905a3726 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
index 01444abcfec4932541b7f12ae501416554aa43be..83bc1901c2c08254f4b27584b49a77335c64a52b 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.args b/tests/qemuxml2argvdata/disk-cdrom-tray.args
index ff3f77962ea46b7aade5060ce86b8319c19b2b62..bccaa0087778ca6cc708532ba55bbcc46166c901 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom-tray.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-tray.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args
index 7952c42d0704b985980a56a114fc1d39735fc99a..91267645a382886b6fe1b161a8d1dea415557394 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-test/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args
index 4e4e0aa62a142fb4688f1b9d426daf0bf7d41b95..e3b6e4f510e06105698e595cb81532b1f0d56a80 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-test/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-cdrom.args b/tests/qemuxml2argvdata/disk-cdrom.args
index e506a4befec59db45eea7b2f8dc93702756d9d27..072ff48c0ebbda9fb9aab49b650f443b72c55b79 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom.args
+++ b/tests/qemuxml2argvdata/disk-cdrom.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
index 0621746a3b01a89609c093a58fe3935fce6574fb..8e36d356ee8a24b296a47cb98717addbd91159e4 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
index beac75ec1d757f8324f3813b6dbaae5877faa843..17794cb536350f16ed231b81b7e3a78da8f37126 100644 (file)
--- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.args b/tests/qemuxml2argvdata/disk-copy_on_read.args
index ca44c5981619e788e3a47f92089f5094589c3b60..62f8eb10f3084051a8f7137dc135d3129a4103e3 100644 (file)
--- a/tests/qemuxml2argvdata/disk-copy_on_read.args
+++ b/tests/qemuxml2argvdata/disk-copy_on_read.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args
index 00d5f45def042aab8dcae83571d78b9838d90b0d..e772ea7bbe8155e266114044a714ff161f213157 100644 (file)
--- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-test/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
index 493b478cf836b1f11d852281afab9a1fb047b4f3..627fe2147e73b12792c9799022c36bd605c0d4eb 100644 (file)
--- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-test/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.args b/tests/qemuxml2argvdata/disk-detect-zeroes.args
index 400a1b4957b3b9d61dfa4344ba84ff1160a5224b..6926876ffd4545f166308758c3a55b8318f08e13 100644 (file)
--- a/tests/qemuxml2argvdata/disk-detect-zeroes.args
+++ b/tests/qemuxml2argvdata/disk-detect-zeroes.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args
index 090cccdb5caaca725b94b83813266f869fa97d8b..4acae2fb9fc15d108ce3e432c1fa8e596f7f0804 100644 (file)
--- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-test/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args
index 97cc49225fb4842b621001ac47fb2e3cf6df736c..ca3fc6e26d052c26f086b6b101f8ddd7e28ff8f7 100644 (file)
--- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-test/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args b/tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args
index 4437922eee99e1f8acc260b15c9e4e7c906008b6..2190a23ccaee30db1cf8fc7c79fd3f58a416e4a4 100644 (file)
--- a/tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-test/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args b/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args
index 1aa06c7469ef57ac256214653ff26584e658933a..586f14070e4f00b8992094e05d07e154866dd3cf 100644 (file)
--- a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-test/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args
index 6b93b74ec1134cd96713f482d2f19dbdacc36229..ba2a4aa81f9cc650f08e84444fd94c3798a8a91f 100644 (file)
--- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args
index d75d7aca314a2e259e18e5555c7fbac004eb8f4e..60b15f269197a0739e100354d083bf9200e20c1a 100644 (file)
--- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args
+++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args
@@ -23,7 +23,7 @@ memory-backend=s390.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-error-policy.args b/tests/qemuxml2argvdata/disk-error-policy.args
index c339203e2e44b4d465dfef982f23c1920cf8a6e9..13a67d85a6aa9376fee6958904e1058efe6045e5 100644 (file)
--- a/tests/qemuxml2argvdata/disk-error-policy.args
+++ b/tests/qemuxml2argvdata/disk-error-policy.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args
index 26e8f56e58a4e4ff89a0f5c8404efc43a2b4408b..82f60b59503967f271f73d9d681ccf922396896f 100644 (file)
--- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args
index c0079efc0ae64164e20743d1702c04d8b8fe7dd9..62009933f5ffe0aa7c764f0e97c23266fca09af8 100644 (file)
--- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args
index b221718e291fe96945dd9aa994599f5240d092d9..5d8e5b5c9e77de7772698e8ace9f540706b22f24 100644 (file)
--- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
index 7e35f6a6cd8af42c73a04a14ec7ceb7957fce112..7f7c534bcd8f5c001273dc99b4b631a7eae97660 100644 (file)
--- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
@@ -23,7 +23,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args
index 51be45465e6f37030c7d63f7f3238a17fbfbf5d6..574c28929818b4ce6b1a50073876d5fa1f2e5c97 100644 (file)
--- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args
index 47ef5db35420db9597f0ce7be7ab9a0701e865af..85140acf18ce615ea506725eae775c8285e5a910 100644 (file)
--- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args
@@ -23,7 +23,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.args b/tests/qemuxml2argvdata/disk-floppy-tray.args
index e8a4472ebc6ab0abdbb017c227369275f1764674..c9ae35648360fb7c00c7762b8fe534255ebd6b3e 100644 (file)
--- a/tests/qemuxml2argvdata/disk-floppy-tray.args
+++ b/tests/qemuxml2argvdata/disk-floppy-tray.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-floppy.args b/tests/qemuxml2argvdata/disk-floppy.args
index 83ec46bb9d5384254e01c29ab3877e09c7db7c26..1b837b4b7876766fd1a28aa0f399f7de1f828877 100644 (file)
--- a/tests/qemuxml2argvdata/disk-floppy.args
+++ b/tests/qemuxml2argvdata/disk-floppy.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args
index d4f11f8ca093219cb0c1b72101ee1dabf6573a56..98b44e23e59673d6143bb3e563026ded43a1e314 100644 (file)
--- a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args
index 96756502dfb8bad703f08e29e3739d3c52b701b5..00c086dadd79d46a87631768ad71b9b8296f261b 100644 (file)
--- a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.args b/tests/qemuxml2argvdata/disk-fmt-qcow.args
index 9c24ce384f2485ab4085670e2057a96bdad58dd1..b2cc1e7605b2b7f9b0bba80ab0c98db327827607 100644 (file)
--- a/tests/qemuxml2argvdata/disk-fmt-qcow.args
+++ b/tests/qemuxml2argvdata/disk-fmt-qcow.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-geometry.args b/tests/qemuxml2argvdata/disk-geometry.args
index eefa7dc24e09f30913494884b72bb36d10d2f80e..229573c083cca36e109da2f2f70368fec2d1da8a 100644 (file)
--- a/tests/qemuxml2argvdata/disk-geometry.args
+++ b/tests/qemuxml2argvdata/disk-geometry.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-ide-split.args b/tests/qemuxml2argvdata/disk-ide-split.args
index c1a0cc7bfc988a770b13c56e88d36aa68348fcdf..57ad8bdbc0c5a6d60ba3839c95e427aaa8ae61e0 100644 (file)
--- a/tests/qemuxml2argvdata/disk-ide-split.args
+++ b/tests/qemuxml2argvdata/disk-ide-split.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.args b/tests/qemuxml2argvdata/disk-ide-wwn.args
index 939daad00d906042d9d45a0b19d8722f4a173c37..beb6bdb5eb3782c340f8fdf961932a90cdac751b 100644 (file)
--- a/tests/qemuxml2argvdata/disk-ide-wwn.args
+++ b/tests/qemuxml2argvdata/disk-ide-wwn.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.args b/tests/qemuxml2argvdata/disk-ioeventfd.args
index 2fc3562b164a08b0363c548cac2b7438f0276081..89811a61c26485ab5c20ccb976c0eff8dbc25588 100644 (file)
--- a/tests/qemuxml2argvdata/disk-ioeventfd.args
+++ b/tests/qemuxml2argvdata/disk-ioeventfd.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-iscsi.args b/tests/qemuxml2argvdata/disk-iscsi.args
index 9297e95127e9e2383c27c8bcaf61223f81de070d..d2d1d8d28e7dbb624e7b30826c581e5440a227bd 100644 (file)
--- a/tests/qemuxml2argvdata/disk-iscsi.args
+++ b/tests/qemuxml2argvdata/disk-iscsi.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args b/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args
index 3e520664ab65aab02320f953d91e94753bfb5f0a..60e133076a7b64f0a037b9f3b38e12d6728758f4 100644 (file)
--- a/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-gluster.args b/tests/qemuxml2argvdata/disk-network-gluster.args
index 7664284f7cbbbef2d20160df5241220d0364d11e..8e65b4cac9a2917016531337c4038dede5b39025 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-gluster.args
+++ b/tests/qemuxml2argvdata/disk-network-gluster.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args
index 2721147b3aa402ef49b94e2b9fa9df66f8948b9b..cf515bdf5c07951df6196f30e1689b78515fc35a 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args
index 1e992fb6d012ce89fd082acf2167306f3f1bdf88..4de81032b5fd39f658347604c69a4482f9ba9273 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
index 954f1824dd4b451ed93d3522214bd5098f9adb19..d8975ebe3d539527fb459b913324542272aca058 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
index 57eaeb40ee741dc0b8eb361627aae300d7d4ca0c..e7697a54890e177f8dbbe15674429b7be7174357 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.args b/tests/qemuxml2argvdata/disk-network-iscsi.args
index 53b3821ea7141b674722f8bfa1b9095b78b30a8c..51ac7aeb1e3f8b36c05974ba80dced8b71b69567 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-iscsi.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
index 930d8d5db2c0d730a46034be31103e5f03ae3992..134647d216a96e165ec3aa30f0590545890da2a1 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
index ab60fc5f4a12d5f76c9577c4bdf8c0fe1db35cfe..1a6f9507c7a5c87a70786e46442895d0cebcdf07 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-nbd.args b/tests/qemuxml2argvdata/disk-network-nbd.args
index 17576fe932e688af14d0af08ee4e9577aac4961f..43b4f935ac8cc5fec196794c06f96c997605aa17 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-nbd.args
+++ b/tests/qemuxml2argvdata/disk-network-nbd.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args
index 1742f01e256cf4763a0d43e4dadcfd9f2f12a9b6..fcff806d66417237af44eb6db37373aeb0f506fd 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args
index 5e5c23656a6e5dff660583ee79b715d220859f8d..0993dff3b02420ea415d5b9c4cde4186248799cf 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args
index b0bc83bfc06e760cef708d0cde6b3c7bc554a489..2387151bb8e68ceb7d20d56cb99447bed37a5af5 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
index 21d1c2deba2079a198aeaa2dc4242dce7b27a5b8..7dbdea09e8565397111fce9058310d803c4f2fac 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
index 50af3eb653c2fe7dca64098d228202dd72c1050a..08d273668341bb375c2cbb688d41555fb4a12517 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
index e91f009d35b50b328b925e07f8321b6cecc25aee..ff63722cb645c23fae3d0397bf54c62415a9439e 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.args b/tests/qemuxml2argvdata/disk-network-sheepdog.args
index cf832062bb64475be73f73d6fa2e226d1534e984..468da698efaca2f3341473ba43a80f7b25060d2a 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-sheepdog.args
+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
index 653fa1af4033dbeed247656b737fae947b024e4c..d5625535a0518cbb71429785f6f97b08465ece06 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
index 4418906dc771e3dbdb5448b76e12c15cbcfcdb29..a35fe0057a2b51d6eb0b95802e8f8776e6142b0f 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.args b/tests/qemuxml2argvdata/disk-network-source-auth.args
index 18d48b263f0ff439618788d7c83c9720f602a0b9..16c80201886dbe2ad8e38af5734fcc5c479d452c 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-source-auth.args
+++ b/tests/qemuxml2argvdata/disk-network-source-auth.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
index 0ccf3df10680babbdb0269f369dde31f71c7b82d..38daa58508bcfb7b1bfe8509570128d92e423d8d 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
index 879a52123c24abe98e5bca784bb2888172836605..0efbc386c36c6c1ffdfbf8e5e71fc2f947d55f47 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.args
index afe84fef3274f470aca56b44f0e270a8990d680c..a97c7398cec272708ce1bf7ffd7120b88c2395dd 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args
index 8ec4a8ab22172f721de97fa90411684a3a7fc7a3..24cebfe6a447eb66fa98bcdfbefc4937edabda76 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.args
index d778d3d704648374342760fff0dd6fe108f09a0e..e703875e357e1e92a0f14ccd59557770f923ae78 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args
index a21f322dfbbd72da8ce326e894d74bba0e95770c..7096aa935fec79d5d2752c27780b779e6ef0631a 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args
index 2a30ad02c9abb8518b8c8be35dec34763d46a453..a31efccd00ea038ffa00a01a4e6f209cf221c228 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
index ec4c28e161f6810410a88f61e838fbf119776f8c..6dc82878e8af19d2e016319f9ad85ae4664f0caa 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-network-vxhs.args b/tests/qemuxml2argvdata/disk-network-vxhs.args
index e59a760b96c9bb085d3d369b33b45dc85f616250..81c57d1be8968dbcee2b87a4f535cf15e28403ad 100644 (file)
--- a/tests/qemuxml2argvdata/disk-network-vxhs.args
+++ b/tests/qemuxml2argvdata/disk-network-vxhs.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-no-boot.args b/tests/qemuxml2argvdata/disk-no-boot.args
index 190129ea973da44ecb9db2c57882d0602b9afd45..cc3e03d8a89d48f4eb51e551e9efce765a8214f3 100644 (file)
--- a/tests/qemuxml2argvdata/disk-no-boot.args
+++ b/tests/qemuxml2argvdata/disk-no-boot.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args
index 3146ad12519825fa72ab28f14f9388e9c3a432d1..b5e171f1e9cff502af6b6fe112948be6d7dfd3d1 100644 (file)
--- a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-order.args b/tests/qemuxml2argvdata/disk-order.args
index d85c4017edb23fad6326ae9e81ba1634eea70c4d..9a94b8384af2580046357ce2a0f9ee033dac3aec 100644 (file)
--- a/tests/qemuxml2argvdata/disk-order.args
+++ b/tests/qemuxml2argvdata/disk-order.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.args b/tests/qemuxml2argvdata/disk-readonly-disk.args
index 6e25779ce08701734dba8cf664471c0dfb9ae985..ffb0c4bf4c452312033f7682973d00553b5e887d 100644 (file)
--- a/tests/qemuxml2argvdata/disk-readonly-disk.args
+++ b/tests/qemuxml2argvdata/disk-readonly-disk.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args
index 34ef2046326288e02fbd72843b4035541578e74a..68b79a0a326c04d637d9f23e21392ccde9a9fb71 100644 (file)
--- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args
index 7a83ac4afec009bcdd027d1c46fe4c97fcddaf30..57971050fe22fdaba5cae8013469856011a61190 100644 (file)
--- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-sata-device.args b/tests/qemuxml2argvdata/disk-sata-device.args
index 572ca20eb2b9f607aa98cad699c18c7f44dc3e13..bae7be0088b4a495810c56ef234e531c6111a3e1 100644 (file)
--- a/tests/qemuxml2argvdata/disk-sata-device.args
+++ b/tests/qemuxml2argvdata/disk-sata-device.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
index b3cf61b112d35a7639a1b964f657199c427a802a..d1883327424050c3f3ce69609d0ae1005241cb47 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
+++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
index 354686c5fa31247e57c734d349cf834968304c6b..5e62d0fca470d2c190cba1ec2481b87f1d881dbb 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.args b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
index a0ef28d7779bcc35ff7960f9154ce14b6b3c4639..1855da85458806c0d678d43f83c8581c82a4c284 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-disk-split.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
index 8cc1057613071831a6e56496433dcaad6fd5332e..945a8f8d5ccc5fd7cb5c1be9d0b9d70112674c36 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
index 7c92f85f43910a609d1f15f1a4f42729431f57f3..4116e567d3031446f30d9811420ee7ccdb24c06a 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
index 9f51c6d906d068d1156a432ba3f5868f8154b4a5..11904249ef780e9366885007f84ecb22f18b25a1 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
+++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
index da4ef333c09b737f85c8ae01ee586a9cd674546e..7bc2595aea050b0656c72f88cbb1249d761c4768 100644 (file)
--- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-serial.args b/tests/qemuxml2argvdata/disk-serial.args
index bbd10a106ab47903cd226396ffcbda3da24647e1..874fd2644396f1a348131d084d52cfc66f69d205 100644 (file)
--- a/tests/qemuxml2argvdata/disk-serial.args
+++ b/tests/qemuxml2argvdata/disk-serial.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
index d35e7a5f6ec774a2a7f55092c4be82c26e7edc98..77cc329a2f987748d7900e5751d609c9979b451d 100644 (file)
--- a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
index 4cae79c00541a08267fd0cc26fac89ef91aa233e..1cf9ee6ad96d749e93ecf380afda72138f515c28 100644 (file)
--- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args
index a24b3395e230ddebc76338400ec9cf6a4b268d48..5b173fbf22231f8f0206d294aada335839983fd6 100644 (file)
--- a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-snapshot.args b/tests/qemuxml2argvdata/disk-snapshot.args
index 909853635614796536a44ba796accdc8144e1806..56b756c0dd28bc1926771e1a127d137c7d4d2e9f 100644 (file)
--- a/tests/qemuxml2argvdata/disk-snapshot.args
+++ b/tests/qemuxml2argvdata/disk-snapshot.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.args b/tests/qemuxml2argvdata/disk-source-pool-mode.args
index d55fcf0ff4e72feede85d6403d2183751df07561..e49499be422bee365a86391fd545c83466cdd1ef 100644 (file)
--- a/tests/qemuxml2argvdata/disk-source-pool-mode.args
+++ b/tests/qemuxml2argvdata/disk-source-pool-mode.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-source-pool.args b/tests/qemuxml2argvdata/disk-source-pool.args
index f37a7b3b679ddfe9fa5837d6163e136833e0fcd8..83f6ae5b0dd61c4d9cf7e6df87132ecd2fada776 100644 (file)
--- a/tests/qemuxml2argvdata/disk-source-pool.args
+++ b/tests/qemuxml2argvdata/disk-source-pool.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args b/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args
index eea8560699369160ae96d8cf9c8fbe390a685772..1fe197f5370b7ff34bf958dc7b947d0b941fdc32 100644 (file)
--- a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.args b/tests/qemuxml2argvdata/disk-usb-device-removable.args
index 61ca1589a21bacffc855b16be5b59281963b15ac..ecf01392337e6ed21cc7dc5f6ebb979b33cdd412 100644 (file)
--- a/tests/qemuxml2argvdata/disk-usb-device-removable.args
+++ b/tests/qemuxml2argvdata/disk-usb-device-removable.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-usb-device.args b/tests/qemuxml2argvdata/disk-usb-device.args
index 515be277cfa54c2309256f573e43f2f9f867f59f..12c456a577a4ae3a50130a47ebf8d4e54daaa695 100644 (file)
--- a/tests/qemuxml2argvdata/disk-usb-device.args
+++ b/tests/qemuxml2argvdata/disk-usb-device.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args
index 9ee855d5c79323274551d6221a2dc362f84f715e..6432632d03425420ed9fe603adc784ddd1370c89 100644 (file)
--- a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args
@@ -23,7 +23,7 @@ x-use-canonical-path-for-ramblock-id=no,size=224395264 \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw-many.args b/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
index 2e881ec31483ba292304e40ff191946319d1c073..59959e364b5eda8139c7a619e5e33c7d047294ab 100644 (file)
--- a/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
+++ b/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw.args b/tests/qemuxml2argvdata/disk-virtio-ccw.args
index 27bd47166da14d27a6133438508879074270d922..fac60a19a1fb9f3540b21c59f65fe20c9c6c4a76 100644 (file)
--- a/tests/qemuxml2argvdata/disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/disk-virtio-ccw.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.args b/tests/qemuxml2argvdata/disk-virtio-queues.args
index bd3a1a9135b75f9b956643b11b8065cf75148b18..b15c3cbab0086971698ab5947dd3594cf3724810 100644 (file)
--- a/tests/qemuxml2argvdata/disk-virtio-queues.args
+++ b/tests/qemuxml2argvdata/disk-virtio-queues.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
index 34a07bb31b419c8ed636a5f37f923619cd5e9581..2de63fae18707a50591b439685e92a22f1b7efc0 100644 (file)
--- a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
+++ b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-virtio-s390.args b/tests/qemuxml2argvdata/disk-virtio-s390.args
index a37b8a55cda673fe7b6772c00fcfe28e265357f1..4eeb0005f5a0c54458e4016d854d10ee75445cb4 100644 (file)
--- a/tests/qemuxml2argvdata/disk-virtio-s390.args
+++ b/tests/qemuxml2argvdata/disk-virtio-s390.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args
index 21b267f1767eaf6e45b417b7af5fced7f1ad1161..79ef4a04721d5575d67b23eec4ed4eb38301c5f4 100644 (file)
--- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args
@@ -22,7 +22,7 @@ path=/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args
index a6e6c12d65597b94ef7d44d4e4e7c767b3f0ac57..dfab00713c5b6d136c76522f1465db498762c0db 100644 (file)
--- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args
@@ -24,7 +24,7 @@ path=/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/disk-virtio.args b/tests/qemuxml2argvdata/disk-virtio.args
index 7c217255c23db3c3293ccfb59e2dc88acab75663..4dac8e9f13857381372717785975fe7be07bf2b5 100644 (file)
--- a/tests/qemuxml2argvdata/disk-virtio.args
+++ b/tests/qemuxml2argvdata/disk-virtio.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.args b/tests/qemuxml2argvdata/encrypted-disk-usage.args
index 86417012933c1d42af286014a37e9a5a31c6babe..20e9f139cfbdee75e1a1a1c9cb45be252182d9a5 100644 (file)
--- a/tests/qemuxml2argvdata/encrypted-disk-usage.args
+++ b/tests/qemuxml2argvdata/encrypted-disk-usage.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/encrypted-disk.args b/tests/qemuxml2argvdata/encrypted-disk.args
index 86417012933c1d42af286014a37e9a5a31c6babe..20e9f139cfbdee75e1a1a1c9cb45be252182d9a5 100644 (file)
--- a/tests/qemuxml2argvdata/encrypted-disk.args
+++ b/tests/qemuxml2argvdata/encrypted-disk.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args
index fb12878f2edd3de27a6d496f68c5dd1a77c442f9..e4f9d3ca59abe80b3c4c963b3159d7a6c7b1ebee 100644 (file)
--- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args
+++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args
index b0a004f3161f1fa93edd28217bcec967b5a45bce..5c372687608cfb74db0e6a6cde11e255f1b5be4f 100644 (file)
--- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args
index a2593d155a4f933a6bb4c8bf43516a87ef130ca4..b69718823339b492c338c139e17d5e7ec1e01a49 100644 (file)
--- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args
index 96bfba2dacffab9f6d9cc83a7fbd6271b8219a5b..ca706cc8a3cbb4ee4d534333ac424d5742e29157 100644 (file)
--- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args
+++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args
index b008c779fad0a73d1695b5a01fa1e73cb55efabf..8918a98eb4b2a9afb51b06399f27aa8f3247b435 100644 (file)
--- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args
index d0befba30fa1bfd159627863113ddc10cd175758..dbc110349d1046b9ea7e177725d539fd7b6a9440 100644 (file)
--- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/event_idx.args b/tests/qemuxml2argvdata/event_idx.args
index bfeeffd93993a6954617e14d94ed0a100f708cf5..106e2e48df7a7a30e9491aeab24145c7fcaf10ba 100644 (file)
--- a/tests/qemuxml2argvdata/event_idx.args
+++ b/tests/qemuxml2argvdata/event_idx.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
index dec35cc10a08059f11f93727692a7b871c414348..a4aef21a248e9dfd644f59d164db8ea830195126 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-instance-00000092/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-instance-00000092/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
index 2d3e90ff7a7454e5fbaa6b2e5efcc6e771481db3..c9699d75c41eaf666b69056d0d273952d81bed47 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
@@ -24,7 +24,7 @@ size=15032385536 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-instance-00000092/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-instance-00000092/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
index 6b1695feb19a74a0431812f8a878e063cf86b5a7..2ec070c5a50f6b6d2573d5fc589e1b33c92b89bf 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
@@ -28,7 +28,7 @@ size=15032385536 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-instance-00000092/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-instance-00000092/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
index 205d14a7db29b1ab01b8d77b3ad4260e6d58e54b..a62dcbcc60ee38ba1ed2aa20a00f46b816b30627 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
@@ -32,7 +32,7 @@ size=15032385536 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-instance-00000092/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-instance-00000092/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args b/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args
index e0e416d391bfc085910c08b8566db828102d0f37..d58782cb3592fd7f26b56551fecd29e06e0d1658 100644 (file)
--- a/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args
+++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args
index 4740e52499d16aa9af1961c269dbb7c247488441..71abfa50d0528aa6d58af3b9d05bbc2b3df6542f 100644 (file)
--- a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.args b/tests/qemuxml2argvdata/floppy-drive-fat.args
index c654ae598aeb4c16ae53f8864abcad7c0395f715..15ca2f17b5ee3e8a5f2371fc7a326863a656181a 100644 (file)
--- a/tests/qemuxml2argvdata/floppy-drive-fat.args
+++ b/tests/qemuxml2argvdata/floppy-drive-fat.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args
index 90ab4214d9155ae8b00f08c73a04107c56f9d9b0..4972223000a86056971ac2865e0b9fe0b5d44493 100644 (file)
--- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args
index 12f0b9cb64c0ec30ad113d0191decd57882c622c..df9d7f5351d8284d2cb63727a3e13f2fd37734f2 100644 (file)
--- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/fs9p-ccw.args b/tests/qemuxml2argvdata/fs9p-ccw.args
index d83f6048b1737b142470d019996d81261aadcecc..13ebbf0903a0bf9fe4e3f0d4ca418fb37b658e31 100644 (file)
--- a/tests/qemuxml2argvdata/fs9p-ccw.args
+++ b/tests/qemuxml2argvdata/fs9p-ccw.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args
index 07d2a2dc3d339782aed2833c4f26df307d0ac5df..9d6c465295b02e95d1610648a0ec2c28f0751649 100644 (file)
--- a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args
+++ b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args
@@ -23,7 +23,7 @@ memory-backend=s390.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/fs9p.args b/tests/qemuxml2argvdata/fs9p.args
index 87bdf4da77c4c68be7c9dc09a22a79e337f5a91a..592c51d820f06ddb992a5082e4b7851603ff0cbf 100644 (file)
--- a/tests/qemuxml2argvdata/fs9p.args
+++ b/tests/qemuxml2argvdata/fs9p.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args
index e340218e1a19903fed96754c7def6f356ddb1c7a..6143f58851052c28942720d11a5491e243782b96 100644 (file)
--- a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args
index 8f08342a0b7e4824fad24a8a768ae3e75760df5a..ac18cb1d586811462113a26f4edb4cb00dd4f4d9 100644 (file)
--- a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args
@@ -23,7 +23,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/genid.x86_64-latest.args b/tests/qemuxml2argvdata/genid.x86_64-latest.args
index 7dd7d1f61629381c694dd29cc9f0c05d1ae9ee36..87f99a51e999ec9c83ad64668bf4802b341ca0c6 100644 (file)
--- a/tests/qemuxml2argvdata/genid.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/genid.x86_64-latest.args
@@ -23,7 +23,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args
index e6025557da35a2e1d95e0e96642e86346ac3a4e0..32b869d15ba31a2a0ebe12a9f5029fe9c789fe43 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args b/tests/qemuxml2argvdata/graphics-egl-headless.args
index 76d75834622d468118445bb2efd300e8760ad4fe..f5f4edb17465e54ad7395d850c08c0baccef2235 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless.args
@@ -17,7 +17,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args
index e6025557da35a2e1d95e0e96642e86346ac3a4e0..32b869d15ba31a2a0ebe12a9f5029fe9c789fe43 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
index a34f9d43c767ac119f3167b7a0f7dee3f157e709..19780e0d716b3deae9e16a4b718e2051ee0818cf 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
+++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
@@ -19,7 +19,7 @@ DISPLAY=:0.1 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvdata/graphics-sdl.args
index c0c354b824c48cbd88f01d2a64580a08f7377a84..70918a192cdfb40715253bd37317f9455889b88e 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-sdl.args
+++ b/tests/qemuxml2argvdata/graphics-sdl.args
@@ -19,7 +19,7 @@ DISPLAY=:0.1 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
index abcebd177402bfa5b0906409dd54ace2c1a13462..5aa7da2d4a04fd7cddbe36e10e8e71c19dc6148d 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
+++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
index 9bed3523128d0d02bd3b9ee144039a108add4bf4..37fd9f0259dc7ffd8bbb703193aa97493f64e8ce 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
+++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
index 843e82935e2a327af9293794026fee2abb1907c6..e2b1ae4e3776e799dc20a2009b49194ce7e6951d 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
index 843e82935e2a327af9293794026fee2abb1907c6..e2b1ae4e3776e799dc20a2009b49194ce7e6951d 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.args b/tests/qemuxml2argvdata/graphics-spice-compression.args
index 1f06d88e04f48b7b1f07454f717be1ab40db9bfe..1f5ee8f0b93ae0a1215a8b71a7937259240fe509 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-compression.args
+++ b/tests/qemuxml2argvdata/graphics-spice-compression.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
index 54b7184376b3ded3c3010c88c1e0f6e34fbf1c4c..26147977266c94f61632b00fe16966b13f91347a 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
index 9329e56b1290dd413597e9509316151498a873fa..95ffff8af7a80419b96e2f48d0bdaef9fbc8fbb4 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.args b/tests/qemuxml2argvdata/graphics-spice-no-args.args
index 76f74c0fc562c381314f8091103b81f27e3fa64d..b8a15a785177583060fb725ee3303987a444b3cf 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-no-args.args
+++ b/tests/qemuxml2argvdata/graphics-spice-no-args.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
index 630e62018677bb47d37a56c161741a5ebdd962df..61714b573e65dacab0cf0f9c88c1dedc4d6de6cc 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
+++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args b/tests/qemuxml2argvdata/graphics-spice-sasl.args
index bc2293d6a07b4e7b1a99a1b48ea8b0d08cb06376..d71c527a093d127b861ab456811cb9d60dc36cd7 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-spice-sasl.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=spice \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.args b/tests/qemuxml2argvdata/graphics-spice-socket.args
index e7813572772bcb6dd40ac21d40a6e5723fb79049..0b869152dee56fdd551947c4fe34668d3e1d4b84 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-socket.args
+++ b/tests/qemuxml2argvdata/graphics-spice-socket.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args b/tests/qemuxml2argvdata/graphics-spice-timeout.args
index 3f6cf4a8e2aeef3184a035a82d7b3b21e7260d65..eb4a14fce5a7e5f76bb8dbe0f07c7cdd311ea8f3 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-timeout.args
+++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args
@@ -19,8 +19,8 @@ QEMU_AUDIO_DRV=spice \
 -uuid 553effab-b5e1-2d80-dfe3-da4344826c43 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-f14/monitor.sock,server,\
-nowait \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-f14/monitor.sock,\
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
index c46bddf617f34e25f143aa24a81b76bfdb64931b..ba6e6abee7488c3a3db4b2de2f8f94903dc39c60 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
+++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-spice.args b/tests/qemuxml2argvdata/graphics-spice.args
index 4c38960b72e7eab3cae6131a712719645eba3e8b..34f3a7dd33b1ab69f896f31ff1a3b0bae55d087b 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice.args
+++ b/tests/qemuxml2argvdata/graphics-spice.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
index 5e3bb6e0b5665636fe26a70affe1de8627859d1c..d070a55a51317155cd5377dac48f899da7c4f9a4 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
index 12697fc206ea88dea3247b3443104585b5a4b142..ccb59e6da24ffce7c7eb46ee304920e9b524b427 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
index 3c0901d1a5a0c6e8ac05231b1f5f2cbfc3eba306..211da59f79980bf90e34e292b3cc8b316dd217ee 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
index 82a77778c2ef7c82c94b5f7f937225274ff88232..c2a79b1d3f58b5adb04ca43836da4afd9cdf82c1 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.args b/tests/qemuxml2argvdata/graphics-vnc-none.args
index f9259c7fe7a5b5612a96c660fa1f415016b6e8ae..03f5a6d8ec6a95abd1874c9a6af9b8c75b920c24 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-none.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-none.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.args b/tests/qemuxml2argvdata/graphics-vnc-policy.args
index 17fde4e5a1946d276f69023c22904319a3ef8e04..85b7d722e089b7cea3d25df822e3048ddd0d66c0 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-policy.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-policy.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
index 7ee7a3777cb008e12e564e07dd426084e2db76f1..8770f4f40193abd7ef7d24776d0c3b8e96cf800a 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.args b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
index 32972582e79b2bf060659b8937bbc1ee456eaab1..a915a857cb1e42cc9b5bbc66e4d9e4459454c277 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
index 7b845de69bc8c5bfa39f76db3f91a593b73e41a9..38dd34d8a0aa5902eb379cd92a1d514ab6b0d542 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.args b/tests/qemuxml2argvdata/graphics-vnc-socket.args
index 8fe87adde836e4768f5e3d76cc1109c3e75b1448..b09e9cbe02e96e6cbabb8038d9c9f93fba9d4536 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
index b3251fbed4544fb874fb6bed16c20f94df4f8891..00119fcd3daa290a5159549f3aee39bac5b2b689 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.args b/tests/qemuxml2argvdata/graphics-vnc-tls.args
index 7d89329aa2fe1f97068a925e33bb16f554973cf1..896ff60e53576e3b717f216e56d4845a490797b1 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
index 3ec25996c9dbde24addd3863e8d0929b89645ed7..471ff0dc773d41f4480ad4500e21882f77a00f74 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
index cea42c4d1b56ecbee3fbfcfb53badcf82ae27f3c..b739a9b9c8833c87083f48ae82ab2fdf05a327a3 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.args b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
index c094c0d0f07927b486abd2dc3a0511d1472a8ba2..048e1c6e563dbea1fa04d0b6a0ce11aadaae3a3b 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc-websocket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/graphics-vnc.args b/tests/qemuxml2argvdata/graphics-vnc.args
index 82a77778c2ef7c82c94b5f7f937225274ff88232..c2a79b1d3f58b5adb04ca43836da4afd9cdf82c1 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-vnc.args
+++ b/tests/qemuxml2argvdata/graphics-vnc.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args
index f1a30264745e9570af960df8e0d7cd43178079af..508289bf5b70217855ce4dfa95f7cd4615c23e99 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
index 580cbd94890f0188b947fe9e5eb594d55d10aea2..997cfc6c33e232e9edb3f14d33804b7fbdb43bba 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
index 345bddfc43bf1feabbe03ceb3782b13f09024f40..06bf69ca04267c1b0c9be2faef72ed506b1270e0 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
index cef437a228ad1eaa49d727040a92e0746f30c335..7491c5272399dead647fe05458cd568d735a57d6 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
index 68c28fc41ef0845551c8da2b82fd862ec2d0308a..22ee8ae7eb544d9b2f3de5bd51484fb26c79e229 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
index 207ac5740bf99a953d5b7977ffa2608a992eb7e8..d3d874006212a784b9d4eff02d43e77b1afcf11c 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.args b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
index 98d4a62c180e2b1c2d7fb868afe12a5da9eca64d..c6004fb54bbc94a64c3f573b41fc984c74afcd1d 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-pci-address-device.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
index 42fae174446ac27095e5f4c03d8aa5c02d8a7434..2aa88f80d937d077aa3eda8636d329b4e359926d 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-delete/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.args b/tests/qemuxml2argvdata/hostdev-pci-address.args
index edec271444766c995d8ba5027d7ae71921398dac..e5ab68fac18a7f379b9286c2105f3a5c75288213 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-pci-address.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
index d8690c010bc99ee4a83ad7c90cda82a3fa731298..8d7ce4e509e78bd73551a6679eef26428bc4289e 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-delete/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args
index 51dd2da7de2191bc3ab97fff930d615e7fb06d6a..1aa4a027ef66d2605bc3ac4cf9243fae5e3d732d 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args
index cee891199dd03d0c0a50bdfbd35e034bd212be8c..29333fa3bf4828f8ddf9720bf959edbd9fa3fcb2 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args
index 89e83e3a2f34a0ecaf4a1eef92040485fc873a29..e5c77652165767c53402b465cdbe70b971ec1c90 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
index 0e9fdd7c31027d4a101dcf7dc2bf137724dd128d..e4d01dffd5db54b6c466f824574a58838e443e98 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
index 3e8b590ea01351f6baf1fa373201c8335b0a19ea..561c01cdf1747f8528dc7542ff92c561e26c9314 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
index 0bda46c4e1571ef39cddbf6fac8051473f6f8ecb..9d8ad7eb69d2b5f2428d56fe8fc15454a1d18f58 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
index bb8a466f70413dc0f5978d1239f1026dc1c41e1e..46054d4eeb1fe023e6b926b5eb0a8d781c439103 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
index 973ae5677a5f3f6777d1282bd5965a593220a3a1..3949d41653646767a757d21b9b9a6e97d6ae4d7e 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args
index c00ef41bf2033254c1732b985c67ea859922fc3e..bf298b7e1d46ce966b13489652aaeeee89f9cc76 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args
index a6cf270d0c9d15f07528d0a92ff1a7e03d3aceaf..9857a5cafb21be605d583dcd54193ac58596dbe7 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args
@@ -23,7 +23,7 @@ memory-backend=s390.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args
index be550aa7d5eb68d8551754f652e2bc6cafbc58a1..4eb1ab84fe0107247b8c72e77562d5c6c3b29443 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args
@@ -23,7 +23,7 @@ memory-backend=s390.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
index 1402b23b8c949e849ba1e1aad51fdc5b3c18f98e..1e063996f361828402925199a3ca5e4e43f29e75 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
index 6a24db3aea67347bee9007ec552ae45e96b23d09..33eb144f99231645a866053b6ec65188816d8d21 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.args b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
index 5a10d45b3b1a983951865b505480e678414a6079..6e4803ad0ba3a3add058cbf3d63c8f0d672fa173 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.args b/tests/qemuxml2argvdata/hostdev-usb-address.args
index eb179114230d1bc84092c99ebd5ca9f0b7e4e6b4..f31ab4f6e7c2693c6b5711a75dea72fb96dfd1b5 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-usb-address.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
index 6bf3ef802160df7f0183d951e9072f6f12d4b321..bd8dd135a6023462b163e5cb13d36b19c48b4e15 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
index 6485433a6fdcac27141f62aadd2bdd2390414f09..900fd25d832dab3173ed3b2a52d5fd4ad6d54bdb 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
index 181652cc00f353653c5867f658100f760548ad74..515a523ccc51b29922cb0ed2c2581d9e446042b8 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
index 963d5080665c73429c41548c8ed0526e8d937b92..8fc28ec20cd3a732d5a52cf9ea33c5588818ad9a 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
index 2fc4200c2376b23688263097cd82cbe4f0946401..f1595e547375c92f231db0e8266fc89a1d3a6b9a 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
index 103c4f7226d5089113cf8f2ea8df592620e3f185..143f51652dde3a565315c1a57aba7e903047423c 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-KVMGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
index 3dd9a25fd5878104b51e222cb74e216d2de7beb3..06e53b5027cf6fee0e4b3a82bb580f394d7a21c8 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
index d3a762e5d43d36466d5757ed71f2cb19b3ed0ad9..ca58326d4a38d37768ce3ee0cac3c838c6f5c60b 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvdata/hostdev-vfio.args
index d7eaa774cab34c6dfb89f24b8a811d6a14bcd094..e1726e088f3c2ea92200c6b9f00dffd8cc968595 100644 (file)
--- a/tests/qemuxml2argvdata/hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hotplug-base.args b/tests/qemuxml2argvdata/hotplug-base.args
index b2bd39e5a514b1e0d2d7817f0735624dff4432ac..05d1f0145a3d41f48a6e054bad54b2fc79a7c39f 100644 (file)
--- a/tests/qemuxml2argvdata/hotplug-base.args
+++ b/tests/qemuxml2argvdata/hotplug-base.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-hotplug/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.args b/tests/qemuxml2argvdata/hugepages-default-2M.args
index 014d71c9ec4a90cf2e3628ba29025914121eceee..a651d804cb3303937d347c68b71664bd4b7f5542 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.args b/tests/qemuxml2argvdata/hugepages-default-system-size.args
index bcf6e6bf0e311ae99fd1db31c81a3160c5fd682b..2d2b7331b1ce7299d17a5d133917e6d357ad282d 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-default-system-size.args
+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hugepages-default.args b/tests/qemuxml2argvdata/hugepages-default.args
index 3184e4ea07acf7538faf6d4e38d10d3305bc8cd8..a485ecce71e646672ad879ad5664860f3dd5780a 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-default.args
+++ b/tests/qemuxml2argvdata/hugepages-default.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args b/tests/qemuxml2argvdata/hugepages-memaccess.args
index 3358a8c96530f8d16b3735a59be4703d418862a4..3b062640e6493f658e1801560cc286dcaa285432 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-memaccess.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess.args
@@ -39,7 +39,7 @@ size=536870912,host-nodes=0-3,policy=bind \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args b/tests/qemuxml2argvdata/hugepages-memaccess2.args
index f74bf8dc9b0005bfc9df6fbe0fde2d282ba8d308..6f71c26f6c6af54616c165ca9a2e2a6d2302e35c 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-memaccess2.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args
@@ -39,7 +39,7 @@ size=536870912,host-nodes=0-3,policy=bind \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args
index 9396441b925796f42a629b384bdfaad31781695c..d78b2185a882df0200e5d03eb95bfc8e9b9dcf5f 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args
@@ -27,7 +27,7 @@ x-use-canonical-path-for-ramblock-id=no,prealloc=yes,size=4294967296 \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.args b/tests/qemuxml2argvdata/hugepages-nodeset.args
index 014d71c9ec4a90cf2e3628ba29025914121eceee..a651d804cb3303937d347c68b71664bd4b7f5542 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-nodeset.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
index bbf3c9f67a906d1424662a36f8c615985d52671e..aded905751509a1702901a2f5bebda4e471b3448 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
index e219914bc34f61625e980ec40bd833327aa8f001..f903ffc9cf77873a6fdc94150f4bbbfe38c6d275 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
@@ -26,7 +26,7 @@ host-nodes=1-3,policy=bind \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fedora/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.args b/tests/qemuxml2argvdata/hugepages-numa-default.args
index 674bb517d18c102049e358b755a0db09d2851d41..042b651189b96e95a43631030223406e829c0f11 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-numa-default.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default.args
@@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fedora/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
index 6debc99442c7be2c9a1d64897ad86cd1910af029..916d6361a0817a0af96ec56cf2b54a044303e495 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
@@ -25,7 +25,7 @@ size=805306368 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
index 6c05e54c63691f55c8fa83870a944a8189b42005..b20469828d246a8c6cdc21f743cd6b579565c1f3 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
@@ -35,7 +35,7 @@ size=1073741824 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
index 969bb713b52e2f2ca4b08a9f6eab3bd38059419c..a7d1ed9d4e75eefec930ef331cb1ce21949d9327 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
@@ -28,7 +28,7 @@ prealloc=yes,size=536870912 \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hugepages-shared.args b/tests/qemuxml2argvdata/hugepages-shared.args
index a3cb6b9b9edee5ff7c490a3c446f66ef2eb1ae3c..3cffa37dad0c07c5f46657440f16ca9344f04f4c 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-shared.args
+++ b/tests/qemuxml2argvdata/hugepages-shared.args
@@ -35,7 +35,7 @@ size=1073741824,host-nodes=3,policy=bind \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args
index 6909b71d527786b2a07e0c3d6377e09144a636da..1b80f278935aabc67461a9fe09dc8ff67dd6c126 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args
index ce7af1bd3a4c2f3e01a9d604ab70da263b181d71..1cee6c42be8194c1a3c70deba85ca7d79752546c 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args
index 55e509971731ff3bffa92d56c5e315b95adbc397..e8e933a86d467ee7d5341b5a789786f64903c19b 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args
index 870fa38d82a72a33e695b7e467b3b36865a9a407..7ae3d738b48d6d7032500db951a0bdd50d23ab57 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args
index f64bad579d3d5113007df2ee9df05bed033b0ebb..6a68270fae3ee443a1bc33443e9e2f2eba2651de 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args
index b9d9542892f7fc27bd934c33fc91627ade2de02b..dcf27a188a1a3df924accac68bcc57fa3e07f647 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args
@@ -23,7 +23,7 @@ hv_reenlightenment,hv_tlbflush,hv_ipi,hv_evmcs' \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args
index c6cba0698120f6e8272ff8412bdcccc875ddfe5c..dcd86b482a7c3542ed320ee40af3cfd4c980952b 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args
@@ -24,7 +24,7 @@ hv-reenlightenment,hv-tlbflush,hv-ipi,hv-evmcs' \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxml2argvdata/input-usbmouse-addr.args
index 36d9fc4f9006401a16d010bade1b23258c38c47b..69ef7fe6005d22c0fb63c7ec5d641a9b3a1d72e5 100644 (file)
--- a/tests/qemuxml2argvdata/input-usbmouse-addr.args
+++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2argvdata/input-usbmouse.args
index fc83eef3aa5907e9ea8ec0b73c3c9ecb02027046..914524b70831ff92bbc79ffa6db01fd2e0988580 100644 (file)
--- a/tests/qemuxml2argvdata/input-usbmouse.args
+++ b/tests/qemuxml2argvdata/input-usbmouse.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2argvdata/input-usbtablet.args
index 8a96f664115e67bd915ac60eaa3ce59db093cccf..87f9a46de1d01e20a4402a4b8c24c4de36fb295e 100644 (file)
--- a/tests/qemuxml2argvdata/input-usbtablet.args
+++ b/tests/qemuxml2argvdata/input-usbtablet.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/input-virtio-ccw.args b/tests/qemuxml2argvdata/input-virtio-ccw.args
index 108a8470cbbce6905a1c4b2d6f522e47a321e266..f500802f8a899c1f9263663f6d9a787422d0558a 100644 (file)
--- a/tests/qemuxml2argvdata/input-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/input-virtio-ccw.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args
index 211ea3d57234c5b937c535b0ed5f88b20762eb65..8b6487a944c08e6fb398db8e2c056af5641a06fa 100644 (file)
--- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args
@@ -23,7 +23,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
index cea414a7f5a2a1ff12c727be26143664ada65986..719224c5efb775ad644fd4cb6fa2940520c907dd 100644 (file)
--- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
@@ -23,7 +23,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
index ef2fa61db82830814ae20573df2a3bf20d02c357..8958261b038b72e571679c9f1240b6a17784377f 100644 (file)
--- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
@@ -23,7 +23,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
index 43e666d14f60a989350dcc246a9a4e806da6d1cb..1341e90d11768e1a4056599cfd16dbc2cace31c6 100644 (file)
--- a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
@@ -23,7 +23,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args b/tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args
index eb491e17b4d23afda11b585badd97e03ead60747..1272563348192a6f75347b208ac3378986e46807 100644 (file)
--- a/tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args
+++ b/tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args
index 5fe3ed0c26fbce31a844987d3b5b962625c71db3..58ec585f2016523711f8c5f9845378bb500cf89a 100644 (file)
--- a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args
index 6ee610849f0e6e0a38820d50b6c263d4ac27cf45..b0e2c5dda7156be753fd6634e360d0f35c3b0c17 100644 (file)
--- a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args
@@ -23,7 +23,7 @@ memory-backend=mach-virt.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
index 402f653dfcacc66fbd1ff79fc3e58fb2dc3b8770..ce9d06a7a553ca29f34bb0820d721a81417fcfdc 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/iothreads-disk.args b/tests/qemuxml2argvdata/iothreads-disk.args
index e3dcb1d1b38ee5a0756bcd0302aa10ea38e2d3d6..d2165b86198251878a4002b42bf112e5fb21f3ab 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads-disk.args
+++ b/tests/qemuxml2argvdata/iothreads-disk.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.args b/tests/qemuxml2argvdata/iothreads-ids-partial.args
index 58e764d78a259302ba0a9ed3a10494f65d8a9f5d..9bd7190462ade8df272b7ccf7ba2469df31c3a39 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads-ids-partial.args
+++ b/tests/qemuxml2argvdata/iothreads-ids-partial.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/iothreads-ids.args b/tests/qemuxml2argvdata/iothreads-ids.args
index 009dcc9d72291fc257751b044ac4c0bfe263249b..60cb11d9026d5f338d9adba2e511b9519aad1082 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads-ids.args
+++ b/tests/qemuxml2argvdata/iothreads-ids.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
index f8a5aaaef4abd3c73e163dc91bb1d00965222cbe..74a66971ae135f7ab1a9d947a59e1bedd9f91168 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
+++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
@@ -25,7 +25,7 @@ memory-backend=s390.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args
index a2f4d5e6091b1bbf5185f912a0a41670bf9a2233..830b8ea7fd2a07b0cd1966b3fd4c450f922175f1 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args
@@ -24,7 +24,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/iothreads.args b/tests/qemuxml2argvdata/iothreads.args
index 5bc2350741b323ea825670eb83d72b1fc1972ca2..89252793a8518fb8e552bf53ef4ced4df5995755 100644 (file)
--- a/tests/qemuxml2argvdata/iothreads.args
+++ b/tests/qemuxml2argvdata/iothreads.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/kvm-features-off.args b/tests/qemuxml2argvdata/kvm-features-off.args
index 54d166912ec6cd99798258f034edc4f0b92ed78f..6faf345fd07aaab0074e4a771bed2f67aa7cf89a 100644 (file)
--- a/tests/qemuxml2argvdata/kvm-features-off.args
+++ b/tests/qemuxml2argvdata/kvm-features-off.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/kvm-features.args b/tests/qemuxml2argvdata/kvm-features.args
index 629f868fe1bc951afc447b0637c5e11333743854..14ea02a8e0e7f46f238ece8ef3dccf6dca1320cf 100644 (file)
--- a/tests/qemuxml2argvdata/kvm-features.args
+++ b/tests/qemuxml2argvdata/kvm-features.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.args
index f51fb19f858b0a5165c669628f1cf18ddd50326b..8f7ab5b4ff6a39c8c2ed3c87e8e37d3af9ca4334 100644 (file)
--- a/tests/qemuxml2argvdata/kvm-pit-delay.args
+++ b/tests/qemuxml2argvdata/kvm-pit-delay.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -global kvm-pit.lost_tick_policy=delay \

diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2argvdata/kvm-pit-discard.args
index a71d9d68b8776a3ca75afeca5abe02e8437bca1c..8d96ec8011b616b3bff6312fa6e4acbef9644ffe 100644 (file)
--- a/tests/qemuxml2argvdata/kvm-pit-discard.args
+++ b/tests/qemuxml2argvdata/kvm-pit-discard.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -global kvm-pit.lost_tick_policy=discard \

diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args
index cb2eba75ff8ba0da15f9048fed68fb09fa7b809c..23f53470da191b47026a893875e229008a23e5a5 100644 (file)
--- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args
+++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args
index c67e253746f73c551ab376634bfdc3083634aab6..50362954fbca7e211c1798c92b7d2f25ca2b0667 100644 (file)
--- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args
index 8842d2a44837b793ea65829d65eef2c06cf46f1d..cd1fb742c733d49ce52ea341e8b4562ed6595d30 100644 (file)
--- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args
index 65bea1d0b0642d0cc81482226a2526a7889cfde3..a93aa68f9368cff0e877bb7c58cc5a2ff48da08b 100644 (file)
--- a/tests/qemuxml2argvdata/kvmclock.args
+++ b/tests/qemuxml2argvdata/kvmclock.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args
index 378c3b681c97eb19f26dee9e12a7523c0fddf83d..f6cbd016df5066f6267b3319f202e4dd0d01fadd 100644 (file)
--- a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
index 378c3b681c97eb19f26dee9e12a7523c0fddf83d..f6cbd016df5066f6267b3319f202e4dd0d01fadd 100644 (file)
--- a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
index f3a1230f640adac7f92e7e872ccd2f49e0739975..e6331b6414f926bd7eebfd53805df9d76f2dd4a5 100644 (file)
--- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
+++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args
index 57a86c549d4ed9595efb1f726b3080f9a43b0da2..c78d138fd9a2ec650503a65c127ab56c206ed5fe 100644 (file)
--- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/luks-disks-source.args b/tests/qemuxml2argvdata/luks-disks-source.args
index e2bd559212313d37689db0cdaa7cdef16bca7d97..429e9536ba0650754cf12daa30d24800e7dcb506 100644 (file)
--- a/tests/qemuxml2argvdata/luks-disks-source.args
+++ b/tests/qemuxml2argvdata/luks-disks-source.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/luks-disks.args b/tests/qemuxml2argvdata/luks-disks.args
index 47626966f273a8b5dbe5d8026b06482d8ae4f470..06aaf29fd8fe0339070cb61a1defd0ab72132f54 100644 (file)
--- a/tests/qemuxml2argvdata/luks-disks.args
+++ b/tests/qemuxml2argvdata/luks-disks.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/mach-virt-console-virtio.args b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
index 36fe5390126f3836379209fb791581c839a508f1..a878262246c201413999b33a4e564996e94f3a45 100644 (file)
--- a/tests/qemuxml2argvdata/mach-virt-console-virtio.args
+++ b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/mach-virt-serial-native.args b/tests/qemuxml2argvdata/mach-virt-serial-native.args
index 8d25e49db5d0f1f414351b5d9620dcf833e918ad..89b82ab32d5fb7bb6145133ad9fe621ec7d5d8e1 100644 (file)
--- a/tests/qemuxml2argvdata/mach-virt-serial-native.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-native.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/mach-virt-serial-pci.args b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
index 2f4dd08c1ad8579f7c1c4b025abc7d8ab6fc8416..f0479e3bf8965cb79aa94b0730a9d2199824453d 100644 (file)
--- a/tests/qemuxml2argvdata/mach-virt-serial-pci.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/mach-virt-serial-usb.args b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
index d96b2c0262249a69e7c38e64f410a0077071d327..d2e644f10fa3e11d330c4cec99cd1b0ea43677da 100644 (file)
--- a/tests/qemuxml2argvdata/mach-virt-serial-usb.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
index a9577c13d872785b9b1c58cd8a50edf4e89d810e..b11de38df73ff43d2db354494e0464f1bb1c0c9f 100644 (file)
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
@@ -20,7 +20,7 @@ aes-key-wrap=off \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
index a9577c13d872785b9b1c58cd8a50edf4e89d810e..b11de38df73ff43d2db354494e0464f1bb1c0c9f 100644 (file)
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
@@ -20,7 +20,7 @@ aes-key-wrap=off \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
index 7fbbe4e6bf1f22ebb60fc82883a9053bf8ddee91..5ec4731c3855e207a084c386a926c40933881cb4 100644 (file)
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
index 7fbbe4e6bf1f22ebb60fc82883a9053bf8ddee91..5ec4731c3855e207a084c386a926c40933881cb4 100644 (file)
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2argvdata/machine-aliases1.args
index fa3ccefc355ede2fe0b1d13e5b392981312aa75a..d627d7b497bd6afb2c06e76827d56d8683c278de 100644 (file)
--- a/tests/qemuxml2argvdata/machine-aliases1.args
+++ b/tests/qemuxml2argvdata/machine-aliases1.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2argvdata/machine-aliases2.args
index 6e480fceef84259b30863b20dbf94dad999612cf..c35a62a7e3fd284ee53ad3f26c1cfdc0b48eca8e 100644 (file)
--- a/tests/qemuxml2argvdata/machine-aliases2.args
+++ b/tests/qemuxml2argvdata/machine-aliases2.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2argvdata/machine-core-off.args
index e38898e335ff059a6db24a8f108056f989643a8e..bc9d1adfc526f225a263c4e19ab6d023846734e9 100644 (file)
--- a/tests/qemuxml2argvdata/machine-core-off.args
+++ b/tests/qemuxml2argvdata/machine-core-off.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2argvdata/machine-core-on.args
index b3d271e1611cbf582c5df0fbdce82e64840f36fb..c7705665e1873b821a6547afa44b2d58115acd00 100644 (file)
--- a/tests/qemuxml2argvdata/machine-core-on.args
+++ b/tests/qemuxml2argvdata/machine-core-on.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
index 40d6616940e5f8eb303c92e03787de5ac055b6d5..e1c77a8473d4f83449dbb3694f2ef71b579ddb31 100644 (file)
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
@@ -20,7 +20,7 @@ dea-key-wrap=off \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
index 40d6616940e5f8eb303c92e03787de5ac055b6d5..e1c77a8473d4f83449dbb3694f2ef71b579ddb31 100644 (file)
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
@@ -20,7 +20,7 @@ dea-key-wrap=off \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
index 4fbb2249048fb8255989999c8d3d8dcd65e33210..90c85db2435141f16882ed624422aa904461ab6b 100644 (file)
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
index 4fbb2249048fb8255989999c8d3d8dcd65e33210..90c85db2435141f16882ed624422aa904461ab6b 100644 (file)
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
index 056bf815e8ee5ed31430a7084d7bc9141c05c77e..2ceca602123bc959d1ed58dcf65f1ed410af2ecf 100644 (file)
--- a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
+++ b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.args b/tests/qemuxml2argvdata/machine-keywrap-none.args
index 056bf815e8ee5ed31430a7084d7bc9141c05c77e..2ceca602123bc959d1ed58dcf65f1ed410af2ecf 100644 (file)
--- a/tests/qemuxml2argvdata/machine-keywrap-none.args
+++ b/tests/qemuxml2argvdata/machine-keywrap-none.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
index f5b822e55c43521f6d3004c2986e1933fc532120..3a470ee66a1c052b0afcf3895082f489574e8fff 100644 (file)
--- a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
@@ -20,7 +20,7 @@ loadparm=SYSTEM1 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
index 2c401d9badd621b77fcab0ce2e0f9369090f8bf4..d6d3a395fe382f95c7f9ad757dad623dc7b072b7 100644 (file)
--- a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390.args b/tests/qemuxml2argvdata/machine-loadparm-s390.args
index 0326bea31cec0f15415220102951194fd6fd9afb..557997e501d2d54a25083504a0cc3860f6302d08 100644 (file)
--- a/tests/qemuxml2argvdata/machine-loadparm-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-s390.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-smm-opt.args b/tests/qemuxml2argvdata/machine-smm-opt.args
index 8f1f041a5f3e0829a874bf8a61651a760d1ad8cc..af8b3b92fac19eeed3e7185b7bb4a87710283020 100644 (file)
--- a/tests/qemuxml2argvdata/machine-smm-opt.args
+++ b/tests/qemuxml2argvdata/machine-smm-opt.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.args
index f3f5ddff1d0a6a578a6abcab08f01a3702f86887..42abc6a09d4527f5bf081d7732cec0ccd777f64f 100644 (file)
--- a/tests/qemuxml2argvdata/machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/master-key.args b/tests/qemuxml2argvdata/master-key.args
index 9e91135f3147275c4d3d581e9b55fb6908031b25..7fef79d9d3817d042477471a9c43ef46b650905b 100644 (file)
--- a/tests/qemuxml2argvdata/master-key.args
+++ b/tests/qemuxml2argvdata/master-key.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
index ef15e2e97e0868e03d9a33eb284c2d2244361943..6a57f31d799dc6f3bec8c203edba7f53142a575a 100644 (file)
--- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
@@ -24,7 +24,7 @@ share=yes,prealloc=yes,size=15032385536,host-nodes=3,policy=preferred \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
index ef15e2e97e0868e03d9a33eb284c2d2244361943..6a57f31d799dc6f3bec8c203edba7f53142a575a 100644 (file)
--- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
@@ -24,7 +24,7 @@ share=yes,prealloc=yes,size=15032385536,host-nodes=3,policy=preferred \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
index 465f1e5e7aa6a85ead2e0b600094ec7a4f5e5968..f52518a4f08e7472231fb42669cc6cdc16e1e35b 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
@@ -26,7 +26,7 @@ size=536870912,host-nodes=1-3,policy=bind \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
index 6737bc596185e54c2d7a3fb2f992d1351fd48296..ccd80845d80b004c36b1580fde1f31cab5b08d0d 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
@@ -26,7 +26,7 @@ size=536870912,host-nodes=1-3,policy=bind \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
index 8d3fa2e867e4df944bee049918ed7e7f0834fec2..63fec07e9de08db0edaf9d61dbce5587c1d1c3e3 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
@@ -26,7 +26,7 @@ prealloc=yes,size=536870912 \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
index 4f22f78277d66642f153c850fb7a74ddb63c3414..f088f6573534ec28f1cc95cf63046b5f9327038d 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
@@ -26,7 +26,7 @@ prealloc=yes,size=536870912,align=2097152 \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
index 53dda234a2fcd047e46e2bad59a6c9d86ef70297..63099538124b5e19bfa981d51fca13e4caf58579 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
@@ -26,7 +26,7 @@ prealloc=yes,size=536870912 \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
index fb4ae4b518319db00964043cbfc3f57221289835..35895914b20b748bd0518a8e5397373b5215e043 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
@@ -26,7 +26,7 @@ size=536870912,pmem=yes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
index f50444e47e2f67b416488cdf7418d2c002d1249a..e059194fac78d32eedf121186766390d55002d41 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
@@ -24,7 +24,7 @@ uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
index f50444e47e2f67b416488cdf7418d2c002d1249a..e059194fac78d32eedf121186766390d55002d41 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
@@ -24,7 +24,7 @@ uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
index 5e44496e3907400ac64981d12de9f3d2779348fe..be88fb600742e229d1f4f64b78384f9a576b4a98 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
@@ -26,7 +26,7 @@ prealloc=yes,size=536870912 \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
index 94f8444d95e0d3ba4e25301997fadcfae7540460..571e0b3d5046ab1935e1aa85c6d5db3d2057a8c8 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
@@ -26,7 +26,7 @@ size=536870912 \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
index ac741b80c0f96777904a2543174e56062ff62bf2..c7bed3c22f53a3a9ca7769a8b944c16c0d405eb5 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown

diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
index f7f151d1cabecd8c639290ca0b0944c43c1c18bb..29a9c9eb920209293f24b7caf85307385824ccdf 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown

diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args
index e2f5097424ff5d660d45d0b2068b29f3be753a1c..3c4aff806fc1e3ac0ac1bb588fb45d4c0e187dd2 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args
@@ -27,7 +27,7 @@ addr=0x5 \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2argvdata/memory-hotplug.args
index c2c80ecf0043b2c852bd67cfb4d186f5c4b7d1f7..49c23e6895b823d7a242f5aeb8365d4c3b633b05 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug.args
+++ b/tests/qemuxml2argvdata/memory-hotplug.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2argvdata/memtune-unlimited.args
index 60253f43ec6e495558d004e3a22e50194b3fde10..b2aebf53027b70aa316c4cf7f6d3ce2ce869b5cb 100644 (file)
--- a/tests/qemuxml2argvdata/memtune-unlimited.args
+++ b/tests/qemuxml2argvdata/memtune-unlimited.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args
index 60253f43ec6e495558d004e3a22e50194b3fde10..b2aebf53027b70aa316c4cf7f6d3ce2ce869b5cb 100644 (file)
--- a/tests/qemuxml2argvdata/memtune.args
+++ b/tests/qemuxml2argvdata/memtune.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.args b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
index 7f0edb240ef9dd63d256559ad28041756b451288..58d2b7e2787a2595b8ff67bebeb3190b49821a2a 100644 (file)
--- a/tests/qemuxml2argvdata/migrate-numa-unaligned.args
+++ b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
@@ -28,7 +28,7 @@ host-nodes=5,host-nodes=7,policy=bind \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/migrate.args
index c977c62ab444bb2a53fa89784de4b4a942f3cfdd..7d70883767ad28138a848931b7f7d4a56d90340f 100644 (file)
--- a/tests/qemuxml2argvdata/migrate.args
+++ b/tests/qemuxml2argvdata/migrate.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/minimal-msg-timestamp.args b/tests/qemuxml2argvdata/minimal-msg-timestamp.args
index 42ca3cbf3807c06ba3d41c1c55c74dc0175bf2ff..d66bf7eb340789434b2f3e5b637db828745b7032 100644 (file)
--- a/tests/qemuxml2argvdata/minimal-msg-timestamp.args
+++ b/tests/qemuxml2argvdata/minimal-msg-timestamp.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/minimal-sandbox.args b/tests/qemuxml2argvdata/minimal-sandbox.args
index 3f7078605c386d8d1daf16f1e11d71013c1f0f1b..57b85b2eebb5f1f5c0c379c0ab05ad89dae3b1d5 100644 (file)
--- a/tests/qemuxml2argvdata/minimal-sandbox.args
+++ b/tests/qemuxml2argvdata/minimal-sandbox.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args
index 60253f43ec6e495558d004e3a22e50194b3fde10..b2aebf53027b70aa316c4cf7f6d3ce2ce869b5cb 100644 (file)
--- a/tests/qemuxml2argvdata/minimal.args
+++ b/tests/qemuxml2argvdata/minimal.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata/misc-acpi.args
index 5ddfded1512dc85605450a8aa65b1bf3e777cb1b..cb922d5063e7e31e2fac565dd042568e59063b53 100644 (file)
--- a/tests/qemuxml2argvdata/misc-acpi.args
+++ b/tests/qemuxml2argvdata/misc-acpi.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2argvdata/misc-disable-s3.args
index a327c45a8f4ab5da8728ed90dac7748201ed3bbe..861172117c29b4a816d79cd22d9405bc1baf1674 100644 (file)
--- a/tests/qemuxml2argvdata/misc-disable-s3.args
+++ b/tests/qemuxml2argvdata/misc-disable-s3.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemuxml2argvdata/misc-disable-suspends.args
index b36dfe8512649bc7885c63e6ae8aa4c8968f7f33..90f651b320e55849d99caba00caf7751b0b6545b 100644 (file)
--- a/tests/qemuxml2argvdata/misc-disable-suspends.args
+++ b/tests/qemuxml2argvdata/misc-disable-suspends.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2argvdata/misc-enable-s4.args
index 4b99bdd51c3dc9918748ec74cf94171a4f5125ad..e0a1ff0da94e6ffa057a31b4cd14b6e905e14c20 100644 (file)
--- a/tests/qemuxml2argvdata/misc-enable-s4.args
+++ b/tests/qemuxml2argvdata/misc-enable-s4.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/misc-no-reboot.args b/tests/qemuxml2argvdata/misc-no-reboot.args
index 057568bbe0f49fe64f71ae9984f515104e8d7904..61716fbeb1cd94f124f6e06824203866314aeb33 100644 (file)
--- a/tests/qemuxml2argvdata/misc-no-reboot.args
+++ b/tests/qemuxml2argvdata/misc-no-reboot.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-reboot \

diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata/misc-uuid.args
index 5ddfded1512dc85605450a8aa65b1bf3e777cb1b..cb922d5063e7e31e2fac565dd042568e59063b53 100644 (file)
--- a/tests/qemuxml2argvdata/misc-uuid.args
+++ b/tests/qemuxml2argvdata/misc-uuid.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args b/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args
index 8f3725ebd560a4176de6b0c44a2377c4c953428c..764d776f0d59fff66ddf1b4dbc5bef214d2517fe 100644 (file)
--- a/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args
+++ b/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args
index 2772c82ff6d3e143761942ac45fb90f724f7da7f..132d0e263a8c39774ccbb29d7215f7e55e1edc7b 100644 (file)
--- a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args b/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args
index 46e63a287f4631a163afa1ce1c156a2a97b3ae77..d89812e93fb8a69476962057acec3369d64f8488 100644 (file)
--- a/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args
+++ b/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args
index f77d866055563358de4d8916c8f6a91df9399d07..8061ebd9fbc2e9a439df61d4e4ee7ce12d8a3a0f 100644 (file)
--- a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/monitor-json.args b/tests/qemuxml2argvdata/monitor-json.args
index 50bbb36f27de4277446dd531baf3f200910c72ce..926e35abfa4d191fb1f2d2949eac02c653a2fb4f 100644 (file)
--- a/tests/qemuxml2argvdata/monitor-json.args
+++ b/tests/qemuxml2argvdata/monitor-json.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.args
index abf230fbac804f56bc257c4cd6b10c07774a79a4..a785247450c79053de7cbe173a101b9efed66019 100644 (file)
--- a/tests/qemuxml2argvdata/multifunction-pci-device.args
+++ b/tests/qemuxml2argvdata/multifunction-pci-device.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/name-escape.args b/tests/qemuxml2argvdata/name-escape.args
index 1ba2dfbf836e067fb24845db5e19f1a16efb6718..5b10ff1d5ca3adec3664c430ccad999c3781d63e 100644 (file)
--- a/tests/qemuxml2argvdata/name-escape.args
+++ b/tests/qemuxml2argvdata/name-escape.args
@@ -20,7 +20,7 @@ bar=2/master-key.aes \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo=1,,\
-bar=2/monitor.sock,server,nowait \
+bar=2/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-client.args b/tests/qemuxml2argvdata/net-client.args
index 0aa6645c4dd9ec72f0381076f1e56bd73222ee10..a5009f9c0cd39ee53a06ab740616fb56668e398a 100644 (file)
--- a/tests/qemuxml2argvdata/net-client.args
+++ b/tests/qemuxml2argvdata/net-client.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args b/tests/qemuxml2argvdata/net-eth-hostip.args
index ff136626a73fdd8c07bae27bef7817144f83eea8..d8c5c53c23ac57a79a03fed79b9580f236429bea 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth-hostip.args
+++ b/tests/qemuxml2argvdata/net-eth-hostip.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args b/tests/qemuxml2argvdata/net-eth-ifname.args
index ff136626a73fdd8c07bae27bef7817144f83eea8..d8c5c53c23ac57a79a03fed79b9580f236429bea 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth-ifname.args
+++ b/tests/qemuxml2argvdata/net-eth-ifname.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-eth-names.args b/tests/qemuxml2argvdata/net-eth-names.args
index a79edee5241044d59bee8c6b29f964626723fe0f..11b32c7d7d251da4aac5806ad61f4283ddb6aa72 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth-names.args
+++ b/tests/qemuxml2argvdata/net-eth-names.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
index 435843bc278af7875ee4038ae5f02c3a1a8bb64f..4f7a14ef1233ddd53aa560097d214f5bcf8153fe 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
+++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/net-eth.args
index ff136626a73fdd8c07bae27bef7817144f83eea8..d8c5c53c23ac57a79a03fed79b9580f236429bea 100644 (file)
--- a/tests/qemuxml2argvdata/net-eth.args
+++ b/tests/qemuxml2argvdata/net-eth.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
index 7c7e5bc3a22b53d3be230b50d14806453eba6251..df9f3f183d03a5112a292cf994e12f59f68e1921 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
index 46f28022fdb68c153de467599eafc29f7cfb0f9c..6721d5287213291a65c89c0f7440f010e9acb96c 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
index ed8332ddfee6ec192245b6a78d54f46a3e71e95f..0dcb4be035fb3664cf3a52e01cbad24921d59109 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args b/tests/qemuxml2argvdata/net-hostdev-vfio.args
index cd875f60c97c4515518e50207690066e5478d008..ef765a1723ec059d8264ff293343dfb239e6966b 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-hostdev.args b/tests/qemuxml2argvdata/net-hostdev.args
index bd49544de691909e53682d019dfdb643f41b2f40..1fee0edfa0b6e00adc5509590d7407bc2c3207b5 100644 (file)
--- a/tests/qemuxml2argvdata/net-hostdev.args
+++ b/tests/qemuxml2argvdata/net-hostdev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-many-models.args b/tests/qemuxml2argvdata/net-many-models.args
index 36b057131ffa5aa373f3d944500fbc7e65b1188e..e9005382217140a4b0686e89bf8b14e351e6399b 100644 (file)
--- a/tests/qemuxml2argvdata/net-many-models.args
+++ b/tests/qemuxml2argvdata/net-many-models.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-mcast.args b/tests/qemuxml2argvdata/net-mcast.args
index e8b71a3dedabb31fd9e771b3aee84d15c42a540e..41dd528c9b43c5301f8f9b2e9b7f7fc072ffca84 100644 (file)
--- a/tests/qemuxml2argvdata/net-mcast.args
+++ b/tests/qemuxml2argvdata/net-mcast.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-server.args b/tests/qemuxml2argvdata/net-server.args
index b92e5208202dfa2748e1aee4b9b1c84b2b64bc1e..b6b907bb07e48995a7edcd21030430bcdf101732 100644 (file)
--- a/tests/qemuxml2argvdata/net-server.args
+++ b/tests/qemuxml2argvdata/net-server.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/net-udp.args
index 1390298e2e23b679137dc70a1088256709eec1c2..ce6275da495423a5eb0c7e184fc763b3b47090fc 100644 (file)
--- a/tests/qemuxml2argvdata/net-udp.args
+++ b/tests/qemuxml2argvdata/net-udp.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-user-addr.args b/tests/qemuxml2argvdata/net-user-addr.args
index 5f1de305e065ebb31f0a451c521ac05465e9a26c..2ead18ac3f5b62033793033de433ad3794bbd6e6 100644 (file)
--- a/tests/qemuxml2argvdata/net-user-addr.args
+++ b/tests/qemuxml2argvdata/net-user-addr.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/net-user.args
index a8d43b068420f5cba40d5f39249653be8db33fa1..9e084551246edf6b30da6809d0cd0c93da7b9d50 100644 (file)
--- a/tests/qemuxml2argvdata/net-user.args
+++ b/tests/qemuxml2argvdata/net-user.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args b/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args
index 190b068191d64c105f00f63d4f05a34edd6e354e..e8d703fc8eb4d453a22aef6a3f2af0d41bd7a506 100644 (file)
--- a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args b/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args
index 002ec498a05a725a3b8b691cc3aa0c7fcd693162..fe14bd6575e60017c105399bf4cba1bf01c7df31 100644 (file)
--- a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
index 691ef39edd3353accc4ac9fe0905350f3c3350dd..84beff12f04784495b136001fd9472a8a0259fda 100644 (file)
--- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
+++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -27,7 +27,7 @@ server,nowait \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--chardev socket,id=charnet0,path=/tmp/vhost0.sock,server \
+-chardev socket,id=charnet0,path=/tmp/vhost0.sock,server=on \
 -netdev vhost-user,chardev=charnet0,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,\
 addr=0x3 \

diff --git a/tests/qemuxml2argvdata/net-vhostuser.args b/tests/qemuxml2argvdata/net-vhostuser.args
index 1acc910ad1038f6e1b112e823c0b294796745f45..aa8e94b83da6f40e7bcb92693faf1a89158f4cb2 100644 (file)
--- a/tests/qemuxml2argvdata/net-vhostuser.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.args
@@ -18,13 +18,13 @@ QEMU_AUDIO_DRV=none \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
 -usb \
--chardev socket,id=charnet0,path=/tmp/vhost0.sock,server \
+-chardev socket,id=charnet0,path=/tmp/vhost0.sock,server=on \
 -netdev vhost-user,chardev=charnet0,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,\
 addr=0x3 \

diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args b/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
index 58dcbb510b3d66221d4ba6208634414fca84b820..c8f8787f01ca3b310d1eaee9668f43514b43ad9a 100644 (file)
--- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
@@ -19,14 +19,14 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--chardev socket,id=charnet0,path=/tmp/vhost0.sock,server \
+-chardev socket,id=charnet0,path=/tmp/vhost0.sock,server=on \
 -netdev vhost-user,chardev=charnet0,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,\
 addr=0x2 \

diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
index d889d341685038b3df3f09df80ef258b2db22116..7d77f9dd85389c340a06c8d10902a46c0f69df96 100644 (file)
--- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
@@ -22,14 +22,14 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--chardev socket,id=charnet0,path=/tmp/vhost0.sock,server \
+-chardev socket,id=charnet0,path=/tmp/vhost0.sock,server=on \
 -netdev vhost-user,chardev=charnet0,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,\
 addr=0x2 \

diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.args b/tests/qemuxml2argvdata/net-virtio-ccw.args
index ed8eb9089cfa13f0c4affbd1fe6e2bdcc81e6665..419056f69e340258e285cea902fbf495e6dfdaf4 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/net-virtio-ccw.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-virtio-device.args b/tests/qemuxml2argvdata/net-virtio-device.args
index 67b0592fab93540187865a726e9e0f4fe2ff8c11..97f5f9e15264d2625498ca38027c84759a44a373 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-device.args
+++ b/tests/qemuxml2argvdata/net-virtio-device.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
index a9ac9687db18e18a8ea008d9171601b7fe6f9b57..58840a89c3d6a521dd41a892993a4d3f15ded0ae 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
+++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args b/tests/qemuxml2argvdata/net-virtio-netdev.args
index 32d3b6b54157858fc2f6f9c7e7af9c308448eaa8..4f8e0e362027319a4ff3679fdd19d90eda44543d 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-netdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-netdev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
index 758da237dd7742721029ec74803d867cf27b2f08..47598b0dc97bc0959d62f62d31bbc6db296cb0e2 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
+++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-virtio-s390.args b/tests/qemuxml2argvdata/net-virtio-s390.args
index b863943067aeb989f0609b6f20bf54c0ea8287ec..f1148aecef77e62116da957602119f3afc895c72 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-s390.args
+++ b/tests/qemuxml2argvdata/net-virtio-s390.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
index 19e7260843ad0bc2fb80256552fd91fcf2020fba..9a10497fc8af68aabe4300c42aedf93852ffdc85 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.args b/tests/qemuxml2argvdata/net-virtio-teaming.args
index 19e7260843ad0bc2fb80256552fd91fcf2020fba..9a10497fc8af68aabe4300c42aedf93852ffdc85 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio-teaming.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/net-virtio.args b/tests/qemuxml2argvdata/net-virtio.args
index 4beb5ca75ff5e97d06b338a2b03a27d5bf30bdcc..d59ca12429b4e0358c70fc7928631600d809b724 100644 (file)
--- a/tests/qemuxml2argvdata/net-virtio.args
+++ b/tests/qemuxml2argvdata/net-virtio.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvdata/nosharepages.args
index 3993edfc4b71d3062e1ba3e23bdd488ea8dbd3a0..91f4ab815e2026ffde8d78a5d10376dce1ad9933 100644 (file)
--- a/tests/qemuxml2argvdata/nosharepages.args
+++ b/tests/qemuxml2argvdata/nosharepages.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
index 7270aafeb73dfc99cbaf24a40b0061cec4c53574..b5e316a9a61c930607abc27936d1b076c894230a 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
index 7270aafeb73dfc99cbaf24a40b0061cec4c53574..b5e316a9a61c930607abc27936d1b076c894230a 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
index 7270aafeb73dfc99cbaf24a40b0061cec4c53574..b5e316a9a61c930607abc27936d1b076c894230a 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
index 7270aafeb73dfc99cbaf24a40b0061cec4c53574..b5e316a9a61c930607abc27936d1b076c894230a 100644 (file)
--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
+++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args
index 7270aafeb73dfc99cbaf24a40b0061cec4c53574..b5e316a9a61c930607abc27936d1b076c894230a 100644 (file)
--- a/tests/qemuxml2argvdata/numad.args
+++ b/tests/qemuxml2argvdata/numad.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
index 7270aafeb73dfc99cbaf24a40b0061cec4c53574..b5e316a9a61c930607abc27936d1b076c894230a 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
+++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.args b/tests/qemuxml2argvdata/numatune-auto-prefer.args
index babb23b9386e154ec12fcbddc27361bdb8309e49..f4e1368e0db8802ab183805260d5d5c268d3ad16 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-auto-prefer.args
+++ b/tests/qemuxml2argvdata/numatune-auto-prefer.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/numatune-distances.args b/tests/qemuxml2argvdata/numatune-distances.args
index a20b40b5c519ea5ea69929da83befe44948fddf4..6c6f675e04845d1e738b82c84845684977d5cd37 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-distances.args
+++ b/tests/qemuxml2argvdata/numatune-distances.args
@@ -61,7 +61,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args
index c52015caa8926c5770201b7c35253def8715edb0..ba01bb3c7573db2e37b68f04d746718a773714f0 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args
@@ -41,7 +41,7 @@ policy=write-back,line=8 \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
index 213efe0663226951cfbdfb0fb14aa33d95e1dd01..ba92a58748d177e892671dce72c0f0a05a63b939 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
@@ -24,7 +24,7 @@ policy=preferred \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/numatune-memnode.args b/tests/qemuxml2argvdata/numatune-memnode.args
index 64fdcd7bb1eb39ba92ff2eac23798cdab8a4c3ed..0c0902b3f96e6c89c50598f5d3b2af26a528423e 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-memnode.args
+++ b/tests/qemuxml2argvdata/numatune-memnode.args
@@ -28,7 +28,7 @@ host-nodes=5,host-nodes=7,policy=bind \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/numatune-memory.args b/tests/qemuxml2argvdata/numatune-memory.args
index 7270aafeb73dfc99cbaf24a40b0061cec4c53574..b5e316a9a61c930607abc27936d1b076c894230a 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memory.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/numatune-no-vcpu.args b/tests/qemuxml2argvdata/numatune-no-vcpu.args
index a1f1ee044ef664afe41556199231ee3f9e962ed9..02e268be078d11b156e75af292ba2786cdf02338 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-no-vcpu.args
+++ b/tests/qemuxml2argvdata/numatune-no-vcpu.args
@@ -25,7 +25,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args b/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args
index ab94f309df50045b4108102fc96b299439b40b22..d2222e237c22def9eb69fe078253c081c17bac7c 100644 (file)
--- a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args
@@ -24,7 +24,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args
index 1eb5aad17b92b486a9e7a3ee2069a91bb295915f..8317ebead6c94acde421769f12d7fba3a19d14ad 100644 (file)
--- a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args
@@ -36,7 +36,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args
index 9b8cbc45b975d4c77e44ebd1bb0b7740c11d07e0..dc4f019e9b1d30070c51312e0bcb03033932a28e 100644 (file)
--- a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args
@@ -35,7 +35,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args b/tests/qemuxml2argvdata/pages-dimm-discard.args
index a615dc0c182fd0168ffd073ddc908faf723b54aa..c1c00fe2ed26a8ccc3607368c15496f568ad27cf 100644 (file)
--- a/tests/qemuxml2argvdata/pages-dimm-discard.args
+++ b/tests/qemuxml2argvdata/pages-dimm-discard.args
@@ -28,7 +28,7 @@ size=536870912 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fedora/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.args b/tests/qemuxml2argvdata/pages-discard-hugepages.args
index bbf3c9f67a906d1424662a36f8c615985d52671e..aded905751509a1702901a2f5bebda4e471b3448 100644 (file)
--- a/tests/qemuxml2argvdata/pages-discard-hugepages.args
+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pages-discard.args b/tests/qemuxml2argvdata/pages-discard.args
index b2aed77ff94c8160dd48312374eafefc7f755f27..50cf431b41c21110f5933f5c864af79d1842b7c2 100644 (file)
--- a/tests/qemuxml2argvdata/pages-discard.args
+++ b/tests/qemuxml2argvdata/pages-discard.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/panic-double.args b/tests/qemuxml2argvdata/panic-double.args
index 745efc7cf29d30f1768a6e3eacfdb6621fc2327e..e7ffb53fdcec98cd2de3ba2a73ea048571250c36 100644 (file)
--- a/tests/qemuxml2argvdata/panic-double.args
+++ b/tests/qemuxml2argvdata/panic-double.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/panic-no-address.args b/tests/qemuxml2argvdata/panic-no-address.args
index b4adee02bcb3f17ff7e409c209a7de7075c0bbb0..c890b657e9de148b28c2832201bdcfad538202de 100644 (file)
--- a/tests/qemuxml2argvdata/panic-no-address.args
+++ b/tests/qemuxml2argvdata/panic-no-address.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/panic.args b/tests/qemuxml2argvdata/panic.args
index 51e107e1d056746b8090529c1ee6d3f6e8409451..5af4675b0bfef0a4de0a482be62aa6a7b5cf24a5 100644 (file)
--- a/tests/qemuxml2argvdata/panic.args
+++ b/tests/qemuxml2argvdata/panic.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args b/tests/qemuxml2argvdata/parallel-parport-chardev.args
index c1b18521743a4e58e2da06b8cfc424a75ca79721..3af0c36f69ccc6b0d9e4375d538e6a3928c6739e 100644 (file)
--- a/tests/qemuxml2argvdata/parallel-parport-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
index 2ab87fb17a0ad29a769945e509b725a836c7ff38..03c6fe551e06bd80ec3032a957eebc24f6b0e46e 100644 (file)
--- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -27,6 +27,6 @@ server,nowait \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--chardev socket,id=charparallel0,host=127.0.0.1,port=9999,server,nowait \
+-chardev socket,id=charparallel0,host=127.0.0.1,port=9999,server=on,wait=off \
 -device isa-parallel,chardev=charparallel0,id=parallel0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
index b1ea53a46834470bca703ad9bd21b791c76f3ddf..b1211ca8674e13650f17c262377b749f46ff3ce8 100644 (file)
--- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
@@ -19,14 +19,14 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--chardev socket,id=charparallel0,path=/tmp/parport0.socket,server,nowait \
+-chardev socket,id=charparallel0,path=/tmp/parport0.socket,server=on,wait=off \
 -device isa-parallel,chardev=charparallel0,id=parallel0 \
 -chardev socket,id=charparallel1,path=/tmp/parport1.socket \
 -device isa-parallel,chardev=charparallel1,id=parallel1 \

diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args
index ea333ef5f8de88e3d8949f9ed1b106b770e6659a..1bd0a798a7c21ad1f1665b3556e118ad8e42cd19 100644 (file)
--- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args
@@ -22,14 +22,14 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--chardev socket,id=charparallel0,fd=1729,server,nowait \
+-chardev socket,id=charparallel0,fd=1729,server=on,wait=off \
 -device isa-parallel,chardev=charparallel0,id=parallel0 \
 -chardev socket,id=charparallel1,path=/tmp/parport1.socket \
 -device isa-parallel,chardev=charparallel1,id=parallel1 \

diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2argvdata/pci-autoadd-addr.args
index 69826389f6f8ed939bad4a383c4c50e38b93c3fa..d1cfa1ff31bc3f223aa27a8bbb845fc8ba837d49 100644 (file)
--- a/tests/qemuxml2argvdata/pci-autoadd-addr.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fdr-br/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2argvdata/pci-autoadd-idx.args
index 2d22f9679177e5c58ab9674328d800c88ffc6b52..789bf0de3b2ca77e6f6e92722a25f6bb83eb8bd9 100644 (file)
--- a/tests/qemuxml2argvdata/pci-autoadd-idx.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fdr-br/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2argvdata/pci-autofill-addr.args
index 76d94144a6a088814800de73876970ed6d6ae2be..6d2fc8bb92630e2b0b13bfb685bfab4d928e7d6b 100644 (file)
--- a/tests/qemuxml2argvdata/pci-autofill-addr.args
+++ b/tests/qemuxml2argvdata/pci-autofill-addr.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fdr-br/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
index 18cc4b9fb0e303f273ddb1631aa2f34cbf74b19e..a09e7592dc251adc2fbaaf8161292ada37f6819b 100644 (file)
--- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
+++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-lots-of-disks/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-lots-of-disks/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdata/pci-bridge.args
index 4b26702ef3fc381182bc3781eabdd0eb52e9b99c..646aa3567ee4278c600d998d93445fbf3ada4053 100644 (file)
--- a/tests/qemuxml2argvdata/pci-bridge.args
+++ b/tests/qemuxml2argvdata/pci-bridge.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fdr-br/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2argvdata/pci-expander-bus.args
index 64279760dd7d1d2f5a409e6ad8f057d14bc552db..1e99a8448e938c0578d14ef9431a7a3ddc6e7917 100644 (file)
--- a/tests/qemuxml2argvdata/pci-expander-bus.args
+++ b/tests/qemuxml2argvdata/pci-expander-bus.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-expander-test/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-expander-test/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args
index 056c2a53401a448c8e5331ac0b87b6dc4ea5bb3f..d9dfd437408b2427450d8b375a632132e17fafd1 100644 (file)
--- a/tests/qemuxml2argvdata/pci-many.args
+++ b/tests/qemuxml2argvdata/pci-many.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fdr-br/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args b/tests/qemuxml2argvdata/pci-rom-disabled.args
index 1dd16957076ae8cc0aa06958f6d870ece884944d..4eb57617fb5f6606daf4eecc63ee2b7fdfead162 100644 (file)
--- a/tests/qemuxml2argvdata/pci-rom-disabled.args
+++ b/tests/qemuxml2argvdata/pci-rom-disabled.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args
index d82e1d047bd2649f16945ad5a3faaf21f3de2493..2b189580178914b72ba545d16c732049c7885116 100644 (file)
--- a/tests/qemuxml2argvdata/pci-rom.args
+++ b/tests/qemuxml2argvdata/pci-rom.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
index 92858a21673cbb0fa9dbe929d40bb39f6902dbd3..f875695426c0091203b6c5cce06e6e2fe62739c4 100644 (file)
--- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2argvdata/pcie-expander-bus.args
index a241324def87c72055babd2602e5739baacc0535..dfb711a22720d49309adbee09073836d95c1e9e0 100644 (file)
--- a/tests/qemuxml2argvdata/pcie-expander-bus.args
+++ b/tests/qemuxml2argvdata/pcie-expander-bus.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-pcie-expander-bus-te/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-pcie-expander-bus-te/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
index 9438366bc55c5dd21b42ae3085c597db7b2f176f..ab9dec6c8cf5fe2a1f63373b73c3e4f1853ad05b 100644 (file)
--- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
index 134be6bcd0b966d3ec7b6d2f75a4169ab687a6b5..baf7141af0a5a2fcc739a16109b8a15755f0d699 100644 (file)
--- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args
index 619b03a3eb10a77c3be770228b511c0a87d6ce4b..0c1932fbfcc3e38396979cd700788bbd2ce6ce91 100644 (file)
--- a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2argvdata/pcie-root-port.args
index 004010069b900ecd4e638ae7913504c8ae6bb3c3..2b9e97c723372a1d67bd44bd6f493e9f94fb3ab2 100644 (file)
--- a/tests/qemuxml2argvdata/pcie-root-port.args
+++ b/tests/qemuxml2argvdata/pcie-root-port.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pcie-root.args b/tests/qemuxml2argvdata/pcie-root.args
index 18d26b4a8ee5b56373b22cd2dcb467c4668a4157..9f7aaf1bd9641496b8bd73d6bfae1b753ff722db 100644 (file)
--- a/tests/qemuxml2argvdata/pcie-root.args
+++ b/tests/qemuxml2argvdata/pcie-root.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
index a15c7d45731483bd7e732413144aa35e3ba2c6ac..b5521751a9d15a039af8d6c5781dd71b9a0e498a 100644 (file)
--- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
index a479b1494d4bed80e31ebce4c4cfd8061130e6bc..9cd1b87e12cc319827ac2fd0eebf68e7b2b1dba8 100644 (file)
--- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argvdata/pcihole64-q35.args
index 9831ee388c82fa49a77197054b69e80a4660b60d..5871a3ec6bd7ccb36bdb7f4ec26ec6fbad579bec 100644 (file)
--- a/tests/qemuxml2argvdata/pcihole64-q35.args
+++ b/tests/qemuxml2argvdata/pcihole64-q35.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata/pcihole64.args
index 4557dc24199a3c935a3de6f049a4f5a29676dc4a..1646f0398fc7439c7d3745a5a547a7cd74f02a16 100644 (file)
--- a/tests/qemuxml2argvdata/pcihole64.args
+++ b/tests/qemuxml2argvdata/pcihole64.args
@@ -18,8 +18,8 @@ QEMU_AUDIO_DRV=none \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,server,\
-nowait \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,\
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args b/tests/qemuxml2argvdata/pmu-feature-off.args
index 37ab3eacb14f5b1a2d099e2df743a72cd28319b3..62c236de0e9ad8f1cce957a882966c94646db1d5 100644 (file)
--- a/tests/qemuxml2argvdata/pmu-feature-off.args
+++ b/tests/qemuxml2argvdata/pmu-feature-off.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pmu-feature.args b/tests/qemuxml2argvdata/pmu-feature.args
index b0ac52367829b000112982f67fc08837b51d2f39..5aa04fe7e281e8fc698e0f23febc284c69edd233 100644 (file)
--- a/tests/qemuxml2argvdata/pmu-feature.args
+++ b/tests/qemuxml2argvdata/pmu-feature.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/ppc-dtb.args b/tests/qemuxml2argvdata/ppc-dtb.args
index f3ac10bea23f6e14e3e539c7029d74950b55c605..1b2f04ec12b0e9ce63f6731e89974661627c95a1 100644 (file)
--- a/tests/qemuxml2argvdata/ppc-dtb.args
+++ b/tests/qemuxml2argvdata/ppc-dtb.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args
index c72b0de2ef671ab5aefc9c2b3293585d22781a17..a6ab61aa8520480876bbb0d0cbacdde26bc5dbf1 100644 (file)
--- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args
@@ -23,7 +23,7 @@ memory-backend=ppc_spapr.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args
index ce6b9b0cad9b74a943037c0888b499435bf240d5..164360d998e472a30cbbf7061ebae7634dde1d9d 100644 (file)
--- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args
@@ -23,7 +23,7 @@ memory-backend=ppc_spapr.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args
index 18e748863371bc66631fdd897671bdddff171141..fa26e1843c508667413a49116517bb2e73fe5e40 100644 (file)
--- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args
@@ -23,7 +23,7 @@ memory-backend=ppc_spapr.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args
index 5679ba419da28990e83a344f40169e1fb7117a9f..9d68d3c43dcb4f6489e228d2dc5eea93d925220f 100644 (file)
--- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args
@@ -23,7 +23,7 @@ memory-backend=ppc_spapr.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args
index 252023784b1bf2fc2c4dba960ae4445f0eebb8d5..a7d60b2bb5d660f2d84d95c7ab5a4acc500c5049 100644 (file)
--- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args
@@ -23,7 +23,7 @@ memory-backend=ppc_spapr.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args
index deeeb8b0432750046617be993b75eea490896976..a3e172776aeff913939d76d367d8c49cf24c56b6 100644 (file)
--- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args
@@ -23,7 +23,7 @@ memory-backend=ppc_spapr.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args
index 4b6d90c3a22492779032fb7fe1cdc81466df11ba..cbb84645bf78ad438f47e372160adcd068d10e45 100644 (file)
--- a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args
@@ -22,7 +22,7 @@ memory-backend=ppc_spapr.ram \
 -uuid b35969f7-e7cf-4d90-a9a0-4dd9000f9824 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -40,7 +40,7 @@ id=virtio-disk0,bootindex=1 \
 addr=0x1 \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
--chardev socket,id=charchannel0,fd=1729,server,nowait \
+-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
 -device usb-tablet,id=input0,bus=usb.0,port=1 \

diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
index 67357696c629666d743b36bbc9a64b23b1f1209d..7a07fc7c879cb1178edc08d5b73689da48184d1a 100644 (file)
--- a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
@@ -23,7 +23,7 @@ memory-backend=ppc_spapr.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -41,7 +41,7 @@ id=virtio-disk0,bootindex=1 \
 addr=0x1 \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
--chardev socket,id=charchannel0,fd=1729,server,nowait \
+-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \

diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args
index 6190b82cb5d83faab3010d30a3b2ef49ba825217..c10d055f2f7433dc6da4d90313e38cad8c868058 100644 (file)
--- a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args
@@ -23,7 +23,7 @@ memory-backend=ppc_spapr.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args
index cac8c2736d1107498d03f271154fba2460c4a688..1d8027fbea4c21bf3d62f886d28f5c6d5d4f95e9 100644 (file)
--- a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args
@@ -23,7 +23,7 @@ memory-backend=ppc_spapr.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
index 49349449cf68da052756dc971d9c2d6a1dea333c..5956ddc32d8a6bc06cb469bd2a3c77749700d21c 100644 (file)
--- a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
index d40f8cf2012974e9ff2ebe7b109f9d5f9a7c2bf0..2fa92aeb30754fdec1e51abd4e50c538e65b36b9 100644 (file)
--- a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller.args b/tests/qemuxml2argvdata/ppc64-usb-controller.args
index 7d6ba64fb84092bf7e86f6fe38e6a091dbb3ed67..60adefd18bfc5a75dd996865b8da44c156639d38 100644 (file)
--- a/tests/qemuxml2argvdata/ppc64-usb-controller.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/ppce500-serial.args b/tests/qemuxml2argvdata/ppce500-serial.args
index 3728b4dc22ef3fa50bde8e9a65a344f06c08dd9b..8867b8fc7d82b6bf13baba7bd751f498a08bb479 100644 (file)
--- a/tests/qemuxml2argvdata/ppce500-serial.args
+++ b/tests/qemuxml2argvdata/ppce500-serial.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-basic.args b/tests/qemuxml2argvdata/pseries-basic.args
index 574e3b164e8312bfff98d4e56b39e7bf68ccc1c0..dcd03a528655951a0fd1d9931888dea210ba944a 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-basic.args
+++ b/tests/qemuxml2argvdata/pseries-basic.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-console-virtio.args b/tests/qemuxml2argvdata/pseries-console-virtio.args
index 7c853216b65043781ad0dab9b2e7d34b90ff984b..4018188aaf9fac714e302a8d2104ad03218fb66b 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-console-virtio.args
+++ b/tests/qemuxml2argvdata/pseries-console-virtio.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
index ece96ee52f9b14b9272201f75de30310b5421f2f..9cf6de5acb96555a53b65072df2aa503da3a861c 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat.args b/tests/qemuxml2argvdata/pseries-cpu-compat.args
index 1c643449b5e97edf3fd38f64f6230190815fb272..e89a40c6a4faf17ef91448518597b478749afa41 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-cpu-compat.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-cpu-exact.args b/tests/qemuxml2argvdata/pseries-cpu-exact.args
index 5949d95113cdc2075c5c27141c5c2bbc12f2905f..458c0e97ed5dc1caba0f1eec8ceacc55e404f052 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-cpu-exact.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-exact.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-cpu-le.args b/tests/qemuxml2argvdata/pseries-cpu-le.args
index 9645918e619f3fd010731ae18a97b97066c34b57..7ae9345af58e97f9f974b5e24dfb8c6a96d43f16 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-cpu-le.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-le.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-features.args b/tests/qemuxml2argvdata/pseries-features.args
index 668eeb157b01c978a3f91dc1a6e4f9cf6f025ea3..1557018a06e9eecf04bf43692e6cbfedf6213dce 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-features.args
+++ b/tests/qemuxml2argvdata/pseries-features.args
@@ -21,7 +21,7 @@ cap-cfpc=fixed,cap-sbbc=broken,cap-ibs=fixed-ccd \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown

diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-1.args b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
index 51ec025dce760c23d143a4ce6584561adf662d6f..06061bff2af4d82ca515bff4e641e58bc108389d 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-hostdevs-1.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-2.args b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
index 87b6d928bec1c168563910bce35aa55347c0b7ad..d775d3a361c40b2379c761d301ba6f1252abccd9 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-hostdevs-2.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-3.args b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
index 5820140065fac0dceb455a893bb191f7f12f1ec6..2c88672b1009f7e9801ad73c8392666b9b9a3dd8 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-hostdevs-3.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
index 1d9a7b1987e67ffc9eac6cd85710a32db73e365c..46eaf7c9ab95616329a72129877fa13004653316 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
+++ b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown

diff --git a/tests/qemuxml2argvdata/pseries-many-buses-1.args b/tests/qemuxml2argvdata/pseries-many-buses-1.args
index 6290a5fe245871e2cd649cf3fc552dc3d771407a..1a103148649e2a54778512eab4db78f4c1b78b96 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-many-buses-1.args
+++ b/tests/qemuxml2argvdata/pseries-many-buses-1.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-many-buses-2.args b/tests/qemuxml2argvdata/pseries-many-buses-2.args
index 0e8a269ab25a9c853b5fb79acb41e13b24cb1050..c1c0fd21f9b1b968acd611cee1d97c8f0f276d85 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-many-buses-2.args
+++ b/tests/qemuxml2argvdata/pseries-many-buses-2.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-many-devices.args b/tests/qemuxml2argvdata/pseries-many-devices.args
index e5e1d94231069678df0e73c5d06ac5bce00a8f33..cfd3ba04c2ae2aec459d5e187df760fac0f380e5 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-many-devices.args
+++ b/tests/qemuxml2argvdata/pseries-many-devices.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-nvram.args b/tests/qemuxml2argvdata/pseries-nvram.args
index aabd97c0879c03863377cf53b0383323d0ee1bce..574fb54f7cb9dc82848ee0f265ce1e24c4bf6510 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-nvram.args
+++ b/tests/qemuxml2argvdata/pseries-nvram.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-panic-missing.args b/tests/qemuxml2argvdata/pseries-panic-missing.args
index 574e3b164e8312bfff98d4e56b39e7bf68ccc1c0..dcd03a528655951a0fd1d9931888dea210ba944a 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-panic-missing.args
+++ b/tests/qemuxml2argvdata/pseries-panic-missing.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-panic-no-address.args b/tests/qemuxml2argvdata/pseries-panic-no-address.args
index 574e3b164e8312bfff98d4e56b39e7bf68ccc1c0..dcd03a528655951a0fd1d9931888dea210ba944a 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-panic-no-address.args
+++ b/tests/qemuxml2argvdata/pseries-panic-no-address.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-phb-default-missing.args b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
index c0725bfce493c6b3f2cd30cf32d7c53a68689d3e..d6486d456557ce98b34c4aa5c3e3e203f73348f8 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-phb-default-missing.args
+++ b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.args b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
index ca25e84d0ebbdad024f60ed3cf947ad03220c014..b1fb43315b875e1d3c38c817c1456accd8f5aadb 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-phb-numa-node.args
+++ b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
@@ -25,7 +25,7 @@ policy=bind \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-phb-simple.args b/tests/qemuxml2argvdata/pseries-phb-simple.args
index c0725bfce493c6b3f2cd30cf32d7c53a68689d3e..d6486d456557ce98b34c4aa5c3e3e203f73348f8 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-phb-simple.args
+++ b/tests/qemuxml2argvdata/pseries-phb-simple.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-serial-native.args b/tests/qemuxml2argvdata/pseries-serial-native.args
index 9a5f8c83008311becbe67b02e1cff63b63501432..04c4753697e824ad64798e313aebfcb889d39428 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-serial-native.args
+++ b/tests/qemuxml2argvdata/pseries-serial-native.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-serial-pci.args b/tests/qemuxml2argvdata/pseries-serial-pci.args
index 930532527f0272f5a3803b7c0d8aec372bd7611a..ce9f1447544adddc158276ec42591386d7491b13 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-serial-pci.args
+++ b/tests/qemuxml2argvdata/pseries-serial-pci.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-serial-usb.args b/tests/qemuxml2argvdata/pseries-serial-usb.args
index 104f0d5491dede970618e7b706dba097e90b3226..81e459d51e3f521f2382915c474184be680a74b6 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-serial-usb.args
+++ b/tests/qemuxml2argvdata/pseries-serial-usb.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-usb-default.args b/tests/qemuxml2argvdata/pseries-usb-default.args
index 5de177780a11696a2239a4274ed3dffcb0f5d906..b3c79b91ae5bbc286eb963e1c20f9794bcae8168 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-usb-default.args
+++ b/tests/qemuxml2argvdata/pseries-usb-default.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-usb-kbd.args b/tests/qemuxml2argvdata/pseries-usb-kbd.args
index 61246e4672e67f75d220f13da4255d32466ae2d0..ee5832c8454616ad3076ce41d752ae14f46c01e9 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-usb-kbd.args
+++ b/tests/qemuxml2argvdata/pseries-usb-kbd.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-usb-multi.args b/tests/qemuxml2argvdata/pseries-usb-multi.args
index b811c024e8d9c24d3357e378a7473952fa453968..6dbee0a3f7d19503d035c9e002b97e5d3c2876f9 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-usb-multi.args
+++ b/tests/qemuxml2argvdata/pseries-usb-multi.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
index a412593c9a9e424548826bc66c6a63f632c53db5..710f46f8cd54f98fa24299c7fb33ba90b462ea30 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
+++ b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pseries-vio.args b/tests/qemuxml2argvdata/pseries-vio.args
index a500e9b4b9400ef2deed5a9b0ea290b3ee74c4b0..e5039310b35cad413d1aed9f193be4cf31d804ee 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-vio.args
+++ b/tests/qemuxml2argvdata/pseries-vio.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args
index 7e3c90e4672ee5a3109e0345cf567ac619a316c1..1c457767334a2fb0f2dcf26f6b5f8ef9d070bc46 100644 (file)
--- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args
+++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args
index 76e439c2b4eafdd4392992ea0a4f6e6e71605e96..5ea400491581133841a19397eac5a5dca1f544dd 100644 (file)
--- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args
index 30f45b8a04a3065097ee5e8e67dbbdde6daf05d9..67fc4f7a9a3c7f6177725d7e9f9d26cec61efe6d 100644 (file)
--- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args
index c5d00952425074c016463e6551ce308f03dddc1f..e71610b1032b5398ccd2634366eacec7b958a6f3 100644 (file)
--- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args
+++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args
index e19ebfda0bafd63f0066eba964214604362f8416..cb7198c867b1f8c3333deaf89b9a5f0c420cd02b 100644 (file)
--- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args
index beb0e5f2efe50d73e8c5c9d21e7d6feef69f23c0..1fb095efbc57ca36db73d84b5f80f4647d779f69 100644 (file)
--- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/q35-acpi-nouefi.args b/tests/qemuxml2argvdata/q35-acpi-nouefi.args
index 09e06c96eaf7237ee5a011a8b7df9de4871d0e72..727403a09977ea80bbd5eef2a5a67904c23a4cfc 100644 (file)
--- a/tests/qemuxml2argvdata/q35-acpi-nouefi.args
+++ b/tests/qemuxml2argvdata/q35-acpi-nouefi.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.args b/tests/qemuxml2argvdata/q35-acpi-uefi.args
index d00fe5bc1d7a37f6e425431a78f9422eecf227f9..4de89dadf0ccecc8556fc8d5a05a0f9dd8d52b43 100644 (file)
--- a/tests/qemuxml2argvdata/q35-acpi-uefi.args
+++ b/tests/qemuxml2argvdata/q35-acpi-uefi.args
@@ -24,7 +24,7 @@ unit=1 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown

diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.args b/tests/qemuxml2argvdata/q35-default-devices-only.args
index 90f41509dfb684598b4257389c77150c5ec96ee1..64eeb0eb43b73c11822a0344df02ec07c291f1c3 100644 (file)
--- a/tests/qemuxml2argvdata/q35-default-devices-only.args
+++ b/tests/qemuxml2argvdata/q35-default-devices-only.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/q35-multifunction.args b/tests/qemuxml2argvdata/q35-multifunction.args
index b720a6c3da4053ab03c83f8bc6c4c2c993c91a25..a813d918397a83cb5ff2f615fa96c0cd45562e84 100644 (file)
--- a/tests/qemuxml2argvdata/q35-multifunction.args
+++ b/tests/qemuxml2argvdata/q35-multifunction.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
index de34dff1cf868c6fcb3e773c488e4b0f0e460457..213ed70c2ec063b54e4d70ca5a1450ac87ae6bf2 100644 (file)
--- a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
+++ b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemuxml2argvdata/q35-pci-force-address.args
index b3be5171beaa69b04e282871ca8658dc633b6568..9726b7cb2626aec571b8fff64f3c93c5ef5dcd8b 100644 (file)
--- a/tests/qemuxml2argvdata/q35-pci-force-address.args
+++ b/tests/qemuxml2argvdata/q35-pci-force-address.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.args b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
index 4e173501a9197d2334ffd713e7b2a06d84e882b1..923f043b02a61f44488f4e14133cf98de293873d 100644 (file)
--- a/tests/qemuxml2argvdata/q35-pcie-autoadd.args
+++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/q35-pcie.args b/tests/qemuxml2argvdata/q35-pcie.args
index e741e849f0e8729a522251e6e7aa934b6a4ef860..bfbd7bc5ca9505677d5b0ba43650a3bf0c35827c 100644 (file)
--- a/tests/qemuxml2argvdata/q35-pcie.args
+++ b/tests/qemuxml2argvdata/q35-pcie.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
index ccde17059b992a0d363890406dc23fcbec7580af..48e5a1a53031af543ec26784ee3088c603574021 100644 (file)
--- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
@@ -18,8 +18,8 @@ QEMU_AUDIO_DRV=none \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35/monitor.sock,server,\
-nowait \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35/monitor.sock,\
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args b/tests/qemuxml2argvdata/q35-pm-disable.args
index 86340d331819703b504bdd0ac585b49739a03b13..6c5d381f1eea4e7c3206cf64fd55cc3053fc03bb 100644 (file)
--- a/tests/qemuxml2argvdata/q35-pm-disable.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable.args
@@ -18,8 +18,8 @@ QEMU_AUDIO_DRV=none \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35/monitor.sock,server,\
-nowait \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35/monitor.sock,\
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2argvdata/q35-usb2-multi.args
index 82e54d112184b5a92fc3fca2aea057b45986ef62..c2ce8fc6ff90ba74e426bbd28268d3e1bc3e7ee4 100644 (file)
--- a/tests/qemuxml2argvdata/q35-usb2-multi.args
+++ b/tests/qemuxml2argvdata/q35-usb2-multi.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2argvdata/q35-usb2-reorder.args
index 23629eaa79b48d68dc969e495d7142bf3677f0c0..e6a9d63e808d85a236aab7db87d0589a087f9c9f 100644 (file)
--- a/tests/qemuxml2argvdata/q35-usb2-reorder.args
+++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args
index ab393428e5dceb037206ac714443c4e71bee7530..48780f3ebe74787a1ab02ccd6286f60abd2878e0 100644 (file)
--- a/tests/qemuxml2argvdata/q35-usb2.args
+++ b/tests/qemuxml2argvdata/q35-usb2.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
index dbe9cf94787988d3da032a7e96de7cb00f2c037c..508f3022527d454da330c260ef1b1994d780aab7 100644 (file)
--- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-virt-manager-basic/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-virt-manager-basic/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,driftfix=slew \
 -no-hpet \
@@ -44,8 +44,8 @@ addr=0x0 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \
 -chardev socket,id=charchannel0,\
-path=/tmp/channel/domain--1-virt-manager-basic/org.qemu.guest_agent.0,server,\
-nowait \
+path=/tmp/channel/domain--1-virt-manager-basic/org.qemu.guest_agent.0,\
+server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
 -chardev spicevmc,id=charchannel1,name=vdagent \

diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.args b/tests/qemuxml2argvdata/q35-virtio-pci.args
index ca4ed91da73df3932135189df22c3a171b065284..e6aebe721419865ccb22f9bd34ab206b918ded4c 100644 (file)
--- a/tests/qemuxml2argvdata/q35-virtio-pci.args
+++ b/tests/qemuxml2argvdata/q35-virtio-pci.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args
index 5ca5917fc057cc2f49f3b1a51282ae602ae2610b..aa7588f2342050f893dfd9afe0bb6cc8c7fb70e6 100644 (file)
--- a/tests/qemuxml2argvdata/q35.args
+++ b/tests/qemuxml2argvdata/q35.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvdata/qemu-ns-alt.args
index 7e4cffa4d0b65fd02b85213f2f53e2a2af9eb440..734941fa9bd99cb4b4a014365e0c076436af170a 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-alt.args
+++ b/tests/qemuxml2argvdata/qemu-ns-alt.args
@@ -21,7 +21,7 @@ BAR='' \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
index fc1592f1689bd63fdfdf366e263a93ed59ed0068..93385fd88af087e6b3cdfb8043c4e6e26f42e513 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
index fc1592f1689bd63fdfdf366e263a93ed59ed0068..93385fd88af087e6b3cdfb8043c4e6e26f42e513 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemu-ns-commandline.args
index fc1592f1689bd63fdfdf366e263a93ed59ed0068..93385fd88af087e6b3cdfb8043c4e6e26f42e513 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
index fc1592f1689bd63fdfdf366e263a93ed59ed0068..93385fd88af087e6b3cdfb8043c4e6e26f42e513 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
index fc1592f1689bd63fdfdf366e263a93ed59ed0068..93385fd88af087e6b3cdfb8043c4e6e26f42e513 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
index fc1592f1689bd63fdfdf366e263a93ed59ed0068..93385fd88af087e6b3cdfb8043c4e6e26f42e513 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemu-ns-no-env.args
index 74f7b887610c26c959bae7bd63c97cb12367c599..9318aea1d39cfa26417338486aa43511e450b1ba 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns-no-env.args
+++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args b/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
index 0f3253f8316890cd296006565a66f8039ac26604..7ca07bd83b14602100c8acde8702fe18dbea354b 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args
index aefe486298ecb84fa01c6b4fcfd7bba4b1d8530c..f666cecca0198046f72ba51199c4857dedd00b0d 100644 (file)
--- a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args
@@ -24,7 +24,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
index 1ddc18b7c56e9faa4f417af5c1ff8160b500e7ec..6662b3cc46607de57c16164a2abc6a492896d466 100644 (file)
--- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
index e31f37e11232b9b201aaec8a900142fdcec4e76e..372ea1af96a3311daa71def76186f0cc48c9cedf 100644 (file)
--- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args b/tests/qemuxml2argvdata/restore-v2-fd.args
index cc0a7514830eff97fbac9d01287fd701d5e57a2b..5de70a4d93c6de0ccefd513a4b20f8b7feed1247 100644 (file)
--- a/tests/qemuxml2argvdata/restore-v2-fd.args
+++ b/tests/qemuxml2argvdata/restore-v2-fd.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/restore-v2.args b/tests/qemuxml2argvdata/restore-v2.args
index ac3d16f3c3744a6e92418e35af546d7f35c90ea2..946477517a7c3cd555326f0bae454be6b3975be6 100644 (file)
--- a/tests/qemuxml2argvdata/restore-v2.args
+++ b/tests/qemuxml2argvdata/restore-v2.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args
index 612e1ce0493b007d48e76804198498612c99b397..e1e2b51fe96ef3e239c61788065e84cfdd93a967 100644 (file)
--- a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args
+++ b/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args
@@ -19,7 +19,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 -uuid 96bc2754-8842-4714-a45f-3f69e7a9a852 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -46,7 +46,7 @@ id=virtio-disk0,bootindex=1 \
 addr=0x0 \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
--chardev socket,id=charchannel0,fd=1729,server,nowait \
+-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
 -device usb-tablet,id=input0,bus=usb.0,port=1 \

diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
index 8485e3d0f8dedeacb0cd387b2362de7974c58534..78b4522ac248478d1563489c836f065d9290df2b 100644 (file)
--- a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
+++ b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -46,7 +46,7 @@ id=virtio-disk0,bootindex=1 \
 addr=0x0 \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
--chardev socket,id=charchannel0,fd=1729,server,nowait \
+-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.5,addr=0x0 \

diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.args b/tests/qemuxml2argvdata/riscv64-virt-pci.args
index 0b919721491b888d1f9a5629bdbd8bd21ae1432e..749539fbcb203d45b1839b5bc9da422564fe4fa5 100644 (file)
--- a/tests/qemuxml2argvdata/riscv64-virt-pci.args
+++ b/tests/qemuxml2argvdata/riscv64-virt-pci.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-riscv64/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/riscv64-virt.args b/tests/qemuxml2argvdata/riscv64-virt.args
index 1631e46b1c4a2820746ecd6d51f2009a8d4257d4..21b95f12f5561e34924fc853707ff07b2bec7d21 100644 (file)
--- a/tests/qemuxml2argvdata/riscv64-virt.args
+++ b/tests/qemuxml2argvdata/riscv64-virt.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-riscv64/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args
index 573d953602396d6b8532544b77b52b5b71c4594b..e951e1396c76f755cbb83ce2f430ed7496a9a0a9 100644 (file)
--- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args
+++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args
index 573d953602396d6b8532544b77b52b5b71c4594b..e951e1396c76f755cbb83ce2f430ed7496a9a0a9 100644 (file)
--- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args
+++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args
index a8be43af55c68c917a574a7674aed0a75f99b81c..ad0a4142c55f0445150f8e91e5d84ad631325daa 100644 (file)
--- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args
+++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args
@@ -23,7 +23,7 @@ memory-backend=s390.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args
index 62ffe279c4c2fd7f1ffa1dfd0d9a2e313d573266..0ce16d7019ec8fa64923e81b18255336192290d3 100644 (file)
--- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args
+++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args
@@ -28,7 +28,7 @@ cmm=on \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args
index f57880ce171518efd7dfb954e3326a9cfe570c8d..083a150d7bb3d51a3faea5f07346b03cb851eb42 100644 (file)
--- a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args
+++ b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args
@@ -23,7 +23,7 @@ memory-backend=s390.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args
index 155e9b3183c53ade1d35ca182d9d8fa228dac882..7003070ecefa33cf271e1953282c4e6387b6dc86 100644 (file)
--- a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args
+++ b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args
@@ -23,7 +23,7 @@ memory-backend=s390.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/s390-panic-missing.args b/tests/qemuxml2argvdata/s390-panic-missing.args
index ef24f8f90c8a35dfeaf0897ee87ff9236affb32a..dc5539c60d98c52152c007100319d50c0480c857 100644 (file)
--- a/tests/qemuxml2argvdata/s390-panic-missing.args
+++ b/tests/qemuxml2argvdata/s390-panic-missing.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/s390-panic-no-address.args b/tests/qemuxml2argvdata/s390-panic-no-address.args
index 60ddab9e1d736ea4219e60d32672f192e24961e2..30a85a37ddd6f5a3931e726a96857554c4d7ea07 100644 (file)
--- a/tests/qemuxml2argvdata/s390-panic-no-address.args
+++ b/tests/qemuxml2argvdata/s390-panic-no-address.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/s390-serial-2.args b/tests/qemuxml2argvdata/s390-serial-2.args
index e6103ced322b8dbc3b9fc022171f63c122978b0f..3f3ef6a2c946e84218a9e435a3083feffc51e296 100644 (file)
--- a/tests/qemuxml2argvdata/s390-serial-2.args
+++ b/tests/qemuxml2argvdata/s390-serial-2.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/s390-serial-console.args b/tests/qemuxml2argvdata/s390-serial-console.args
index cb454ef47c47bac415adb4b3cb51cc148a142b70..705ece04d0523ca115d530a460ba7253cb48b092 100644 (file)
--- a/tests/qemuxml2argvdata/s390-serial-console.args
+++ b/tests/qemuxml2argvdata/s390-serial-console.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/s390-serial.args b/tests/qemuxml2argvdata/s390-serial.args
index cb454ef47c47bac415adb4b3cb51cc148a142b70..705ece04d0523ca115d530a460ba7253cb48b092 100644 (file)
--- a/tests/qemuxml2argvdata/s390-serial.args
+++ b/tests/qemuxml2argvdata/s390-serial.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args
index 8c8667065c8ed84bf78abc8c77a50c8dffc655ce..7f304b9f77355e48274444b3aaffa03c1afaddc9 100644 (file)
--- a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args
+++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args
@@ -22,7 +22,7 @@ memory-backend=s390.ram \
 -uuid a7ca230a-fbe0-48b8-8ea6-25836f8cbc32 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -37,7 +37,7 @@ bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-ccw,netdev=hostnet0,id=net0,mac=52:54:00:09:1a:29,\
 devno=fe.0.0001 \
--chardev socket,id=charchannel0,fd=1729,server,nowait \
+-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
 -chardev pty,id=charconsole0 \

diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
index c44c4dd8d987e11a7ab8783d7439d5a59e136442..630a290cab6dee37b02480f2c4c5dd9f83fd440b 100644 (file)
--- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
+++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
@@ -23,7 +23,7 @@ memory-backend=s390.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -38,7 +38,7 @@ bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-ccw,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,\
 devno=fe.0.0001 \
--chardev socket,id=charchannel0,fd=1729,server,nowait \
+-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
 -chardev pty,id=charconsole0 \

diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2argvdata/seclabel-dac-none.args
index 60253f43ec6e495558d004e3a22e50194b3fde10..b2aebf53027b70aa316c4cf7f6d3ce2ce869b5cb 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dac-none.args
+++ b/tests/qemuxml2argvdata/seclabel-dac-none.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
index 60253f43ec6e495558d004e3a22e50194b3fde10..b2aebf53027b70aa316c4cf7f6d3ce2ce869b5cb 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
index 60253f43ec6e495558d004e3a22e50194b3fde10..b2aebf53027b70aa316c4cf7f6d3ce2ce869b5cb 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
index b561a7713990214edca93563ece714f835f52bea..5aeb8b671d09e78251c5beac293dda0322470e0a 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
index 60253f43ec6e495558d004e3a22e50194b3fde10..b2aebf53027b70aa316c4cf7f6d3ce2ce869b5cb 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2argvdata/seclabel-dynamic.args
index 60253f43ec6e495558d004e3a22e50194b3fde10..b2aebf53027b70aa316c4cf7f6d3ce2ce869b5cb 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-dynamic.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argvdata/seclabel-none.args
index 60253f43ec6e495558d004e3a22e50194b3fde10..b2aebf53027b70aa316c4cf7f6d3ce2ce869b5cb 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-none.args
+++ b/tests/qemuxml2argvdata/seclabel-none.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
index 60253f43ec6e495558d004e3a22e50194b3fde10..b2aebf53027b70aa316c4cf7f6d3ce2ce869b5cb 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qemuxml2argvdata/seclabel-static-relabel.args
index 60253f43ec6e495558d004e3a22e50194b3fde10..b2aebf53027b70aa316c4cf7f6d3ce2ce869b5cb 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-static-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2argvdata/seclabel-static.args
index 60253f43ec6e495558d004e3a22e50194b3fde10..b2aebf53027b70aa316c4cf7f6d3ce2ce869b5cb 100644 (file)
--- a/tests/qemuxml2argvdata/seclabel-static.args
+++ b/tests/qemuxml2argvdata/seclabel-static.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
index 239c13167d3deb2d10645b203338b39702840be7..183614f59bdaff50c859e3eb823290c79ddb7805 100644 (file)
--- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args b/tests/qemuxml2argvdata/serial-dev-chardev.args
index 96053f22c3e5e09624426ac07b2405ab0f17e816..d124288946c737656f34a040ea12a94b82f14230 100644 (file)
--- a/tests/qemuxml2argvdata/serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args b/tests/qemuxml2argvdata/serial-file-chardev.args
index 435b9eb689fba169f038bb394a6e49ea7a50d44c..f43814f2f6f16dd07775a4108a108b33b06f16a0 100644 (file)
--- a/tests/qemuxml2argvdata/serial-file-chardev.args
+++ b/tests/qemuxml2argvdata/serial-file-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/serial-file-log.args b/tests/qemuxml2argvdata/serial-file-log.args
index 35334297ff577b93d05d8ee3dd7e109dd56318eb..1ac8961f3eee5de8e9658d6c6cd048a730f81e4e 100644 (file)
--- a/tests/qemuxml2argvdata/serial-file-log.args
+++ b/tests/qemuxml2argvdata/serial-file-log.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args b/tests/qemuxml2argvdata/serial-many-chardev.args
index 31800b30ffb71fdb4eceffc762ad6f6b9628badd..2fed5cb400aa7f5eb899b309e2517163965d0f82 100644 (file)
--- a/tests/qemuxml2argvdata/serial-many-chardev.args
+++ b/tests/qemuxml2argvdata/serial-many-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args b/tests/qemuxml2argvdata/serial-pty-chardev.args
index 4d6d6e376cc5aac1dc1f271b486ad73c6ec91636..92804e504666e47f4ce22b46431dca44ec8ab5fd 100644 (file)
--- a/tests/qemuxml2argvdata/serial-pty-chardev.args
+++ b/tests/qemuxml2argvdata/serial-pty-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.args b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
index 60253f43ec6e495558d004e3a22e50194b3fde10..b2aebf53027b70aa316c4cf7f6d3ce2ce869b5cb 100644 (file)
--- a/tests/qemuxml2argvdata/serial-spiceport-nospice.args
+++ b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/serial-spiceport.args b/tests/qemuxml2argvdata/serial-spiceport.args
index 6e3d4e4ea0e87e0870054c17a1e4667b02d115f9..79578276d1299f913ae9554cde85f86546caf6b6 100644 (file)
--- a/tests/qemuxml2argvdata/serial-spiceport.args
+++ b/tests/qemuxml2argvdata/serial-spiceport.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args b/tests/qemuxml2argvdata/serial-tcp-chardev.args
index dd91391343d54fe59178ad60adac4d4902ec096a..407ebc471dedeec17a8e330bbf83789dbf7f5dd3 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
index a372863fa78b6433c1eb767e891319dc80c2213c..8d1a8b4805f0c4f144a3048b2a0ef15be5b7e152 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -27,6 +27,7 @@ server,nowait \
 -usb \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
--chardev socket,id=charserial0,host=127.0.0.1,port=9999,telnet,server,nowait \
+-chardev socket,id=charserial0,host=127.0.0.1,port=9999,telnet=on,server=on,\
+wait=off \
 -device isa-serial,chardev=charserial0,id=serial0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
index c08869bd491907d5682f5196aa0c777eb04d9bd5..a62fc4feb0e11ce3026c7e60a4b0377b6d42bbd8 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
index c84e58eef3f74cbf43b0c33517c29f5824194cb4..486d1ace09d2b0a9f141c11d88aff7e5ad374992 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
index c84e58eef3f74cbf43b0c33517c29f5824194cb4..486d1ace09d2b0a9f141c11d88aff7e5ad374992 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
index 051c8abc14b26b7e65679206e83bcdc475ab8a88..9d199240a2c19fa1a959e4fa4eb17c4dd3369601 100644 (file)
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args b/tests/qemuxml2argvdata/serial-udp-chardev.args
index 27fda9241839100cef63fad4fd6d879d4bf46300..1cf3fa6d43bd10dd780839159c4825a446532e00 100644 (file)
--- a/tests/qemuxml2argvdata/serial-udp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-udp-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args b/tests/qemuxml2argvdata/serial-unix-chardev.args
index 26998323ff9ee6d4f7e4c1da780d4b74c18b78d1..1fa068edf75d1c0368381cce9ba92a1da2620459 100644 (file)
--- a/tests/qemuxml2argvdata/serial-unix-chardev.args
+++ b/tests/qemuxml2argvdata/serial-unix-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -27,6 +27,6 @@ server,nowait \
 -usb \
 -chardev socket,id=charserial0,path=/tmp/serial.sock \
 -device isa-serial,chardev=charserial0,id=serial0 \
--chardev socket,id=charserial1,path=/tmp/serial-server.sock,server,nowait \
+-chardev socket,id=charserial1,path=/tmp/serial-server.sock,server=on,wait=off \
 -device isa-serial,chardev=charserial1,id=serial1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
index 07b7aba42fc1e245f36b903caffa6294dc8606b7..de245de15ee4eec1846f668f57cd770852d3cd1b 100644 (file)
--- a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -31,7 +31,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
 -chardev socket,id=charserial0,path=/tmp/serial.sock \
 -device isa-serial,chardev=charserial0,id=serial0 \
--chardev socket,id=charserial1,fd=1729,server,nowait \
+-chardev socket,id=charserial1,fd=1729,server=on,wait=off \
 -device isa-serial,chardev=charserial1,id=serial1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\

diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args b/tests/qemuxml2argvdata/serial-vc-chardev.args
index f5a5bab576e1ffbf7410e2ce90eeef77533d1970..5038b4c666e5a01c126aed3cfa163fea7aec800a 100644 (file)
--- a/tests/qemuxml2argvdata/serial-vc-chardev.args
+++ b/tests/qemuxml2argvdata/serial-vc-chardev.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
index 93d089c27a0798fb5ceaa41ec671d800c77fd902..a5d86266171387885688c8238d82c7b13387a428 100644 (file)
--- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
+++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/shmem.args b/tests/qemuxml2argvdata/shmem.args
index f2f3c3e95d42d0bb54e75ef928140585a9b4e355..439bacb0b863ef167d0a2a9283fb83842ad918be 100644 (file)
--- a/tests/qemuxml2argvdata/shmem.args
+++ b/tests/qemuxml2argvdata/shmem.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/smartcard-controller.args b/tests/qemuxml2argvdata/smartcard-controller.args
index 7e9442045d9bf106ca8c856415c96d6ad75f475f..026a72b2e1252d21243c4b36a696e450e829e734 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-controller.args
+++ b/tests/qemuxml2argvdata/smartcard-controller.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
index 938164966804e250bf1eeaf6fa132fa0e0d613fb..e9f7f9a79333b16d3011d8f53c042f683b0c9813 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args b/tests/qemuxml2argvdata/smartcard-host-certificates.args
index eecc454343b4cf20b104cdc97c6dd564376b2484..caa0fda9c114226400f6708b19de5a1717117e1e 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-host-certificates.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/smartcard-host.args b/tests/qemuxml2argvdata/smartcard-host.args
index 7e9442045d9bf106ca8c856415c96d6ad75f475f..026a72b2e1252d21243c4b36a696e450e829e734 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-host.args
+++ b/tests/qemuxml2argvdata/smartcard-host.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
index 983648a21f293292c4fcf2d025c14d5abf1772c8..be96baa5cfe7c84f674564a2274b3de45aed4567 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
index bac4418803d5aae970b5e3df0a9cff9c43d456f2..f040c1a20414b77c474bf88f903f68761287fa22 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
@@ -19,13 +19,13 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
 -no-acpi \
 -usb \
 -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
--chardev socket,id=charsmartcard0,host=127.0.0.1,port=2001,server,nowait \
+-chardev socket,id=charsmartcard0,host=127.0.0.1,port=2001,server=on,wait=off \
 -device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
index 7eb54497ef6b55c86f624b2e930f032aa9ee839f..a3b4b958238e5434523ef2c0ce4bfae9043c81bd 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -27,7 +27,7 @@ server,nowait \
 -boot strict=on \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
 -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
--chardev socket,id=charsmartcard0,path=/tmp/smartcard.sock,server,nowait \
+-chardev socket,id=charsmartcard0,path=/tmp/smartcard.sock,server=on,wait=off \
 -device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args
index 3e0262e49cc16ddb82d398e50cc1bdb2afc70bcf..c1be164adadb26b2da7f4d186a5f8a02eda6baef 100644 (file)
--- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -30,7 +30,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -boot strict=on \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
 -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
--chardev socket,id=charsmartcard0,fd=1729,server,nowait \
+-chardev socket,id=charsmartcard0,fd=1729,server=on,wait=off \
 -device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\

diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.args b/tests/qemuxml2argvdata/smbios-type-fwcfg.args
index 372ae779b62509ab76f1a709fac3c8d2d826f9c7..fed3b5721dd7a7db797dc355f7278f36452bbc1d 100644 (file)
--- a/tests/qemuxml2argvdata/smbios-type-fwcfg.args
+++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.args
@@ -27,7 +27,7 @@ serial=W1KS427111E,location=Not Available' \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args
index 8ded1cb085dfda70bdf33777eade66f71799528f..384e3600c97578e0a83a752514bfb64a2f53a1ec 100644 (file)
--- a/tests/qemuxml2argvdata/smbios.args
+++ b/tests/qemuxml2argvdata/smbios.args
@@ -29,7 +29,7 @@ asset=40000101,sku=Type3Sku1' \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/smp-dies.args
index 632e9d8e34f695e4ae1b1490bb0d1b816dcbe3b5..82a134dc55ed56f8912f8f675bef703531c3d931 100644 (file)
--- a/tests/qemuxml2argvdata/smp-dies.args
+++ b/tests/qemuxml2argvdata/smp-dies.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args
index dbf714c9764700cd69592ccafafa73171c65c32f..9d93d1112adc4fd77afb59b4d0ff43dd5e913a87 100644 (file)
--- a/tests/qemuxml2argvdata/smp.args
+++ b/tests/qemuxml2argvdata/smp.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/sound-device.args b/tests/qemuxml2argvdata/sound-device.args
index ce159a705469e5ce03dba50a37daef2c49027a82..153992784758e482d724c5158a3ab232adc8a4cd 100644 (file)
--- a/tests/qemuxml2argvdata/sound-device.args
+++ b/tests/qemuxml2argvdata/sound-device.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/sound.args b/tests/qemuxml2argvdata/sound.args
index 7ed0c1e507f580bd245266353f576f0b3f16153d..7299e313e5c0e9f1cf710ceae04df8faf4792783 100644 (file)
--- a/tests/qemuxml2argvdata/sound.args
+++ b/tests/qemuxml2argvdata/sound.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/sparc-minimal.args b/tests/qemuxml2argvdata/sparc-minimal.args
index b91a4e85b4ee18343f7ed3051703ea447b346b39..a556f3bd90ff1b3ed534789deea50333956d5f31 100644 (file)
--- a/tests/qemuxml2argvdata/sparc-minimal.args
+++ b/tests/qemuxml2argvdata/sparc-minimal.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\
-path=/tmp/lib/domain--1-redhat62sparc/monitor.sock,server,nowait \
+path=/tmp/lib/domain--1-redhat62sparc/monitor.sock,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args
index 96bf940b76125c7f8fc214823bbb72414d4ecedf..a5ccfbfbc6598c2ead885bef4d317f1d7230116c 100644 (file)
--- a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args
@@ -23,7 +23,7 @@ memory-backend=ppc_spapr.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args
index 90505c7a76af3badc28efda551eac95a0df5127d..01483a00957c34dcb0ef65ebdc6ac6169e6a258b 100644 (file)
--- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args
@@ -23,7 +23,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args
index 90505c7a76af3badc28efda551eac95a0df5127d..01483a00957c34dcb0ef65ebdc6ac6169e6a258b 100644 (file)
--- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args
@@ -23,7 +23,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args
index 90505c7a76af3badc28efda551eac95a0df5127d..01483a00957c34dcb0ef65ebdc6ac6169e6a258b 100644 (file)
--- a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args
@@ -23,7 +23,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args
index 90505c7a76af3badc28efda551eac95a0df5127d..01483a00957c34dcb0ef65ebdc6ac6169e6a258b 100644 (file)
--- a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args
@@ -23,7 +23,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args
index 911d0c660c6be1a2754af51fdbf4e638644b80c0..315c048fc630fe8f7b266ce1a1f98580f05416ad 100644 (file)
--- a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args
@@ -23,7 +23,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args
index 5da7d13a3d8c85b169dbbe3e4bd8f0504b9038df..6c408cd565ccd75bcacb23b41820d246a882da15 100644 (file)
--- a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args
@@ -23,7 +23,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
index 2e931dfe9a57f05f9c6d3101addb8915ca6f6a6b..83c5e1e5067d35689c733cfb0430a2148a7c6388 100644 (file)
--- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
@@ -24,7 +24,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args b/tests/qemuxml2argvdata/usb-controller-default-q35.args
index 9b4f99c042504519ce4e0edd17b12eac6a9df6fb..7ab18673764b79888b5d521183085eabde9ead11 100644 (file)
--- a/tests/qemuxml2argvdata/usb-controller-default-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
index ef7a60a7d63469f06cf65dd61ed14087f983e42c..99f3d01f8f1cbe1db1a6e7e4e3e0499be984bfe3 100644 (file)
--- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
index d93bd4f1ad3b74979f57c979c95138af02f4dd49..99f60f8528fe808c2d734ba8a47d1cd156c0aea5 100644 (file)
--- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args b/tests/qemuxml2argvdata/usb-controller-xhci.args
index a23d0c47104e7b469cf321accd5288001069ad9d..170ff8854aad2ce0fe6e7731b54112d9057de7b1 100644 (file)
--- a/tests/qemuxml2argvdata/usb-controller-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-xhci.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-controller.args b/tests/qemuxml2argvdata/usb-controller.args
index 4aa1388409f40798552d88b209abb4414ed77e13..44f9a6428c50948bc3cae7ca8201a311b9d85312 100644 (file)
--- a/tests/qemuxml2argvdata/usb-controller.args
+++ b/tests/qemuxml2argvdata/usb-controller.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
index b944dcb78e3ea781f74f602591248139fd38a7e4..04fa255f89baa24a4af324c93aa77214ab081548 100644 (file)
--- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args b/tests/qemuxml2argvdata/usb-hub-autoadd.args
index fbfc88bedeab211915ce252179d42617fb805fe5..5879acad474a8832fffd62d17010e1405dc7710a 100644 (file)
--- a/tests/qemuxml2argvdata/usb-hub-autoadd.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args
index 24b5217455031fe1420ac2e2a95c3f78b6958a5c..c44d88f0f3811f73f7bbc979f08b48e29375888d 100644 (file)
--- a/tests/qemuxml2argvdata/usb-hub.args
+++ b/tests/qemuxml2argvdata/usb-hub.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
index dee4c843be774cf4bd688ac9445e90f1a1b9ab78..b9cb8f3e760744d0ed69e58c065b74370a073a35 100644 (file)
--- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml2argvdata/usb-ich9-companion.args
index b1f2478e722856fb5f35faa1494b83783b1528be..d881ddc0d8eb0780f72cdc949492a2e8bad3cc9b 100644 (file)
--- a/tests/qemuxml2argvdata/usb-ich9-companion.args
+++ b/tests/qemuxml2argvdata/usb-ich9-companion.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
index a2c46c00f714858e95ddd0158e26d3192233fff9..42e8bb1ad0143ba766f91b2924d6227f99846e15 100644 (file)
--- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
+++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml2argvdata/usb-long-port-path.args
index caddab712dcfac046b9f2e838ee5c45feb04259a..dec30fda2b44967063627193602bd9a9fdf2a5b1 100644 (file)
--- a/tests/qemuxml2argvdata/usb-long-port-path.args
+++ b/tests/qemuxml2argvdata/usb-long-port-path.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.args
index a3a01b7e7445b8e47c04b4d45a21f6d1479b6265..e6ad110ace025ee7f4669ec5b029d61bb7f339e1 100644 (file)
--- a/tests/qemuxml2argvdata/usb-none.args
+++ b/tests/qemuxml2argvdata/usb-none.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args b/tests/qemuxml2argvdata/usb-piix3-controller.args
index 6000e89bbf08298d590a7f62e3917e6c76cc9302..8093847463addc6b279510a8af06c352ce4cc026 100644 (file)
--- a/tests/qemuxml2argvdata/usb-piix3-controller.args
+++ b/tests/qemuxml2argvdata/usb-piix3-controller.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxml2argvdata/usb-port-autoassign.args
index bd3c573a86256a5e205620b46b187670bd2aa1f3..ae0bdb621efcb70485bc977768105927b0a73bd9 100644 (file)
--- a/tests/qemuxml2argvdata/usb-port-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-port-autoassign.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-port-missing.args b/tests/qemuxml2argvdata/usb-port-missing.args
index 480968883d469fd491bda1b7ad8f411b18df618e..12064bfe91393a7f2c52465af812cb1a0b253ef5 100644 (file)
--- a/tests/qemuxml2argvdata/usb-port-missing.args
+++ b/tests/qemuxml2argvdata/usb-port-missing.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-ports.args b/tests/qemuxml2argvdata/usb-ports.args
index 5f04bf088d412bc38169adcbe502f9efd832bd2f..c956641f846272f23025555812bc253de64f523b 100644 (file)
--- a/tests/qemuxml2argvdata/usb-ports.args
+++ b/tests/qemuxml2argvdata/usb-ports.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args b/tests/qemuxml2argvdata/usb-redir-boot.args
index 9f6b49310d179a0eb1c5c2527217cf2ef188559a..3932a074168762f025a14759d4803b0c2cc142eb 100644 (file)
--- a/tests/qemuxml2argvdata/usb-redir-boot.args
+++ b/tests/qemuxml2argvdata/usb-redir-boot.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/qemuxml2argvdata/usb-redir-filter-version.args
index 89dcbfaaa1400feb4cd230cdb69185a3499515d2..87cdc4e4e881caeb8c93e2a64297ca7b13eb06d4 100644 (file)
--- a/tests/qemuxml2argvdata/usb-redir-filter-version.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args b/tests/qemuxml2argvdata/usb-redir-filter.args
index d801505f9819d3ed98d8100658cd4feb778d2194..1b81dec9d41ccf16e3beee0957549254fa2b7ccc 100644 (file)
--- a/tests/qemuxml2argvdata/usb-redir-filter.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
index a8a90a81cbecea14f0f1fdbddb43415e7342f0bb..ab9a69416f9bcc6d09c64e7c766e59d40d61d9df 100644 (file)
--- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -32,7 +32,7 @@ addr=0x4 \
 -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
 -chardev socket,id=charredir0,path=/tmp/connect.socket \
 -device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=1 \
--chardev socket,id=charredir1,path=/tmp/listen.socket,server,nowait \
+-chardev socket,id=charredir1,path=/tmp/listen.socket,server=on,wait=off \
 -device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args
index 1d247b03376250badc166bec71f2a45f8fb4084f..9d46dba1823ac205127f614af83bb71c9853a50c 100644 (file)
--- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -35,7 +35,7 @@ addr=0x4 \
 -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
 -chardev socket,id=charredir0,path=/tmp/connect.socket \
 -device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=1 \
--chardev socket,id=charredir1,fd=1729,server,nowait \
+-chardev socket,id=charredir1,fd=1729,server=on,wait=off \
 -device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\

diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata/usb-redir.args
index d4f1e0dd0e4390b7a022eba674ad2ab57b3b6fdd..2ce5efd655af3219cb6237e2c70410da477952f0 100644 (file)
--- a/tests/qemuxml2argvdata/usb-redir.args
+++ b/tests/qemuxml2argvdata/usb-redir.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
index d68ff5f90f4d22273c3c109d428763ee9f45e4ab..21dcbbf19eb6a178324d784272e04286ad6f1f2f 100644 (file)
--- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata/usb1-usb2.args
index 9098cc6d9aa49ed57214c5c9edd29c0ff7a5d580..6ccb6d8d9aff53eca9b0583a4c055de740e0c1be 100644 (file)
--- a/tests/qemuxml2argvdata/usb1-usb2.args
+++ b/tests/qemuxml2argvdata/usb1-usb2.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/user-aliases-usb.args b/tests/qemuxml2argvdata/user-aliases-usb.args
index abaf54cef3ba3c9e590cdde6606e7902c38dc196..d9d4b154c9bd34155408efec353d71aeb5c017ed 100644 (file)
--- a/tests/qemuxml2argvdata/user-aliases-usb.args
+++ b/tests/qemuxml2argvdata/user-aliases-usb.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-gentoo/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/user-aliases.args b/tests/qemuxml2argvdata/user-aliases.args
index e0eed48abf5ccce9fffc092115fc6a422139d7f6..9b574d9a304fbf0eaeee0afaa89a8c7036c9101b 100644 (file)
--- a/tests/qemuxml2argvdata/user-aliases.args
+++ b/tests/qemuxml2argvdata/user-aliases.args
@@ -32,7 +32,7 @@ mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=yes,size=1073741824 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-gentoo/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -76,8 +76,8 @@ mac=52:54:00:8c:b1:f8,bus=pci.0,addr=0xa \
 -chardev pty,id=charserial1 \
 -device isa-serial,chardev=charserial1,id=serial1 \
 -chardev socket,id=charchannel0,\
-path=/var/lib/libvirt/qemu/channel/target/gentoo.org.qemu.guest_agent.0,server,\
-nowait \
+path=/var/lib/libvirt/qemu/channel/target/gentoo.org.qemu.guest_agent.0,\
+server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
 -vnc 127.0.0.1:0 \

diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.args b/tests/qemuxml2argvdata/vcpu-placement-static.args
index 7ceb67964626a76b0d426a7c01206eabeb6bd3a0..35c3645b661a5d526d6be1ce0f93e93322ef9159 100644 (file)
--- a/tests/qemuxml2argvdata/vcpu-placement-static.args
+++ b/tests/qemuxml2argvdata/vcpu-placement-static.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-dummy2/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args
index dd5f68abc545b13d458132666df548d177f36db4..bf44d34cae894dfa0023476b069a5226566a005b 100644 (file)
--- a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args
@@ -25,7 +25,7 @@ size=15032385536 \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
index 24cafed4006e9a1aeb59c65d875b3a6fc97b77a3..fb086f00aa14f7e58a532de40c67de6438475813 100644 (file)
--- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
@@ -25,7 +25,7 @@ size=2147483648 \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args
index e99a5342dc2a7a512f80d3bbdb8de4bac8b227ac..49298aacccd71160531d375ab600d2f27498d226 100644 (file)
--- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args
@@ -23,7 +23,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args
index 277bf8c6463a8ca0e46d926d1217cb370d3c0e45..2899fcb86de7a08734879472becb780aaa0351c2 100644 (file)
--- a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args
@@ -23,7 +23,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args
index bc9102eab30fe44b65f6c06b6c4852617d76a3c6..bf0cf593fd48a3867362206d1510769ce62a2c71 100644 (file)
--- a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args
@@ -23,7 +23,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
index c70f0519a958a6220f6dd58916ec20e768b74cdd..da6a071c13a87409ba0bdc0dfa962d5b9dfbbc99 100644 (file)
--- a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
@@ -23,7 +23,7 @@ memory-backend=s390.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args
index aed32eef251fafbc4842d199e0bbf787a4eb00fa..e147b5d431ce6d16c25512387df8985d9974a13b 100644 (file)
--- a/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args
@@ -23,7 +23,7 @@ memory-backend=s390.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
index e1b17eba660704f24841a54a6c1ff3e9927c4444..6749612d451af8e71e65bc243e12ed93c73dfc51 100644 (file)
--- a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
@@ -23,7 +23,7 @@ memory-backend=s390.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args
index a461d4d242225224550949c3b8e265301cc44b9e..b1b481d2ea5c024a3b2e662ebf4611de5b4ace9b 100644 (file)
--- a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-test/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args
index 094c96aad6e460e77c3834869358c44668505e57..2f5a930e5b6c279f8dd33aa49e7fe5c63671db1b 100644 (file)
--- a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
index 4ffc2295d06ebae0364c73eaf17cd417d1674ec5..5d9468afac1978847652b6c47bb3051873d42237 100644 (file)
--- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
+++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-none-device.args b/tests/qemuxml2argvdata/video-none-device.args
index 193ff21414c59b3dda598e2afb090d0aca8bb6af..fe905bbee1505e1aa463d082a2e67625f2ae0bde 100644 (file)
--- a/tests/qemuxml2argvdata/video-none-device.args
+++ b/tests/qemuxml2argvdata/video-none-device.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
index aef42cc1c8f27aea65b57a9ecb54963e0c620b87..068698ea1added802549e68d0b21935f0fa7082a 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args
index 6f38fae69c00c4ef141e0b6adcd3006cb4a493fa..9f4dc02eda6922b5afd3102d0bc101f875d03d53 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-qxl-device.args b/tests/qemuxml2argvdata/video-qxl-device.args
index 575a6d4cfd1a14406e9a8e757a870cc52b22d5e2..d2b89896980aa6582fb790417c6cfe415e93a1b3 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-device.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args b/tests/qemuxml2argvdata/video-qxl-heads.args
index 74cab50ba506b65a2a1aacacc135b3e67af71fcd..c82396aaa2b06519a2759b3ecb14d06a75053459 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-qxl-heads.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-qxl-nodevice.args b/tests/qemuxml2argvdata/video-qxl-nodevice.args
index 830b5f9c3ea13e05f38012ac2f13e41e3a3531c6..05e63652bc2c7514f0fd6252b964dc1ac4bdcd93 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-nodevice.args
+++ b/tests/qemuxml2argvdata/video-qxl-nodevice.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args b/tests/qemuxml2argvdata/video-qxl-noheads.args
index 8c38697fe77fb8a682daee567e86759e02fb8fd2..8796cb5c42ae287f415e188bffe1fa91de3e75d5 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-noheads.args
+++ b/tests/qemuxml2argvdata/video-qxl-noheads.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.args b/tests/qemuxml2argvdata/video-qxl-resolution.args
index 1fdaf7e02e852901ab04e325f3cd61a398ce4304..caae72275665a12da8b5a9dc19f5ed0d41ed9427 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-resolution.args
+++ b/tests/qemuxml2argvdata/video-qxl-resolution.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
index 3c47329c8d55894e78cbc81569232b4555623f5f..cf1fca540153507e2a88ccb40bf810789d467adc 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args
index e79c21eaf0a365a17e5456e8683252853efd4e89..fb94af72fef409cef7a7a4ff84d740b699c0968e 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args b/tests/qemuxml2argvdata/video-qxl-sec-device.args
index 6fb728658ad515c900efc377ff5d5dcc69c04a5c..f46e6526bd338677c5d68613d096014335dd8008 100644 (file)
--- a/tests/qemuxml2argvdata/video-qxl-sec-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args
index 5e4d4db34160e66f44c7ad473bd0413d829d4a87..9b65c937e1123566921337438f61d847cd55c6f3 100644 (file)
--- a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
index c267f4bf676bbfa4bfa4bc3f5d5f2357251164fe..ad4b3bac6a3742fae30557b48bac3bbab06e24c2 100644 (file)
--- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-vga-device.args b/tests/qemuxml2argvdata/video-vga-device.args
index 132d67ed89e8c6d1e4295f716bb0a2e84e39cc03..9f289280cb23dccc0d986212432764415b6bf8fd 100644 (file)
--- a/tests/qemuxml2argvdata/video-vga-device.args
+++ b/tests/qemuxml2argvdata/video-vga-device.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-vga-nodevice.args b/tests/qemuxml2argvdata/video-vga-nodevice.args
index cf21cafcef17b712c3ee88fb0485b43482719fe2..a97f63c95ab908d37c42a66c119bc6e126a53d09 100644 (file)
--- a/tests/qemuxml2argvdata/video-vga-nodevice.args
+++ b/tests/qemuxml2argvdata/video-vga-nodevice.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
index 154bc1c2b7529ddf60ed9f00e329882868d30c2a..e237ad0d363f226e6e97cbcbfc4b5a43f24b21fa 100644 (file)
--- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
index 45c7701ac1d77510e969546d4e295be4c27c0e11..836ded461b991b9234b2d2efaf2013dffcb8cf43 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
index 050d989bad5f18ace03351bb34b9631566ffcf33..2d91c390a94b820c7c14cab105d805594d8f1e6e 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
index 7a5df4054690ee256f956f7a90d20d59f3136059..380be0b66d759b0b7eaf331297e4cd30a71b63d8 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
@@ -17,7 +17,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
index 860eaf0e6b8c3cb16d31a56e0f96d4dd4edf7944..31a7ecd2445bfffaeabf9f963e072d3c295d62ca 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
index 8852351ef031699ccd98c5055cc458ae5b20c522..480174bd1d95699eba6a50247f4726c9e3435c59 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=spice \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
index 42760eba6076c7a2f1db636904ff94fb13c89798..6c6b4e96df0f1941fbdf7ace796a33aa910a6b4b 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args b/tests/qemuxml2argvdata/video-virtio-vga.args
index cb87552342f15670b049bedb6429526d17289197..138347d44e45c0a956711c1dcd1dc4772de05237 100644 (file)
--- a/tests/qemuxml2argvdata/video-virtio-vga.args
+++ b/tests/qemuxml2argvdata/video-virtio-vga.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args
index 601d4d272e700c7b86a330bcf069e90c5fcc2233..9f2ae2a61f69c4ecc00fdf3ea874bfce0b8e0fef 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args
index 4e453a2b0539be9ccdee1954c24008e6d00167e4..2c49d3e50095ef9d462720df147bb758e77671b8 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/qemuxml2argvdata/virtio-input-passthrough.args
index d26952c1816a5f456c9446533301f9b6fbffe5dc..ea0e9e178f873084d399276ffa35dfd9478c4034 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-input-passthrough.args
+++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-input.args b/tests/qemuxml2argvdata/virtio-input.args
index c89997af6b02f05c4bd70782b436cf0c62720571..48a45c810c687c7ca5547224dcdd93320428abd6 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-input.args
+++ b/tests/qemuxml2argvdata/virtio-input.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-lun.args b/tests/qemuxml2argvdata/virtio-lun.args
index 850501142a3c50d1b5f8c22f0dfe54ae227cf389..d9979a99b500259dcebc70957214db2d7ae5d645 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-lun.args
+++ b/tests/qemuxml2argvdata/virtio-lun.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
index 82a977b731e9dcaee4724e24fde4b50c9d69213a..3259bdc4f165bd20cf5ad7bedb80e93a3fd4ece5 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
+++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
index 8674a4b99d2caf962499af075f3b6c47207d86c2..44de382429a60a39f51760d7a7a95a443eece75d 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.args
index 6552ee68f02490959c5ce0145c8ef67555974bff..48f051f183d4f9f42635cab445abd45bfc40208f 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.args
index 15eb4b5c491abbd9a8516e2602b2cb7e6f4d441d..c9dfb6690104ced510b30be93d65e734009c4bee 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest.args
index ae605a6ef01c2c5449a1137c4d1bc6f1878d3381..9cd3b7fd77f6d5f0547cb0e899125d0265fd1a3b 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args
index 908b5724d467b084cbf12bbabfcac90d22524820..366e2f59ac5645e46de0c32f9169c667a32fb41a 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args
index 3a030d8efbb24f52c5da23d7816cf10f6d04af2b..e7b292f2f0f104a1fc8b002a05890c4780ae0987 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args
index 0cc82a2e465e9d7309e1a4207e1810a6703e22a0..16d28de2c266adb3a7593352f22789714e5044bf 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args
index 92b8e248ebe6bd184f8bc3124229a4498e118de1..3791182b50fc08c84294515a972d08df3af9c0d2 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args
index 62c2d347f3248faef8069ff80e88ad3470b82132..e3e0cf657d0ad529dc75bcd2c65c5f0bf974f25b 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args
index 79aa5ca1a0043275a8b92dc8aa5cf3e2a499cac8..6f49b433ed658bb81a8ca5206115bcdcc9e617f3 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args
index 27375c96ba6bd00a8f5142e9b928b6c8713b0d4c..66b0bf12310b8f71e989eee79db226c1882f1ed8 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args
index b38a8f3f9b60b8092d80fca4b58d7c088990ae57..dbc2defa4b5c4292f02327d574897d6a4ec16416 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args
index 38a402ef5a34f00423bb848e0e0a01fa3fca79eb..c1fec4a3d1079bfc7b27e354ff821362673b6221 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.args
index 9b4ef3711c978b9a13dc9c037986a6642e8245b3..2d48ede137bf272e32fb29329bd89b70ed55f655 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args
index 6ebc45d9318d4b79b68a270cfa9004a3bcb5d2e3..bd713c29ffef031261f62ab755535b596ed1f311 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.args
index ead878573d09b25fdce9ef35b00c49f745115bf3..476b33b272bbfd8ebaeb2e3a98582638f02f2de9 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest.args
index 3c323358961fe55b8457012f06e53acdf4d487b1..66ed1305374a29a608c01080d3ee248b0c07bf8c 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args
index 12c0764d56d5c5f7c58a04f03e58feaa16f5827b..8298a477de7fea6e5b7a85acb8df0cbc84a8054f 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args
index f2d626a35f60ee8a66ab5418626d66eb0b4f9c65..7f378a21cd2d144f6c7263c5109896c97e57e7c2 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args
index e6453534d42aad6441844e1445e2684c36e8d643..c2a5dca12d2244f482302ba3be4295714b897c0a 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args
index cd4807b6c4b4011b4307b5d418d334ecc355a117..a40f52ea3a35dc5dd3483f2f83913580d276f52b 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args
index 66fb11bf7a9ef22e1a068d7b817cefd3038ce921..efbaebe2b057391113c45a0b516708477c314ac8 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args
index 3feff0eb586491bd9844ebeadc3fd57d99f8360d..840be88d02c8f1f1b0f3628155ad24dfc8c06b4e 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args
index 3ec61dab1103d1b75da4c86dabb7b5cac147085f..7bbe249f17878daf87a2133255042c5eff0c6b86 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args
index cfd3024e02eba0124a49cc5cf00409b5adff709e..f8c52354ba7e029a5f71f08289f72e8caba9746e 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args
index c5719bb1e6ece8fd43f62b24076896d960a5726e..0676d800ba0700588b3c8305f177270f2a81e9a7 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args
index e230e926a418a6818e512f8810c70cd6ddb84132..de5de8e7205065adee83f84ed0070e5848f2a71e 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args
index f8e37ce7f8d4ca55af454742d678cb056d94f990..df67b610f8d260b2cb2ebc92cad7a0ccc0417b00 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.args b/tests/qemuxml2argvdata/virtio-rng-ccw.args
index 31e8b8ab31a81b7db469d2487bac34be92f94181..db5aa588552a2dd380bb0f0923167f26978266fc 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-ccw.args
+++ b/tests/qemuxml2argvdata/virtio-rng-ccw.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args b/tests/qemuxml2argvdata/virtio-rng-default.args
index c21e0176e2879b47ce7afe738e9a837c0ab10878..d6a83a4c46415accd5e4669f43c341f7fbcd9ea0 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-default.args
+++ b/tests/qemuxml2argvdata/virtio-rng-default.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
index 842d18de6cdb98a219ae4fa5c0e2c207b53daa23..2147e7af9c301b71ff0d5b0feb3c968aef53d5f1 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -27,7 +27,7 @@ server,nowait \
 -boot strict=on \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--chardev socket,id=charrng0,path=/tmp/rng.socket,server,nowait \
+-chardev socket,id=charrng0,path=/tmp/rng.socket,server=on,wait=off \
 -object rng-egd,id=objrng0,chardev=charrng0 \
 -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x3 \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args
index 192d84413f2fe0652e6a9b75a6037a9f877986c3..ee094c36fbbc3cbbfa05b0aef182c1e8b916534c 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -30,7 +30,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -boot strict=on \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--chardev socket,id=charrng0,fd=1729,server,nowait \
+-chardev socket,id=charrng0,fd=1729,server=on,wait=off \
 -object rng-egd,id=objrng0,chardev=charrng0 \
 -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x3 \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\

diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2argvdata/virtio-rng-egd.args
index b07549c4ece534cb40eac26f9bb3c4f9dd88afe0..3f93d523ac80e972354546a9d379021a57a69eb4 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-egd.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args b/tests/qemuxml2argvdata/virtio-rng-multiple.args
index c70eba02ed0e330c33df4b55dffc7ba153e3e3f5..216b13af59a308b901c25a01f8fdf1b94dc3d66f 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-multiple.args
+++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2argvdata/virtio-rng-random.args
index dbe014849dfbe0684515f1cf1d70a8565b815d5d..12ab6c1589fc95d8ef8c4896dba7803cd6c2f157 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-rng-random.args
+++ b/tests/qemuxml2argvdata/virtio-rng-random.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
index ed810d5890cfec02298acbb55e2679940b642c99..73d1c3b5cb7cb995d6b0a7a558ea3d8d5db9cf92 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
+++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
index c526d7aec5428a1b4ae3cf1cf50b7f0b74271d56..9d1f634b920ae100e52f8b52509725b985adef1a 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.args
index e4b1bbeb5fa4a52f8190ea3a9f1b0d34c407f4bf..1846097ad5aa0dc4d580bacd23b464028d892a36 100644 (file)
--- a/tests/qemuxml2argvdata/vmcoreinfo.args
+++ b/tests/qemuxml2argvdata/vmcoreinfo.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/watchdog-device.args b/tests/qemuxml2argvdata/watchdog-device.args
index 5e5e33db7af38eee87bc1152a92183088396287e..09d22f0be8a28818664e0af377d101480f93d6f9 100644 (file)
--- a/tests/qemuxml2argvdata/watchdog-device.args
+++ b/tests/qemuxml2argvdata/watchdog-device.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/watchdog-diag288.args b/tests/qemuxml2argvdata/watchdog-diag288.args
index 0790e7d9372c0291544d0df21997f164f92a44e4..e130d8b31f0e084c128cb1801f41359ce52c9259 100644 (file)
--- a/tests/qemuxml2argvdata/watchdog-diag288.args
+++ b/tests/qemuxml2argvdata/watchdog-diag288.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/watchdog-dump.args b/tests/qemuxml2argvdata/watchdog-dump.args
index 9d69a49c734d4d5c373b3d6e063c0c36f358f30c..3df944a7df06de8534173fe3c0ace544cf9a4721 100644 (file)
--- a/tests/qemuxml2argvdata/watchdog-dump.args
+++ b/tests/qemuxml2argvdata/watchdog-dump.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.args b/tests/qemuxml2argvdata/watchdog-injectnmi.args
index 9109a713e0b8a53ff4e355e3b09319d3b0cd15ad..11fc09698ea1f7de6b9d47b3282c73a2b6a6215c 100644 (file)
--- a/tests/qemuxml2argvdata/watchdog-injectnmi.args
+++ b/tests/qemuxml2argvdata/watchdog-injectnmi.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/watchdog.args
index bfd901929c1794383117ba7881798838c3393928..a1c66e441790986cc6879ed66a9b7ee56d7686b5 100644 (file)
--- a/tests/qemuxml2argvdata/watchdog.args
+++ b/tests/qemuxml2argvdata/watchdog.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DRV=none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
index 871ac6f069461eae8c7f9e9ef087709fcf5c8958..7e76e266e0a832bdfe70f392cef94f5ab59b2a29 100644 (file)
--- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
@@ -19,8 +19,8 @@ QEMU_AUDIO_DRV=none \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,path=/tmp/lib/domain--1-kvm/monitor.sock,server,\
-nowait \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-kvm/monitor.sock,\
+server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args
index ad770d204f5fc847bbb4978a2d280fe5ba958bcd..58d0f11ccb3b6d0196857ec73d496d59839b4c17 100644 (file)
--- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args
@@ -23,7 +23,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args
index 81df0cb959265cca12f460523781032457c0653c..1f278d38ddc612ee85f5235139b345a11d96483c 100644 (file)
--- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args
@@ -23,7 +23,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args
index ffc52d85b0dac2566790c5db22964b428efb4e54..236cb8b6ea165325a3bb11a51c5817836c235bda 100644 (file)
--- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args
@@ -23,7 +23,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args
index eda728f1f854724a7ab7f3af4d2196e9e1fac482..2837149c6a6b669e83e28421a4a566d70c660729 100644 (file)
--- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args
@@ -23,7 +23,7 @@ memory-backend=pc.ram \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \

diff --git a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args
index 5458fc6e10c53f62cb34141cacb3607f042b4ec5..5d5df0c3de8e21c58e880bbaf9821c93fbb55098 100644 (file)
--- a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 -uuid 2c0abd3d-8f18-42c0-a132-9708213aaac9 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
@@ -43,7 +43,7 @@ id=virtio-disk0,bootindex=1 \
 addr=0x3 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \
--chardev socket,id=charchannel0,fd=1729,server,nowait \
+-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
 -device usb-tablet,id=input0,bus=usb.0,port=1 \

diff --git a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args
index d2246d0a02a54f1659524a59aa0c20400860fee2..38635c62cd43c71b18decc396513b4ba9ea66b8d 100644 (file)
--- a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
@@ -44,7 +44,7 @@ id=virtio-disk0,bootindex=1 \
 addr=0x2 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \
--chardev socket,id=charchannel0,fd=1729,server,nowait \
+-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \

diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args
index e9d4e2c320d592f006138b1f092a61c23278a528..f6c7fe33949f0c33e07fdfd607311bed93583350 100644 (file)
--- a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args
@@ -21,7 +21,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 -uuid 61288c03-0b0d-4f1e-9496-0f0256f2e013 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
@@ -51,7 +51,7 @@ id=virtio-disk0,bootindex=1 \
 addr=0x0 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \
--chardev socket,id=charchannel0,fd=1729,server,nowait \
+-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
 -device usb-tablet,id=input0,bus=usb.0,port=1 \

diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
index 8bec37539fdf0fb21ae97ac1235f5b391a812c40..30673d8fa794c983576ffb0b17f0261274dbccda 100644 (file)
--- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
@@ -22,7 +22,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server,nowait \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
@@ -52,7 +52,7 @@ id=virtio-disk0,bootindex=1 \
 addr=0x0 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0 \
--chardev socket,id=charchannel0,fd=1729,server,nowait \
+-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\
 id=channel0,name=org.qemu.guest_agent.0 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.5,addr=0x0 \