Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE
libvirt.7975
56540950-qemu-use-chardev-monitor.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 56540950-qemu-use-chardev-monitor.patch of Package libvirt.7975
commit 56540950e73d331fc04443409c578e4354337309 Author: Cole Robinson <crobinso@redhat.com> Date: Mon Jun 26 10:40:39 2017 -0400 qemu: command: always use -chardev for monitor config AFAIK there aren't any cases where we will/should hit the old code path for our supported qemu versions, so drop the old code. Massive test suite churn follows Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Cole Robinson <crobinso@redhat.com> Index: libvirt-3.3.0/src/qemu/qemu_command.c =================================================================== --- libvirt-3.3.0.orig/src/qemu/qemu_command.c +++ libvirt-3.3.0/src/qemu/qemu_command.c @@ -5581,32 +5581,18 @@ qemuBuildMonitorCommandLine(virLogManage if (!monitor_chr) return 0; - /* Use -chardev if it's available */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV)) { + if (!(chrdev = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + monitor_chr, "monitor", + qemuCaps, true))) + return -1; + virCommandAddArg(cmd, "-chardev"); + virCommandAddArg(cmd, chrdev); + VIR_FREE(chrdev); - if (!(chrdev = qemuBuildChrChardevStr(logManager, cmd, cfg, def, - monitor_chr, "monitor", - qemuCaps, true))) - return -1; - virCommandAddArg(cmd, "-chardev"); - virCommandAddArg(cmd, chrdev); - VIR_FREE(chrdev); - - virCommandAddArg(cmd, "-mon"); - virCommandAddArgFormat(cmd, - "chardev=charmonitor,id=monitor,mode=%s", - monitor_json ? "control" : "readline"); - } else { - const char *prefix = NULL; - if (monitor_json) - prefix = "control,"; - - virCommandAddArg(cmd, "-monitor"); - if (!(chrdev = qemuBuildChrArgStr(monitor_chr, prefix))) - return -1; - virCommandAddArg(cmd, chrdev); - VIR_FREE(chrdev); - } + virCommandAddArg(cmd, "-mon"); + virCommandAddArgFormat(cmd, + "chardev=charmonitor,id=monitor,mode=%s", + monitor_json ? "control" : "readline"); return 0; } Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -kernel /aarch64.kernel \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-uefi.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-uefi.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-acpi-uefi.args @@ -18,5 +18,7 @@ unit=1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args @@ -14,6 +14,8 @@ QEMU_AUDIO_DRV=none \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args @@ -14,6 +14,8 @@ QEMU_AUDIO_DRV=none \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args @@ -14,6 +14,8 @@ QEMU_AUDIO_DRV=none \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-armtest/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -kernel /arm.kernel \ -initrd /arm.initrd \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-nouefi.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-nouefi.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-nouefi.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -kernel /var/lib/libvirt/images/guest.vmlinuz \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-uefi.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-uefi.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-noacpi-uefi.args @@ -18,6 +18,8 @@ unit=1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-nec-xhci.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-nec-xhci.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-nec-xhci.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device nec-usb-xhci,id=usb,bus=pcie.0,addr=0x1 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-qemu-xhci.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-qemu-xhci.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-usb-controller-qemu-xhci.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device qemu-xhci,id=usb,bus=pcie.0,addr=0x1 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-aarch64-vgpu/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64-vgpu/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -device ioh3420,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\ addr=0x1 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -kernel /aarch64.kernel \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args @@ -15,8 +15,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-aarch64-virt-default/monitor.sock,server,\ -nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64-virt-default/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -kernel /aarch64.kernel \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -kernel /aarch64.kernel \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -kernel /aarch64.kernel \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -kernel /aarch64.kernel \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -acpitable sig=SLIC,file=/var/lib/libvirt/acpi/slic.dat \ -usb Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-armtest/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -kernel /arm.kernel \ -initrd /arm.initrd \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-armtest/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -kernel /arm.kernel \ -initrd /arm.initrd \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-armtest/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -kernel /arm.kernel \ -initrd /arm.initrd \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-armtest/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -kernel /arm.kernel \ -initrd /arm.initrd \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-autoindex.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-autoindex.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-autoindex.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args @@ -14,6 +14,8 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a,deflate-on-oom=on Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -kernel /aarch64.kernel \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.args @@ -17,7 +17,9 @@ readonly=on \ -uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-test-bios/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test-bios/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args @@ -16,7 +16,9 @@ readonly=on \ -uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-test-bios/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test-bios/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-bios.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-bios.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-bios.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefaults \ -device sga \ --monitor unix:/tmp/lib/domain--1-test-bios/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test-bios/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot d \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -usb \ -drive file=/tmp/vda.img,format=raw,if=none,id=drive-virtio-disk0 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot dnca \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot a \ -drive file=/tmp/firmware.img,format=raw,if=none,id=drive-fdc0-0-0 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot a \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot menu=off \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot order=d,menu=off \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot order=d,menu=off \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-bootindex.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-bootindex.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-bootindex.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot menu=on \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot order=d,menu=on,splash-time=3000 \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot order=d,menu=on \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot order=dcna,menu=on \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot strict=on \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -drive file=/tmp/firmware.img,format=raw,if=none,id=drive-fdc0-0-0 \ -device isa-fdc,driveA=drive-fdc0-0-0,bootindexA=1 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=spice \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=spice \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -rtc base=utc,driftfix=slew \ -no-acpi \ -boot c \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args @@ -14,7 +14,9 @@ TZ=Europe/Paris \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -rtc base=localtime \ -no-acpi \ -boot c \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -rtc base=utc,driftfix=slew \ -no-kvm-pit-reinjection \ -no-hpet \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 1c15a1f6-f4f0-4d3c-9002-667ddb458736 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -rtc base=2009-02-14T00:01:30 \ -no-acpi \ -boot c \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -localtime \ -no-acpi \ -boot c \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -rtc base=2009-02-15T09:49:06 \ -no-acpi \ -boot c \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-foo/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,server,\ +nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable2.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable2.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable2.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-foo/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,server,\ +nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable3.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable3.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable3.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-foo/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,server,\ +nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l3.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l3.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l3.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-foo/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,server,\ +nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-foo/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,server,\ +nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough2.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough2.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough2.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-foo/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,server,\ +nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot n \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot n \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-hotplug-startup.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-hotplug-startup.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-hotplug-startup.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.args @@ -14,5 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-guest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.args @@ -14,5 +14,7 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-guest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-tsc-frequency.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-tsc-frequency.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-tsc-frequency.args @@ -16,7 +16,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cputune-numatune.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid 4d92ec27-9ebf-400b-ae91-20c71c647c19 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-dummy2/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-dummy2/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cputune.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cputune.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cputune.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-debug-threads.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-debug-threads.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-debug-threads.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-kvm/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-kvm/monitor.sock,server,\ +nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-qemu-host/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-qemu-host/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot d \ -usb \ -drive file=ftp://host.name:21/url/path/file.iso,format=raw,if=none,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot d \ -usb \ -drive file=ftps://host.name:990/url/path/file.iso,format=raw,if=none,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot d \ -usb \ -drive file=http://host.name:80/url/path/file.iso,format=raw,if=none,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot d \ -usb \ -drive file=https://host.name:443/url/path/file.iso,format=raw,if=none,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot d \ -usb \ -drive file=tftp://host.name:69/url/path/file.iso,format=raw,if=none,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 3fa02811-7832-34bd-004d-1ff56a9286ff \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot dc \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 468404ad-d49c-40f2-9e14-02294f9c1be3 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot dc \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot d \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 92d7a226-cfae-425b-a6d3-00bbf9ec5c9e \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot dc \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 92d7a226-cfae-425b-a6d3-00bbf9ec5c9e \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot dc \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor control,unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor control,unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor control,unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.args @@ -15,7 +15,9 @@ file=/tmp/lib/domain--1-QEMUGuest1/maste -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 8c273d77-39b0-47c4-9714-6dddcad56b88 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot dc \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-order.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device ahci,id=sata0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device megasas,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device mptsas1068,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device spapr-vscsi,id=scsi0,reg=0x2000 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=0.0.0007,drive=drive-virtio-disk0,id=virtio-disk0 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -device virtio-scsi-ccw,id=scsi0,devno=fe.0.0001 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,cmd_per_lun=50,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,ioeventfd=on,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,max_sectors=512,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,num_queues=8,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk-usage.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk-usage.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk-usage.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot n \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot n \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot dc \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-no-numa-topology.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-no-numa-topology.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-no-numa-topology.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-instance-00000092/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-instance-00000092/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology.args @@ -17,7 +17,9 @@ share=yes,size=15032385536 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-instance-00000092/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-instance-00000092/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.args @@ -20,7 +20,9 @@ share=yes,size=15032385536 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-instance-00000092/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-instance-00000092/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology3.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology3.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology3.args @@ -23,7 +23,9 @@ share=no,size=15032385536 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-instance-00000092/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-instance-00000092/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot a \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args @@ -13,7 +13,9 @@ DISPLAY=:0.1 \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args @@ -13,7 +13,9 @@ DISPLAY=:0.1 \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=spice \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=spice \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket-cfg.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket-cfg.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket-cfg.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=spice \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=spice \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=spice \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-no-args.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-no-args.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-no-args.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=spice \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=spice \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=spice \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-socket.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-socket.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-socket.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=spice \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=spice \ -smp 2,sockets=1,cores=2,threads=1 \ -uuid 553effab-b5e1-2d80-dfe3-da4344826c43 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-f14/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-f14/monitor.sock,server,\ +nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot dc \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=spice \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket-cfg.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket-cfg.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket-cfg.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=none \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=none \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-no-listen-attr.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-no-listen-attr.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-no-listen-attr.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=none \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-none.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-none.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-none.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=none \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=none \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-remove-generated-socket.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-remove-generated-socket.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-remove-generated-socket.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=none \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=none \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=none \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=none \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-mdev-precreated.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hostdev-mdev-precreated.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-mdev-precreated.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device lsi,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-ccw.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-ccw.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-ccw.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -device virtio-scsi-ccw,id=scsi0,devno=fe.0.0001 \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-virtio-disk0 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-pci.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-pci.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-vhost-scsi-pci.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-hotplug/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-hotplug/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x4 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args @@ -19,7 +19,9 @@ host-nodes=1-3,policy=bind \ -device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \ -uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-fedora/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fedora/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -rtc base=utc,driftfix=slew \ -no-kvm-pit-reinjection \ -no-hpet \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args @@ -29,7 +29,9 @@ host-nodes=3,policy=bind \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args @@ -17,8 +17,9 @@ QEMU_AUDIO_DRV=none \ -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,\ -nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args @@ -18,8 +18,9 @@ mem-path=/dev/hugepages1G/libvirt/qemu/- -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,\ -nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args @@ -15,8 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,\ -nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args @@ -13,8 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,\ -nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-SomeDummyHugepagesGu/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args @@ -29,7 +29,9 @@ host-nodes=3,policy=bind \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot n \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.args @@ -14,6 +14,8 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot n \ -usb Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-hyperv.args @@ -15,6 +15,8 @@ hv_synic,hv_stimer,hv_reset,hv_vendor_id -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot n \ -usb Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching-mode.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching-mode.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-caching-mode.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device intel-iommu,intremap=on,caching-mode=on \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-ioapic.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-ioapic.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-ioapic.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device intel-iommu,intremap=on Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-machine.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-machine.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-machine.args @@ -13,6 +13,8 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device intel-iommu Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,iothread=iothread1,devno=fe.0.0000,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args @@ -17,7 +17,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -device virtio-scsi-ccw,iothread=iothread2,id=scsi0,devno=fe.0.0001 \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-pci.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-pci.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-pci.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device virtio-scsi-pci,iothread=iothread2,id=scsi0,bus=pci.0,addr=0xb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-iothreads.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot n \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args @@ -14,6 +14,8 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot n \ -usb Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -global kvm-pit.lost_tick_policy=delay \ -no-acpi \ -boot c \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-discard.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-discard.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-discard.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -global kvm-pit.lost_tick_policy=discard \ -no-acpi \ -boot c \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-kvm.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-kvm.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-kvm.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-kvm/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-kvm/monitor.sock,server,\ +nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot n \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-luks-disks.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-luks-disks.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-luks-disks.args @@ -15,7 +15,9 @@ file=/tmp/lib/domain--1-encryptdisk/mast -uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-core-cfg-off.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-machine-core-cfg-off.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-core-cfg-off.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-smm-opt.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-machine-smm-opt.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-smm-opt.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-master-key.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-master-key.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-master-key.args @@ -15,7 +15,9 @@ file=/tmp/lib/domain--1-QEMUGuest1/maste -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args @@ -20,7 +20,9 @@ host-nodes=1-3,policy=bind \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args @@ -20,7 +20,9 @@ host-nodes=1-3,policy=bind \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-access.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-access.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-access.args @@ -17,7 +17,9 @@ share=no,size=536870912 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-label.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-label.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm-label.args @@ -17,7 +17,9 @@ share=no,size=536870912 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nvdimm.args @@ -17,7 +17,9 @@ size=536870912 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args @@ -17,7 +17,9 @@ QEMU_AUDIO_DRV=none \ -uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -kernel /media/ram/uImage \ -initrd /media/ram/ramdisk \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memtune.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-memtune.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-memtune.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args @@ -22,7 +22,9 @@ host-nodes=5,host-nodes=7,policy=bind \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-migrate.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-migrate.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-migrate.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-minimal.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-minimal.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-minimal.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -global PIIX4_PM.disable_s3=1 \ -boot c \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -global PIIX4_PM.disable_s3=1 \ -global PIIX4_PM.disable_s4=1 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -global PIIX4_PM.disable_s4=0 \ -boot c \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-reboot \ -no-acpi \ -boot c \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device lsi,id=scsi0,bus=pci.0,multifunction=off,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-client.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-client.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-client.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-server.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-server.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-server.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-udp.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-user.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-user.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-user.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -device virtio-net-ccw,vlan=0,id=net0,mac=00:11:22:33:44:55,devno=fe.0.0001 \ -net user,vlan=0,name=hostnet0 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -device virtio-net-s390,vlan=0,id=net0,mac=00:11:22:33:44:55 \ -net user,vlan=0,name=hostnet0 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-no-kvm-pit-device.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-no-kvm-pit-device.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-no-kvm-pit-device.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-kvm-pit-reinjection \ -no-acpi \ -boot c \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-nographics-display.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-nographics-display.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-nographics-display.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-nographics.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-nographics.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-nographics.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numad.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-numad.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numad.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args @@ -18,7 +18,9 @@ policy=preferred \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args @@ -22,7 +22,9 @@ host-nodes=5,host-nodes=7,policy=bind \ -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-panic-double.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-panic-double.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-panic-double.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot n \ -usb \ -device pvpanic,ioport=1285 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-panic.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-panic.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-panic.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-fdr-br/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fdr-br/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x3 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x4 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-fdr-br/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fdr-br/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -device pci-bridge,chassis_nr=8,id=pci.8,bus=pci.0,addr=0x3 \ -device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x4 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pci-autofill-addr.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pci-autofill-addr.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pci-autofill-addr.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-fdr-br/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fdr-br/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid 04872dc1-e1de-434b-ab21-e3e80e416349 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-lots-of-disks/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-lots-of-disks/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x3 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x4 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=none \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-fdr-br/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fdr-br/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x3 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x4 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pci-expander-bus.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pci-expander-bus.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pci-expander-bus.args @@ -15,7 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-expander-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-expander-test/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device pxb,bus_nr=254,id=pci.1,numa_node=1,bus=pci.0,addr=0x3 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-fdr-br/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fdr-br/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -usb \ -drive file=/var/iso/f18kde.iso,format=raw,if=none,media=cdrom,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest2/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest2/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.args @@ -15,8 +15,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-pcie-expander-bus-te/monitor.sock,server,\ -nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-pcie-expander-bus-te/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device pxb-pcie,bus_nr=254,id=pci.1,numa_node=0,bus=pcie.0,addr=0x4 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-model-generic.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-model-generic.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-model-generic.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device pcie-root-port,port=0x10,chassis=1,id=pci.1,bus=pcie.0,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-model-ioh3420.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-model-ioh3420.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port-model-ioh3420.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device ioh3420,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device ioh3420,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args @@ -13,6 +13,8 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device ioh3420,port=0x10,chassis=1,id=pci.1,bus=pcie.0,addr=0x2 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device ioh3420,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -global q35-pcihost.pci-hole64-size=1048576K \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 3c7c30b5-7866-4b05-8a29-efebccba52a0 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-foo/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo/monitor.sock,server,\ +nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -global i440FX-pcihost.pci-hole64-size=1048576K \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args @@ -14,6 +14,8 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot n \ -usb Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args @@ -14,6 +14,8 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot n \ -usb Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -kernel /media/ram/uImage \ -initrd /media/ram/ramdisk \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-qemu-xhci.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-qemu-xhci.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-qemu-xhci.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -device qemu-xhci,id=usb,bus=pci.0,addr=0x1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -device pci-ohci,id=usb,bus=pci.0,addr=0x1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -usb \ -global spapr-nvram.reg=0x4000 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot n \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot n \ -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-nouefi.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-nouefi.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-nouefi.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -kernel /var/lib/libvirt/images/guest.vmlinuz \ -initrd /var/lib/libvirt/images/guest.initramfs \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-uefi.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-uefi.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-acpi-uefi.args @@ -18,5 +18,7 @@ unit=1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-default-devices-only.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-q35-default-devices-only.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-default-devices-only.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device ioh3420,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-multifunction.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-q35-multifunction.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-multifunction.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device ioh3420,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-nouefi.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-nouefi.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-noacpi-nouefi.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -kernel /var/lib/libvirt/images/guest.vmlinuz \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-pci-force-address.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-q35-pci-force-address.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-pci-force-address.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-pcie-autoadd.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-q35-pcie-autoadd.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-pcie-autoadd.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device ioh3420,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable-fallback.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable-fallback.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable-fallback.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35/monitor.sock,server,\ +nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -global PIIX4_PM.disable_s3=1 \ -global PIIX4_PM.disable_s4=1 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35/monitor.sock,server,\ +nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -global ICH9-LPC.disable_s3=1 \ -global ICH9-LPC.disable_s4=1 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-virt-manager-basic.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=spice \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid 1b826c23-8767-47ad-a6b5-c83a88277f71 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-virt-manager-basic/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-virt-manager-basic/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -rtc base=utc,driftfix=slew \ -no-kvm-pit-reinjection \ -no-hpet \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-virtio-pci.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-q35-virtio-pci.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35-virtio-pci.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-q35.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-q35.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args @@ -15,7 +15,9 @@ BAR='' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot order=n,reboot-timeout=-1 \ -usb Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot order=n,reboot-timeout=128 \ -usb Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-file.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-many.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-shmem.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-shmem.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-shmem.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-smbios.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-smbios.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-smbios.args @@ -19,7 +19,9 @@ uuid=c7a5fdbd-edaf-9455-926a-d65c16db180 serial=CZC1065993,asset=CZC1065993,location=Upside down' \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-smp.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-smp.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-smp.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-sound.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-sound.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-sound.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11d7cd22-da89-3094-6212-079a48a309a1 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-TPM-VM/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-TPM-VM/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -boot c \ -usb \ -tpmdev passthrough,id=tpm-tpm0,path=/dev/tpm0,\ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device piix3-usb-uhci,id=usb,bus=pcie.0,addr=0x1 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device nec-usb-xhci,id=usb,bus=pcie.0,addr=0x1 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-usb-controller-qemu-xhci.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -device qemu-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x3 Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-vcpu-placement-static.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-vcpu-placement-static.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-vcpu-placement-static.args @@ -15,6 +15,8 @@ QEMU_AUDIO_DRV=none \ -uuid 4d92ec27-9ebf-400b-ae91-20c71c647c19 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-dummy2/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-dummy2/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=none \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid cdbebdfa-1d6d-65c3-be0f-fd74b978a773 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-noheads.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-noheads.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-noheads.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-device.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-device.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-device.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-secondary.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-secondary.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-secondary.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args @@ -12,7 +12,9 @@ QEMU_AUDIO_DRV=spice \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-virgl.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-virgl.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-virgl.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-vga.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-vga.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-vga.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-virtio-input-passthrough.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-virtio-input-passthrough.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-virtio-input-passthrough.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-virtio-input.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-virtio-input.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-virtio-input.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot dc \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -nographic \ -nodefconfig \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-watchdog.args @@ -13,7 +13,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.args @@ -14,7 +14,9 @@ QEMU_AUDIO_DRV=none \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot n \ -usb \ Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-default.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-default.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-default.args @@ -14,6 +14,8 @@ QEMU_AUDIO_DRV=none \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-both.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-both.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-both.args @@ -14,6 +14,8 @@ QEMU_AUDIO_DRV=none \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v2.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v2.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v2.args @@ -14,6 +14,8 @@ QEMU_AUDIO_DRV=none \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v3.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v3.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v3.args @@ -14,6 +14,8 @@ QEMU_AUDIO_DRV=none \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c Index: libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none.args =================================================================== --- libvirt-3.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none.args +++ libvirt-3.3.0/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none.args @@ -14,6 +14,8 @@ QEMU_AUDIO_DRV=none \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ -nographic \ -nodefaults \ --monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ -no-acpi \ -boot c
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
