From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH qemu-server 4/5] monitor: use new QOM syntax on the QEMU commandline for monitor objects
Date: Thu, 13 Aug 2026 17:55:40 +0200 [thread overview]
Message-ID: <20260813155642.370461-5-f.ebner@proxmox.com> (raw)
In-Reply-To: <20260813155642.370461-1-f.ebner@proxmox.com>
To avoid a deprecation warning, use the new QEMU object model syntax
when specifying a monitor object on the QEMU commandline. Note that
'mode=control' is what made it a QMP monitor rather than a HMP monitor
before, so that parameter is gone now. Additionally an ID is required,
where "monitor-$chardev_id" is chosen.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
src/PVE/QemuServer.pm | 8 ++++----
src/PVE/QemuServer/Monitor.pm | 11 +++++++++++
src/test/cfg2cmd/aarch64/simple-arm-host.conf.cmd | 4 ++--
src/test/cfg2cmd/aarch64/simple-arm.conf.cmd | 4 ++--
.../cfg2cmd/aarch64/simple-x86-on-arm-host.conf.cmd | 4 ++--
src/test/cfg2cmd/aio.conf.cmd | 4 ++--
src/test/cfg2cmd/bootorder-empty.conf.cmd | 4 ++--
src/test/cfg2cmd/bootorder-legacy.conf.cmd | 4 ++--
src/test/cfg2cmd/bootorder.conf.cmd | 4 ++--
src/test/cfg2cmd/cpu-level.conf.cmd | 4 ++--
.../cputype-icelake-client-deprecation.conf.cmd | 4 ++--
src/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd | 4 ++--
.../cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd | 4 ++--
src/test/cfg2cmd/custom-cpu-model.conf.cmd | 4 ++--
src/test/cfg2cmd/efi-ovmf-without-efidisk.conf.cmd | 4 ++--
src/test/cfg2cmd/efi-raw-old.conf.cmd | 4 ++--
src/test/cfg2cmd/efi-raw-template.conf.cmd | 4 ++--
src/test/cfg2cmd/efi-raw.conf.cmd | 4 ++--
src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd | 4 ++--
src/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd | 4 ++--
src/test/cfg2cmd/efidisk-on-rbd.conf.cmd | 4 ++--
src/test/cfg2cmd/i440fx-viommu-virtio.conf.cmd | 4 ++--
src/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd | 4 ++--
src/test/cfg2cmd/ide.conf.cmd | 4 ++--
src/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd | 4 ++--
src/test/cfg2cmd/memory-hotplug.conf.cmd | 4 ++--
src/test/cfg2cmd/memory-hugepages-1g.conf.cmd | 4 ++--
src/test/cfg2cmd/memory-hugepages-2m.conf.cmd | 4 ++--
src/test/cfg2cmd/minimal-defaults.conf.cmd | 4 ++--
src/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd | 4 ++--
src/test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd | 4 ++--
src/test/cfg2cmd/netdev-7.1.conf.cmd | 4 ++--
src/test/cfg2cmd/netdev.conf.cmd | 4 ++--
src/test/cfg2cmd/netdev_vxlan.conf.cmd | 4 ++--
src/test/cfg2cmd/os-l24.conf.cmd | 4 ++--
src/test/cfg2cmd/os-other.conf.cmd | 4 ++--
src/test/cfg2cmd/os-solaris.conf.cmd | 4 ++--
src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd | 4 ++--
src/test/cfg2cmd/pinned-version-pxe.conf.cmd | 4 ++--
src/test/cfg2cmd/pinned-version.conf.cmd | 4 ++--
src/test/cfg2cmd/q35-ide.conf.cmd | 4 ++--
.../cfg2cmd/q35-linux-hostpci-driver-keep.conf.cmd | 4 ++--
src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd | 4 ++--
.../cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd | 4 ++--
src/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd | 4 ++--
.../q35-linux-hostpci-x-pci-overrides.conf.cmd | 4 ++--
src/test/cfg2cmd/q35-linux-hostpci.conf.cmd | 4 ++--
src/test/cfg2cmd/q35-simple-6.0.conf.cmd | 4 ++--
src/test/cfg2cmd/q35-simple-7.0.conf.cmd | 4 ++--
src/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd | 4 ++--
src/test/cfg2cmd/q35-simple.conf.cmd | 4 ++--
src/test/cfg2cmd/q35-usb2.conf.cmd | 4 ++--
src/test/cfg2cmd/q35-usb3.conf.cmd | 4 ++--
src/test/cfg2cmd/q35-viommu-intel-aw-bits.conf.cmd | 4 ++--
.../cfg2cmd/q35-viommu-intel-guest-phys-bits.conf.cmd | 4 ++--
src/test/cfg2cmd/q35-viommu-intel.conf.cmd | 4 ++--
src/test/cfg2cmd/q35-viommu-virtio-aw-bits.conf.cmd | 4 ++--
src/test/cfg2cmd/q35-viommu-virtio.conf.cmd | 4 ++--
src/test/cfg2cmd/q35-win10-hostpci.conf.cmd | 4 ++--
src/test/cfg2cmd/q35-windows-pinning.conf.cmd | 4 ++--
src/test/cfg2cmd/qemu-xhci-7.1.conf.cmd | 4 ++--
src/test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd | 4 ++--
src/test/cfg2cmd/qga-fs-freeze-backup-legacy.conf.cmd | 4 ++--
src/test/cfg2cmd/qga-fs-freeze.conf.cmd | 4 ++--
src/test/cfg2cmd/qga-minimal.conf.cmd | 4 ++--
src/test/cfg2cmd/scsiblk.conf.cmd | 4 ++--
src/test/cfg2cmd/scsihw-lsi.conf.cmd | 4 ++--
src/test/cfg2cmd/scsihw-lsi53c810.conf.cmd | 4 ++--
src/test/cfg2cmd/scsihw-megasas.conf.cmd | 4 ++--
src/test/cfg2cmd/scsihw-pvscsi.conf.cmd | 4 ++--
src/test/cfg2cmd/scsihw-virtio-scsi-single.conf.cmd | 4 ++--
src/test/cfg2cmd/seabios_serial.conf.cmd | 4 ++--
src/test/cfg2cmd/sev-es.conf.cmd | 4 ++--
src/test/cfg2cmd/sev-snp.conf.cmd | 4 ++--
src/test/cfg2cmd/sev-std.conf.cmd | 4 ++--
src/test/cfg2cmd/simple-backingchain.conf.cmd | 4 ++--
.../simple-balloon-free-page-reporting.conf.cmd | 4 ++--
src/test/cfg2cmd/simple-btrfs.conf.cmd | 4 ++--
src/test/cfg2cmd/simple-cifs.conf.cmd | 4 ++--
src/test/cfg2cmd/simple-disk-passthrough.conf.cmd | 4 ++--
src/test/cfg2cmd/simple-lvm.conf.cmd | 4 ++--
src/test/cfg2cmd/simple-lvmthin.conf.cmd | 4 ++--
src/test/cfg2cmd/simple-rbd.conf.cmd | 4 ++--
src/test/cfg2cmd/simple-virtio-blk.conf.cmd | 4 ++--
src/test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd | 4 ++--
src/test/cfg2cmd/simple1-template.conf.cmd | 4 ++--
src/test/cfg2cmd/simple1.conf.cmd | 4 ++--
src/test/cfg2cmd/spice-enhancments.conf.cmd | 4 ++--
src/test/cfg2cmd/spice-linux-4.1.conf.cmd | 4 ++--
src/test/cfg2cmd/spice-usb3.conf.cmd | 4 ++--
src/test/cfg2cmd/spice-win.conf.cmd | 4 ++--
src/test/cfg2cmd/startdate-l26.conf.cmd | 4 ++--
src/test/cfg2cmd/startdate-win11.conf.cmd | 4 ++--
src/test/cfg2cmd/vnc-clipboard-spice.conf.cmd | 4 ++--
src/test/cfg2cmd/vnc-clipboard-std.conf.cmd | 4 ++--
src/test/cfg2cmd/win11-amd-host-11.0+pve2.conf.cmd | 4 ++--
src/test/cfg2cmd/win11-host-11.0+pve2.conf.cmd | 4 ++--
97 files changed, 205 insertions(+), 194 deletions(-)
diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index 2f43faa7..09afbb15 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -2989,6 +2989,7 @@ sub query_supported_cpu_flags {
my $kvm_supported = defined(kvm_version()) && $arch eq $host_arch;
my $qemu_cmd = PVE::QemuServer::Helpers::get_command_for_arch($arch);
+ my $qemu_binary_version = kvm_user_version($qemu_cmd);
my $fakevmid = -1;
my $pidfile = PVE::QemuServer::Helpers::vm_pidfile_name($fakevmid);
@@ -3005,8 +3006,7 @@ sub query_supported_cpu_flags {
'none',
'-chardev',
"socket,id=qmp,path=/var/run/qemu-server/$fakevmid.qmp,server=on,wait=off",
- '-mon',
- 'chardev=qmp,mode=control',
+ PVE::QemuServer::Monitor::object_commandline($qemu_binary_version, 'qmp')->@*,
'-pidfile',
$pidfile,
'-S',
@@ -3222,7 +3222,7 @@ sub config_to_command {
my $qmpsocket = PVE::QemuServer::Helpers::qmp_socket(vm_qmp_peer($vmid));
push @$cmd, '-chardev', "socket,id=qmp,path=$qmpsocket,server=on,wait=off";
- push @$cmd, '-mon', "chardev=qmp,mode=control";
+ push @$cmd, PVE::QemuServer::Monitor::object_commandline($kvmver, 'qmp')->@*;
if (min_version($machine_version, 2, 12)) {
# QEMU 9.2 introduced a new 'reconnect-ms' option while deprecating the 'reconnect' option
@@ -3231,7 +3231,7 @@ sub config_to_command {
$reconnect_param = "reconnect-ms=5000";
}
push @$cmd, '-chardev', "socket,id=qmp-event,path=/var/run/qmeventd.sock,$reconnect_param";
- push @$cmd, '-mon', "chardev=qmp-event,mode=control";
+ push @$cmd, PVE::QemuServer::Monitor::object_commandline($kvmver, 'qmp-event')->@*;
}
push @$cmd, '-pidfile', PVE::QemuServer::Helpers::vm_pidfile_name($vmid);
diff --git a/src/PVE/QemuServer/Monitor.pm b/src/PVE/QemuServer/Monitor.pm
index c6e7193c..d8735c92 100644
--- a/src/PVE/QemuServer/Monitor.pm
+++ b/src/PVE/QemuServer/Monitor.pm
@@ -140,4 +140,15 @@ sub hmp_cmd {
);
}
+sub object_commandline {
+ my ($qemu_binary_version, $chardev) = @_;
+
+ if (PVE::QemuServer::Helpers::min_version($qemu_binary_version, 11, 1)) {
+ # use new style to avoid deprecation warning
+ return ['-object', "monitor-qmp,chardev=${chardev},id=monitor-${chardev}"];
+ }
+
+ return ['-mon', "chardev=${chardev},mode=control"];
+}
+
1;
diff --git a/src/test/cfg2cmd/aarch64/simple-arm-host.conf.cmd b/src/test/cfg2cmd/aarch64/simple-arm-host.conf.cmd
index fd4f58e2..3ce92dec 100644
--- a/src/test/cfg2cmd/aarch64/simple-arm-host.conf.cmd
+++ b/src/test/cfg2cmd/aarch64/simple-arm-host.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/aarch64/simple-arm.conf.cmd b/src/test/cfg2cmd/aarch64/simple-arm.conf.cmd
index 67bbe72a..f1d779b5 100644
--- a/src/test/cfg2cmd/aarch64/simple-arm.conf.cmd
+++ b/src/test/cfg2cmd/aarch64/simple-arm.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/aarch64/simple-x86-on-arm-host.conf.cmd b/src/test/cfg2cmd/aarch64/simple-x86-on-arm-host.conf.cmd
index 9e932d6b..aeff3089 100644
--- a/src/test/cfg2cmd/aarch64/simple-x86-on-arm-host.conf.cmd
+++ b/src/test/cfg2cmd/aarch64/simple-x86-on-arm-host.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/aio.conf.cmd b/src/test/cfg2cmd/aio.conf.cmd
index 2e275f6d..a9724880 100644
--- a/src/test/cfg2cmd/aio.conf.cmd
+++ b/src/test/cfg2cmd/aio.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/bootorder-empty.conf.cmd b/src/test/cfg2cmd/bootorder-empty.conf.cmd
index d6a56e79..dceb4170 100644
--- a/src/test/cfg2cmd/bootorder-empty.conf.cmd
+++ b/src/test/cfg2cmd/bootorder-empty.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/bootorder-legacy.conf.cmd b/src/test/cfg2cmd/bootorder-legacy.conf.cmd
index b03e1193..f854c226 100644
--- a/src/test/cfg2cmd/bootorder-legacy.conf.cmd
+++ b/src/test/cfg2cmd/bootorder-legacy.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/bootorder.conf.cmd b/src/test/cfg2cmd/bootorder.conf.cmd
index 70203ff9..0e9f3ada 100644
--- a/src/test/cfg2cmd/bootorder.conf.cmd
+++ b/src/test/cfg2cmd/bootorder.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/cpu-level.conf.cmd b/src/test/cfg2cmd/cpu-level.conf.cmd
index 5d5f760d..5e824135 100644
--- a/src/test/cfg2cmd/cpu-level.conf.cmd
+++ b/src/test/cfg2cmd/cpu-level.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd b/src/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd
index c223929e..c151735c 100644
--- a/src/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd
+++ b/src/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd b/src/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd
index 7b43d8e0..dcbf054c 100644
--- a/src/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd
+++ b/src/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd
@@ -3,9 +3,9 @@
-name customcpu-defaults \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=2ea3f676-dfa5-11e9-ae82-c721e12f3fce' \
diff --git a/src/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd b/src/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd
index 665e05d7..8a193572 100644
--- a/src/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd
+++ b/src/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd
@@ -3,9 +3,9 @@
-name customcpu \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=2ea3f676-dfa5-11e9-ae82-c721e12f3fcf' \
diff --git a/src/test/cfg2cmd/custom-cpu-model.conf.cmd b/src/test/cfg2cmd/custom-cpu-model.conf.cmd
index 40c7787e..2035f54a 100644
--- a/src/test/cfg2cmd/custom-cpu-model.conf.cmd
+++ b/src/test/cfg2cmd/custom-cpu-model.conf.cmd
@@ -3,9 +3,9 @@
-name customcpu \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=2ea3f676-dfa5-11e9-ae82-c721e12f3fcf' \
diff --git a/src/test/cfg2cmd/efi-ovmf-without-efidisk.conf.cmd b/src/test/cfg2cmd/efi-ovmf-without-efidisk.conf.cmd
index bab304dc..336011bf 100644
--- a/src/test/cfg2cmd/efi-ovmf-without-efidisk.conf.cmd
+++ b/src/test/cfg2cmd/efi-ovmf-without-efidisk.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/efi-raw-old.conf.cmd b/src/test/cfg2cmd/efi-raw-old.conf.cmd
index 774607e6..939f339c 100644
--- a/src/test/cfg2cmd/efi-raw-old.conf.cmd
+++ b/src/test/cfg2cmd/efi-raw-old.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/efi-raw-template.conf.cmd b/src/test/cfg2cmd/efi-raw-template.conf.cmd
index 34d509cb..5b66b1c3 100644
--- a/src/test/cfg2cmd/efi-raw-template.conf.cmd
+++ b/src/test/cfg2cmd/efi-raw-template.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-object '{"id":"throttle-drive-efidisk0","limits":{},"qom-type":"throttle-group"}' \
diff --git a/src/test/cfg2cmd/efi-raw.conf.cmd b/src/test/cfg2cmd/efi-raw.conf.cmd
index bf35f1d6..1c510b7d 100644
--- a/src/test/cfg2cmd/efi-raw.conf.cmd
+++ b/src/test/cfg2cmd/efi-raw.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd b/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd
index 4d12b034..99ff1781 100644
--- a/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd
+++ b/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd b/src/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd
index 84721318..2fbb8b27 100644
--- a/src/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd
+++ b/src/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/efidisk-on-rbd.conf.cmd b/src/test/cfg2cmd/efidisk-on-rbd.conf.cmd
index 6a1cae98..45c6bfff 100644
--- a/src/test/cfg2cmd/efidisk-on-rbd.conf.cmd
+++ b/src/test/cfg2cmd/efidisk-on-rbd.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e688' \
diff --git a/src/test/cfg2cmd/i440fx-viommu-virtio.conf.cmd b/src/test/cfg2cmd/i440fx-viommu-virtio.conf.cmd
index d90c7ad6..93e3ebea 100644
--- a/src/test/cfg2cmd/i440fx-viommu-virtio.conf.cmd
+++ b/src/test/cfg2cmd/i440fx-viommu-virtio.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd b/src/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd
index 2c19c1c7..78d5223e 100644
--- a/src/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd
+++ b/src/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
diff --git a/src/test/cfg2cmd/ide.conf.cmd b/src/test/cfg2cmd/ide.conf.cmd
index 4354d427..0fa3c84c 100644
--- a/src/test/cfg2cmd/ide.conf.cmd
+++ b/src/test/cfg2cmd/ide.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
diff --git a/src/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd b/src/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd
index af56796a..d02baa1b 100644
--- a/src/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd
+++ b/src/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/memory-hotplug.conf.cmd b/src/test/cfg2cmd/memory-hotplug.conf.cmd
index adb1531a..df50a3c7 100644
--- a/src/test/cfg2cmd/memory-hotplug.conf.cmd
+++ b/src/test/cfg2cmd/memory-hotplug.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/memory-hugepages-1g.conf.cmd b/src/test/cfg2cmd/memory-hugepages-1g.conf.cmd
index 34aa09ea..93bd2b96 100644
--- a/src/test/cfg2cmd/memory-hugepages-1g.conf.cmd
+++ b/src/test/cfg2cmd/memory-hugepages-1g.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/memory-hugepages-2m.conf.cmd b/src/test/cfg2cmd/memory-hugepages-2m.conf.cmd
index 98a3b26b..27a375d1 100644
--- a/src/test/cfg2cmd/memory-hugepages-2m.conf.cmd
+++ b/src/test/cfg2cmd/memory-hugepages-2m.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/minimal-defaults.conf.cmd b/src/test/cfg2cmd/minimal-defaults.conf.cmd
index f10276ba..333770c6 100644
--- a/src/test/cfg2cmd/minimal-defaults.conf.cmd
+++ b/src/test/cfg2cmd/minimal-defaults.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=6cf17dc3-8341-4ecc-aebd-7503f2583fb3' \
diff --git a/src/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd b/src/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd
index 89226c72..53f00fd3 100644
--- a/src/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd
+++ b/src/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd
@@ -3,9 +3,9 @@
-name netdev-multiq \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd b/src/test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd
index f803b0d5..dc07ac85 100644
--- a/src/test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd
+++ b/src/test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd
@@ -3,9 +3,9 @@
-name netdev \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '3,sockets=1,cores=3,maxcpus=3' \
diff --git a/src/test/cfg2cmd/netdev-7.1.conf.cmd b/src/test/cfg2cmd/netdev-7.1.conf.cmd
index 99d72f28..4c40cf77 100644
--- a/src/test/cfg2cmd/netdev-7.1.conf.cmd
+++ b/src/test/cfg2cmd/netdev-7.1.conf.cmd
@@ -3,9 +3,9 @@
-name netdev \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '3,sockets=1,cores=3,maxcpus=3' \
diff --git a/src/test/cfg2cmd/netdev.conf.cmd b/src/test/cfg2cmd/netdev.conf.cmd
index 2a35d7e8..2b3e2d2f 100644
--- a/src/test/cfg2cmd/netdev.conf.cmd
+++ b/src/test/cfg2cmd/netdev.conf.cmd
@@ -3,9 +3,9 @@
-name netdev \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '3,sockets=1,cores=3,maxcpus=3' \
diff --git a/src/test/cfg2cmd/netdev_vxlan.conf.cmd b/src/test/cfg2cmd/netdev_vxlan.conf.cmd
index 7d353f3d..ee34f1cd 100644
--- a/src/test/cfg2cmd/netdev_vxlan.conf.cmd
+++ b/src/test/cfg2cmd/netdev_vxlan.conf.cmd
@@ -3,9 +3,9 @@
-name netdev \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '3,sockets=1,cores=3,maxcpus=3' \
diff --git a/src/test/cfg2cmd/os-l24.conf.cmd b/src/test/cfg2cmd/os-l24.conf.cmd
index 3f299166..c5fb0d0e 100644
--- a/src/test/cfg2cmd/os-l24.conf.cmd
+++ b/src/test/cfg2cmd/os-l24.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/os-other.conf.cmd b/src/test/cfg2cmd/os-other.conf.cmd
index 6ca9f464..4a579f93 100644
--- a/src/test/cfg2cmd/os-other.conf.cmd
+++ b/src/test/cfg2cmd/os-other.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/os-solaris.conf.cmd b/src/test/cfg2cmd/os-solaris.conf.cmd
index a7174ec3..e268465b 100644
--- a/src/test/cfg2cmd/os-solaris.conf.cmd
+++ b/src/test/cfg2cmd/os-solaris.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd b/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd
index 41360544..3e2f9239 100644
--- a/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd
+++ b/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd
@@ -3,9 +3,9 @@
-name pinned \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=c7fdd046-fefc-11e9-832e-770e1d5636a0' \
diff --git a/src/test/cfg2cmd/pinned-version-pxe.conf.cmd b/src/test/cfg2cmd/pinned-version-pxe.conf.cmd
index 098b12fa..416cc243 100644
--- a/src/test/cfg2cmd/pinned-version-pxe.conf.cmd
+++ b/src/test/cfg2cmd/pinned-version-pxe.conf.cmd
@@ -3,9 +3,9 @@
-name pinned \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=c7fdd046-fefc-11e9-832e-770e1d5636a0' \
diff --git a/src/test/cfg2cmd/pinned-version.conf.cmd b/src/test/cfg2cmd/pinned-version.conf.cmd
index e26b35c6..5a7cf0f8 100644
--- a/src/test/cfg2cmd/pinned-version.conf.cmd
+++ b/src/test/cfg2cmd/pinned-version.conf.cmd
@@ -3,9 +3,9 @@
-name pinned \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=c7fdd046-fefc-11e9-832e-770e1d5636a0' \
diff --git a/src/test/cfg2cmd/q35-ide.conf.cmd b/src/test/cfg2cmd/q35-ide.conf.cmd
index ef818519..f5fbb523 100644
--- a/src/test/cfg2cmd/q35-ide.conf.cmd
+++ b/src/test/cfg2cmd/q35-ide.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
diff --git a/src/test/cfg2cmd/q35-linux-hostpci-driver-keep.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-driver-keep.conf.cmd
index 3039662f..9a1ee865 100644
--- a/src/test/cfg2cmd/q35-linux-hostpci-driver-keep.conf.cmd
+++ b/src/test/cfg2cmd/q35-linux-hostpci-driver-keep.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
diff --git a/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd
index 81aa6cff..c7026b5a 100644
--- a/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd
+++ b/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
diff --git a/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd
index 255f2b01..f757769c 100644
--- a/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd
+++ b/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
diff --git a/src/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd
index 021dd2a3..1c3463f3 100644
--- a/src/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd
+++ b/src/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-object '{"id":"throttle-drive-efidisk0","limits":{},"qom-type":"throttle-group"}' \
diff --git a/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd
index d0e25609..c321a046 100644
--- a/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd
+++ b/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
diff --git a/src/test/cfg2cmd/q35-linux-hostpci.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci.conf.cmd
index 3039662f..9a1ee865 100644
--- a/src/test/cfg2cmd/q35-linux-hostpci.conf.cmd
+++ b/src/test/cfg2cmd/q35-linux-hostpci.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
diff --git a/src/test/cfg2cmd/q35-simple-6.0.conf.cmd b/src/test/cfg2cmd/q35-simple-6.0.conf.cmd
index a362c005..fe6a7fcc 100644
--- a/src/test/cfg2cmd/q35-simple-6.0.conf.cmd
+++ b/src/test/cfg2cmd/q35-simple-6.0.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
diff --git a/src/test/cfg2cmd/q35-simple-7.0.conf.cmd b/src/test/cfg2cmd/q35-simple-7.0.conf.cmd
index 04fe0e67..739b911d 100644
--- a/src/test/cfg2cmd/q35-simple-7.0.conf.cmd
+++ b/src/test/cfg2cmd/q35-simple-7.0.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
diff --git a/src/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd b/src/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd
index 78bbbe30..8f48a63a 100644
--- a/src/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd
+++ b/src/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
diff --git a/src/test/cfg2cmd/q35-simple.conf.cmd b/src/test/cfg2cmd/q35-simple.conf.cmd
index 7a3bc4d6..62e91480 100644
--- a/src/test/cfg2cmd/q35-simple.conf.cmd
+++ b/src/test/cfg2cmd/q35-simple.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
diff --git a/src/test/cfg2cmd/q35-usb2.conf.cmd b/src/test/cfg2cmd/q35-usb2.conf.cmd
index 915e7008..659c8fbe 100644
--- a/src/test/cfg2cmd/q35-usb2.conf.cmd
+++ b/src/test/cfg2cmd/q35-usb2.conf.cmd
@@ -3,9 +3,9 @@
-name q35-usb2 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/q35-usb3.conf.cmd b/src/test/cfg2cmd/q35-usb3.conf.cmd
index 0fe6f8cb..a89cd61f 100644
--- a/src/test/cfg2cmd/q35-usb3.conf.cmd
+++ b/src/test/cfg2cmd/q35-usb3.conf.cmd
@@ -3,9 +3,9 @@
-name q35-usb3 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/q35-viommu-intel-aw-bits.conf.cmd b/src/test/cfg2cmd/q35-viommu-intel-aw-bits.conf.cmd
index c4b5de15..94ee29d7 100644
--- a/src/test/cfg2cmd/q35-viommu-intel-aw-bits.conf.cmd
+++ b/src/test/cfg2cmd/q35-viommu-intel-aw-bits.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/q35-viommu-intel-guest-phys-bits.conf.cmd b/src/test/cfg2cmd/q35-viommu-intel-guest-phys-bits.conf.cmd
index dc8c45b9..a3401e06 100644
--- a/src/test/cfg2cmd/q35-viommu-intel-guest-phys-bits.conf.cmd
+++ b/src/test/cfg2cmd/q35-viommu-intel-guest-phys-bits.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/q35-viommu-intel.conf.cmd b/src/test/cfg2cmd/q35-viommu-intel.conf.cmd
index f2a9201a..84e3eefa 100644
--- a/src/test/cfg2cmd/q35-viommu-intel.conf.cmd
+++ b/src/test/cfg2cmd/q35-viommu-intel.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/q35-viommu-virtio-aw-bits.conf.cmd b/src/test/cfg2cmd/q35-viommu-virtio-aw-bits.conf.cmd
index e85b27e4..c6f7415c 100644
--- a/src/test/cfg2cmd/q35-viommu-virtio-aw-bits.conf.cmd
+++ b/src/test/cfg2cmd/q35-viommu-virtio-aw-bits.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/q35-viommu-virtio.conf.cmd b/src/test/cfg2cmd/q35-viommu-virtio.conf.cmd
index 367ce692..e0379e7f 100644
--- a/src/test/cfg2cmd/q35-viommu-virtio.conf.cmd
+++ b/src/test/cfg2cmd/q35-viommu-virtio.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/q35-win10-hostpci.conf.cmd b/src/test/cfg2cmd/q35-win10-hostpci.conf.cmd
index ccc0fb7e..bc7d1120 100644
--- a/src/test/cfg2cmd/q35-win10-hostpci.conf.cmd
+++ b/src/test/cfg2cmd/q35-win10-hostpci.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \
diff --git a/src/test/cfg2cmd/q35-windows-pinning.conf.cmd b/src/test/cfg2cmd/q35-windows-pinning.conf.cmd
index f51f51a9..d8394a01 100644
--- a/src/test/cfg2cmd/q35-windows-pinning.conf.cmd
+++ b/src/test/cfg2cmd/q35-windows-pinning.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/qemu-xhci-7.1.conf.cmd b/src/test/cfg2cmd/qemu-xhci-7.1.conf.cmd
index d51256f8..a4ad9cd5 100644
--- a/src/test/cfg2cmd/qemu-xhci-7.1.conf.cmd
+++ b/src/test/cfg2cmd/qemu-xhci-7.1.conf.cmd
@@ -3,9 +3,9 @@
-name spiceusb3 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd b/src/test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd
index 60ae074c..453d2dbd 100644
--- a/src/test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd
+++ b/src/test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd
@@ -3,9 +3,9 @@
-name q35-qemu-xhci \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/qga-fs-freeze-backup-legacy.conf.cmd b/src/test/cfg2cmd/qga-fs-freeze-backup-legacy.conf.cmd
index a53511b4..c80b64db 100644
--- a/src/test/cfg2cmd/qga-fs-freeze-backup-legacy.conf.cmd
+++ b/src/test/cfg2cmd/qga-fs-freeze-backup-legacy.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/qga-fs-freeze.conf.cmd b/src/test/cfg2cmd/qga-fs-freeze.conf.cmd
index a53511b4..c80b64db 100644
--- a/src/test/cfg2cmd/qga-fs-freeze.conf.cmd
+++ b/src/test/cfg2cmd/qga-fs-freeze.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/qga-minimal.conf.cmd b/src/test/cfg2cmd/qga-minimal.conf.cmd
index a53511b4..c80b64db 100644
--- a/src/test/cfg2cmd/qga-minimal.conf.cmd
+++ b/src/test/cfg2cmd/qga-minimal.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/scsiblk.conf.cmd b/src/test/cfg2cmd/scsiblk.conf.cmd
index 74c2d868..b59211d4 100644
--- a/src/test/cfg2cmd/scsiblk.conf.cmd
+++ b/src/test/cfg2cmd/scsiblk.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=d47e2d5c-7068-46d4-9733-ff94083e28f6' \
diff --git a/src/test/cfg2cmd/scsihw-lsi.conf.cmd b/src/test/cfg2cmd/scsihw-lsi.conf.cmd
index 5adb5d32..da715368 100644
--- a/src/test/cfg2cmd/scsihw-lsi.conf.cmd
+++ b/src/test/cfg2cmd/scsihw-lsi.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/scsihw-lsi53c810.conf.cmd b/src/test/cfg2cmd/scsihw-lsi53c810.conf.cmd
index c5204eed..e712a5c5 100644
--- a/src/test/cfg2cmd/scsihw-lsi53c810.conf.cmd
+++ b/src/test/cfg2cmd/scsihw-lsi53c810.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/scsihw-megasas.conf.cmd b/src/test/cfg2cmd/scsihw-megasas.conf.cmd
index abb14167..c1dd627e 100644
--- a/src/test/cfg2cmd/scsihw-megasas.conf.cmd
+++ b/src/test/cfg2cmd/scsihw-megasas.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/scsihw-pvscsi.conf.cmd b/src/test/cfg2cmd/scsihw-pvscsi.conf.cmd
index 68afe634..e529e3ee 100644
--- a/src/test/cfg2cmd/scsihw-pvscsi.conf.cmd
+++ b/src/test/cfg2cmd/scsihw-pvscsi.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/scsihw-virtio-scsi-single.conf.cmd b/src/test/cfg2cmd/scsihw-virtio-scsi-single.conf.cmd
index 3e01028c..75a690d1 100644
--- a/src/test/cfg2cmd/scsihw-virtio-scsi-single.conf.cmd
+++ b/src/test/cfg2cmd/scsihw-virtio-scsi-single.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/seabios_serial.conf.cmd b/src/test/cfg2cmd/seabios_serial.conf.cmd
index 7a7df5bb..457e9f20 100644
--- a/src/test/cfg2cmd/seabios_serial.conf.cmd
+++ b/src/test/cfg2cmd/seabios_serial.conf.cmd
@@ -3,9 +3,9 @@
-name seabiosserial \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/sev-es.conf.cmd b/src/test/cfg2cmd/sev-es.conf.cmd
index d41619ec..b181ff87 100644
--- a/src/test/cfg2cmd/sev-es.conf.cmd
+++ b/src/test/cfg2cmd/sev-es.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/sev-snp.conf.cmd b/src/test/cfg2cmd/sev-snp.conf.cmd
index 045ec5ce..ccaf3c33 100644
--- a/src/test/cfg2cmd/sev-snp.conf.cmd
+++ b/src/test/cfg2cmd/sev-snp.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/sev-std.conf.cmd b/src/test/cfg2cmd/sev-std.conf.cmd
index 277b61fc..928af4a3 100644
--- a/src/test/cfg2cmd/sev-std.conf.cmd
+++ b/src/test/cfg2cmd/sev-std.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/simple-backingchain.conf.cmd b/src/test/cfg2cmd/simple-backingchain.conf.cmd
index c2cec31b..5ed0023f 100644
--- a/src/test/cfg2cmd/simple-backingchain.conf.cmd
+++ b/src/test/cfg2cmd/simple-backingchain.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd b/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd
index 4a9e65cb..36aa6d21 100644
--- a/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd
+++ b/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/simple-btrfs.conf.cmd b/src/test/cfg2cmd/simple-btrfs.conf.cmd
index ab2e2567..8d376a7f 100644
--- a/src/test/cfg2cmd/simple-btrfs.conf.cmd
+++ b/src/test/cfg2cmd/simple-btrfs.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/simple-cifs.conf.cmd b/src/test/cfg2cmd/simple-cifs.conf.cmd
index ea9cd98f..54031848 100644
--- a/src/test/cfg2cmd/simple-cifs.conf.cmd
+++ b/src/test/cfg2cmd/simple-cifs.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/simple-disk-passthrough.conf.cmd b/src/test/cfg2cmd/simple-disk-passthrough.conf.cmd
index e294a576..ca7f811b 100644
--- a/src/test/cfg2cmd/simple-disk-passthrough.conf.cmd
+++ b/src/test/cfg2cmd/simple-disk-passthrough.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/simple-lvm.conf.cmd b/src/test/cfg2cmd/simple-lvm.conf.cmd
index c4ae13b8..35da904c 100644
--- a/src/test/cfg2cmd/simple-lvm.conf.cmd
+++ b/src/test/cfg2cmd/simple-lvm.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/simple-lvmthin.conf.cmd b/src/test/cfg2cmd/simple-lvmthin.conf.cmd
index 64c56a5b..308fd487 100644
--- a/src/test/cfg2cmd/simple-lvmthin.conf.cmd
+++ b/src/test/cfg2cmd/simple-lvmthin.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/simple-rbd.conf.cmd b/src/test/cfg2cmd/simple-rbd.conf.cmd
index 57d8a881..4bbc2218 100644
--- a/src/test/cfg2cmd/simple-rbd.conf.cmd
+++ b/src/test/cfg2cmd/simple-rbd.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/simple-virtio-blk.conf.cmd b/src/test/cfg2cmd/simple-virtio-blk.conf.cmd
index f0370bdb..1e9ee0ae 100644
--- a/src/test/cfg2cmd/simple-virtio-blk.conf.cmd
+++ b/src/test/cfg2cmd/simple-virtio-blk.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd b/src/test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd
index 04a20eda..51b5a10e 100644
--- a/src/test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd
+++ b/src/test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/simple1-template.conf.cmd b/src/test/cfg2cmd/simple1-template.conf.cmd
index ff5d75d6..08842c77 100644
--- a/src/test/cfg2cmd/simple1-template.conf.cmd
+++ b/src/test/cfg2cmd/simple1-template.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/simple1.conf.cmd b/src/test/cfg2cmd/simple1.conf.cmd
index 924d8041..50820d9f 100644
--- a/src/test/cfg2cmd/simple1.conf.cmd
+++ b/src/test/cfg2cmd/simple1.conf.cmd
@@ -3,9 +3,9 @@
-name simple \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/spice-enhancments.conf.cmd b/src/test/cfg2cmd/spice-enhancments.conf.cmd
index 6043488d..c7313e42 100644
--- a/src/test/cfg2cmd/spice-enhancments.conf.cmd
+++ b/src/test/cfg2cmd/spice-enhancments.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=363a6126-5f48-43e1-811f-013294a946a0' \
diff --git a/src/test/cfg2cmd/spice-linux-4.1.conf.cmd b/src/test/cfg2cmd/spice-linux-4.1.conf.cmd
index 2d2b8055..c34fff23 100644
--- a/src/test/cfg2cmd/spice-linux-4.1.conf.cmd
+++ b/src/test/cfg2cmd/spice-linux-4.1.conf.cmd
@@ -3,9 +3,9 @@
-name spicelinux \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/spice-usb3.conf.cmd b/src/test/cfg2cmd/spice-usb3.conf.cmd
index 2df589f4..7c4679dd 100644
--- a/src/test/cfg2cmd/spice-usb3.conf.cmd
+++ b/src/test/cfg2cmd/spice-usb3.conf.cmd
@@ -3,9 +3,9 @@
-name spiceusb3 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \
diff --git a/src/test/cfg2cmd/spice-win.conf.cmd b/src/test/cfg2cmd/spice-win.conf.cmd
index a2885b2e..081e0dd8 100644
--- a/src/test/cfg2cmd/spice-win.conf.cmd
+++ b/src/test/cfg2cmd/spice-win.conf.cmd
@@ -3,9 +3,9 @@
-name spiceusb3 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec461' \
diff --git a/src/test/cfg2cmd/startdate-l26.conf.cmd b/src/test/cfg2cmd/startdate-l26.conf.cmd
index 6897de3c..b16110ad 100644
--- a/src/test/cfg2cmd/startdate-l26.conf.cmd
+++ b/src/test/cfg2cmd/startdate-l26.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/startdate-win11.conf.cmd b/src/test/cfg2cmd/startdate-win11.conf.cmd
index 93efeeae..74b1c9e1 100644
--- a/src/test/cfg2cmd/startdate-win11.conf.cmd
+++ b/src/test/cfg2cmd/startdate-win11.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/vnc-clipboard-spice.conf.cmd b/src/test/cfg2cmd/vnc-clipboard-spice.conf.cmd
index 7ae3d722..d36519e9 100644
--- a/src/test/cfg2cmd/vnc-clipboard-spice.conf.cmd
+++ b/src/test/cfg2cmd/vnc-clipboard-spice.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/vnc-clipboard-std.conf.cmd b/src/test/cfg2cmd/vnc-clipboard-std.conf.cmd
index bfb40655..4114986a 100644
--- a/src/test/cfg2cmd/vnc-clipboard-std.conf.cmd
+++ b/src/test/cfg2cmd/vnc-clipboard-std.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/win11-amd-host-11.0+pve2.conf.cmd b/src/test/cfg2cmd/win11-amd-host-11.0+pve2.conf.cmd
index c2b6657f..d67862de 100644
--- a/src/test/cfg2cmd/win11-amd-host-11.0+pve2.conf.cmd
+++ b/src/test/cfg2cmd/win11-amd-host-11.0+pve2.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
diff --git a/src/test/cfg2cmd/win11-host-11.0+pve2.conf.cmd b/src/test/cfg2cmd/win11-host-11.0+pve2.conf.cmd
index b1949836..43eb4e94 100644
--- a/src/test/cfg2cmd/win11-host-11.0+pve2.conf.cmd
+++ b/src/test/cfg2cmd/win11-host-11.0+pve2.conf.cmd
@@ -3,9 +3,9 @@
-name vm8006 \
-no-shutdown \
-chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
- -mon 'chardev=qmp,mode=control' \
+ -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \
-chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \
- -mon 'chardev=qmp-event,mode=control' \
+ -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \
-pidfile /var/run/qemu-server/8006.pid \
-daemonize \
-smp '1,sockets=1,cores=1,maxcpus=1' \
--
2.47.3
next prev parent reply other threads:[~2026-08-13 15:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-13 15:55 [PATCH-SERIES qemu/qemu-server 0/5] QEMU 11.1.0 Fiona Ebner
2026-08-13 15:55 ` [PATCH qemu 1/5] update submodule and patches to " Fiona Ebner
2026-08-13 15:55 ` [PATCH qemu 2/5] add patch to work around broken input cleanup feature in libspice-server1 Fiona Ebner
2026-08-13 15:55 ` [PATCH qemu 3/5] bump version to 11.1.0-1 Fiona Ebner
2026-08-13 15:55 ` Fiona Ebner [this message]
2026-08-13 15:55 ` [PATCH qemu-server 5/5] d/control: bump versioned build dependency for pve-qemu-kvm Fiona Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260813155642.370461-5-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox