[RFC PATCH 7/7] qemu: command: Use monitor via '-object monitor-qmp,...'

23 Jun 2026

From: Peter Krempa <pkrempa@redhat.com>

Use the new 'monitor-qmp' object to instantiate the monitor instead of
the deprecated '-mon'.
---
 src/qemu/qemu_command.c                         | 17 +++++++++++++++--
 .../acpi-generic-initiator.x86_64-latest.args   |  2 +-
 .../acpi-table-many.x86_64-latest.args          |  2 +-
 .../acpi-table.x86_64-latest.args               |  2 +-
 .../amd-iommu.x86_64-latest.args                |  2 +-
 .../async-teardown.x86_64-latest.args           |  2 +-
 .../audio-alsa-best.x86_64-latest.args          |  2 +-
 .../audio-alsa-full.x86_64-latest.args          |  2 +-
 .../audio-alsa-minimal.x86_64-latest.args       |  2 +-
 .../audio-coreaudio-best.x86_64-latest.args     |  2 +-
 .../audio-coreaudio-full.x86_64-latest.args     |  2 +-
 .../audio-coreaudio-minimal.x86_64-latest.args  |  2 +-
 .../audio-default-nographics.x86_64-latest.args |  2 +-
 .../audio-default-sdl.x86_64-latest.args        |  2 +-
 .../audio-default-spice.x86_64-latest.args      |  2 +-
 .../audio-default-vnc.x86_64-latest.args        |  2 +-
 .../audio-file-best.x86_64-latest.args          |  2 +-
 .../audio-file-full.x86_64-latest.args          |  2 +-
 .../audio-file-minimal.x86_64-latest.args       |  2 +-
 .../audio-jack-full.x86_64-latest.args          |  2 +-
 .../audio-jack-minimal.x86_64-latest.args       |  2 +-
 .../audio-many-backends.x86_64-latest.args      |  2 +-
 .../audio-none-best.x86_64-latest.args          |  2 +-
 .../audio-none-full.x86_64-latest.args          |  2 +-
 .../audio-none-minimal.x86_64-latest.args       |  2 +-
 .../audio-oss-best.x86_64-latest.args           |  2 +-
 .../audio-oss-full.x86_64-latest.args           |  2 +-
 .../audio-oss-minimal.x86_64-latest.args        |  2 +-
 .../audio-pipewire-best.x86_64-latest.args      |  2 +-
 .../audio-pipewire-full.x86_64-latest.args      |  2 +-
 .../audio-pipewire-minimal.x86_64-latest.args   |  2 +-
 .../audio-pulseaudio-best.x86_64-latest.args    |  2 +-
 .../audio-pulseaudio-full.x86_64-latest.args    |  2 +-
 .../audio-pulseaudio-minimal.x86_64-latest.args |  2 +-
 .../audio-sdl-best.x86_64-latest.args           |  2 +-
 .../audio-sdl-full.x86_64-latest.args           |  2 +-
 .../audio-sdl-minimal.x86_64-latest.args        |  2 +-
 .../audio-spice-best.x86_64-latest.args         |  2 +-
 .../audio-spice-full.x86_64-latest.args         |  2 +-
 .../audio-spice-minimal.x86_64-latest.args      |  2 +-
 .../autoindex.x86_64-latest.args                |  2 +-
 .../balloon-device-auto.x86_64-latest.args      |  2 +-
 ...alloon-device-deflate-off.x86_64-latest.args |  2 +-
 .../balloon-device-deflate.x86_64-latest.args   |  2 +-
 .../balloon-device-period.x86_64-latest.args    |  2 +-
 .../balloon-device.x86_64-latest.args           |  2 +-
 .../blkdeviotune-group-num.x86_64-latest.args   |  2 +-
 .../blkdeviotune-max-length.x86_64-latest.args  |  2 +-
 .../blkdeviotune-max.x86_64-latest.args         |  2 +-
 .../blkdeviotune.x86_64-latest.args             |  2 +-
 .../blkiotune-device.x86_64-latest.args         |  2 +-
 .../blkiotune.x86_64-latest.args                |  2 +-
 .../boot-cdrom.x86_64-latest.args               |  2 +-
 .../boot-complex.x86_64-latest.args             |  2 +-
 .../boot-floppy-q35.x86_64-latest.args          |  2 +-
 .../boot-floppy.x86_64-latest.args              |  2 +-
 .../boot-menu-disable-drive.x86_64-latest.args  |  2 +-
 ...menu-disable-with-timeout.x86_64-latest.args |  2 +-
 .../boot-menu-disable.x86_64-latest.args        |  2 +-
 ...-menu-enable-with-timeout.x86_64-latest.args |  2 +-
 .../boot-menu-enable.x86_64-latest.args         |  2 +-
 .../boot-multi.x86_64-latest.args               |  2 +-
 .../boot-network.x86_64-latest.args             |  2 +-
 .../boot-order.x86_64-latest.args               |  2 +-
 .../channel-guestfwd.x86_64-latest.args         |  2 +-
 ...nel-qemu-vdagent-features.x86_64-latest.args |  2 +-
 .../channel-qemu-vdagent.x86_64-latest.args     |  2 +-
 .../channel-spicevmc.x86_64-latest.args         |  2 +-
 .../channel-unix-guestfwd.x86_64-latest.args    |  2 +-
 .../channel-unix-source-path.x86_64-latest.args |  2 +-
 .../channel-virtio-auto.x86_64-latest.args      |  2 +-
 .../channel-virtio-autoadd.x86_64-latest.args   |  2 +-
 ...channel-virtio-autoassign.x86_64-latest.args |  2 +-
 .../channel-virtio-default.x86_64-latest.args   |  2 +-
 .../channel-virtio-state.x86_64-latest.args     |  2 +-
 .../channel-virtio-unix.x86_64-latest.args      |  2 +-
 .../channel-virtio.x86_64-latest.args           |  2 +-
 .../chardev-backends-json.x86_64-latest.args    |  2 +-
 .../chardev-backends.x86_64-latest.args         |  2 +-
 .../chardev-label.x86_64-latest.args            |  2 +-
 .../chardev-reconnect.x86_64-latest.args        |  2 +-
 .../clock-absolute.x86_64-latest.args           |  2 +-
 .../clock-catchup.x86_64-latest.args            |  2 +-
 .../clock-france.x86_64-latest.args             |  2 +-
 .../clock-hpet-off.x86_64-latest.args           |  2 +-
 ...localtime-basis-localtime.x86_64-latest.args |  2 +-
 .../clock-localtime.x86_64-latest.args          |  2 +-
 .../clock-realtime.x86_64-latest.args           |  2 +-
 .../clock-timer-hyperv-rtc.x86_64-latest.args   |  2 +-
 .../clock-utc.x86_64-latest.args                |  2 +-
 .../clock-variable.x86_64-latest.args           |  2 +-
 .../console-compat-auto.x86_64-latest.args      |  2 +-
 .../console-compat-chardev.x86_64-latest.args   |  2 +-
 .../console-compat-crash.x86_64-latest.args     |  2 +-
 .../console-compat.x86_64-latest.args           |  2 +-
 .../console-compat2.x86_64-latest.args          |  2 +-
 .../console-virtio-many.x86_64-latest.args      |  2 +-
 ...serial-autoassign-address.x86_64-latest.args |  2 +-
 .../console-virtio-unix.x86_64-latest.args      |  2 +-
 .../console-virtio.x86_64-latest.args           |  2 +-
 .../controller-order.x86_64-latest.args         |  2 +-
 .../controller-scsi-auto.x86_64-latest.args     |  2 +-
 ...roller-scsi-inherit-model.x86_64-latest.args |  2 +-
 .../controller-usb-order.x86_64-latest.args     |  2 +-
 .../controller-virtio-scsi.x86_64-latest.args   |  2 +-
 .../cpu-Haswell-noTSX.x86_64-latest.args        |  2 +-
 .../cpu-Haswell.x86_64-latest.args              |  2 +-
 .../cpu-Haswell2.x86_64-latest.args             |  2 +-
 .../cpu-Haswell3.x86_64-latest.args             |  2 +-
 ...pu-Icelake-Server-pconfig.x86_64-latest.args |  2 +-
 .../cpu-cache-disable.x86_64-latest.args        |  2 +-
 .../cpu-cache-disable3.x86_64-latest.args       |  2 +-
 .../cpu-cache-emulate-l3.x86_64-latest.args     |  2 +-
 .../cpu-cache-passthrough.x86_64-latest.args    |  2 +-
 .../cpu-check-default-none.x86_64-latest.args   |  2 +-
 .../cpu-check-default-none2.x86_64-latest.args  |  2 +-
 ...cpu-check-default-partial.x86_64-latest.args |  2 +-
 ...pu-check-default-partial2.x86_64-latest.args |  2 +-
 .../cpu-check-none.x86_64-latest.args           |  2 +-
 .../cpu-empty.x86_64-latest.args                |  2 +-
 .../cpu-eoi-disabled.x86_64-latest.args         |  2 +-
 .../cpu-eoi-enabled.x86_64-latest.args          |  2 +-
 .../cpu-exact1.x86_64-latest.args               |  2 +-
 .../cpu-exact2-nofallback.x86_64-latest.args    |  2 +-
 .../cpu-exact2.x86_64-latest.args               |  2 +-
 .../cpu-host-kvmclock.x86_64-latest.args        |  2 +-
 .../cpu-host-model-cmt.x86_64-latest.args       |  2 +-
 ...u-host-model-fallback-kvm.x86_64-latest.args |  2 +-
 ...u-host-model-fallback-tcg.x86_64-latest.args |  2 +-
 .../cpu-host-model-features.x86_64-latest.args  |  2 +-
 .../cpu-host-model-kvm.x86_64-latest.args       |  2 +-
 ...host-model-nofallback-kvm.x86_64-latest.args |  2 +-
 ...host-model-nofallback-tcg.x86_64-latest.args |  2 +-
 .../cpu-host-model-tcg.x86_64-latest.args       |  2 +-
 .../cpu-host-model-vendor.x86_64-latest.args    |  2 +-
 ...host-passthrough-features.x86_64-latest.args |  2 +-
 .../cpu-host-passthrough.x86_64-latest.args     |  2 +-
 .../cpu-hotplug-startup.x86_64-latest.args      |  2 +-
 .../cpu-kvmclock.x86_64-latest.args             |  2 +-
 .../cpu-minimum1.x86_64-latest.args             |  2 +-
 .../cpu-minimum2.x86_64-latest.args             |  2 +-
 .../cpu-no-removed-features.x86_64-latest.args  |  2 +-
 .../cpu-numa-disjoint.x86_64-latest.args        |  2 +-
 .../cpu-numa-disordered.x86_64-latest.args      |  2 +-
 .../cpu-numa-memshared.x86_64-latest.args       |  2 +-
 ...pu-numa-no-memory-element.x86_64-latest.args |  2 +-
 .../cpu-numa1.x86_64-latest.args                |  2 +-
 .../cpu-numa2.x86_64-latest.args                |  2 +-
 ...pu-phys-bits-emulate-bare.x86_64-latest.args |  2 +-
 .../cpu-phys-bits-emulate.x86_64-latest.args    |  2 +-
 .../cpu-phys-bits-emulate2.x86_64-latest.args   |  2 +-
 .../cpu-phys-bits-limit.x86_64-latest.args      |  2 +-
 ...cpu-phys-bits-passthrough.x86_64-latest.args |  2 +-
 .../cpu-strict1.x86_64-latest.args              |  2 +-
 .../cpu-topology1.x86_64-latest.args            |  2 +-
 .../cpu-topology2.x86_64-latest.args            |  2 +-
 .../cpu-topology3.x86_64-latest.args            |  2 +-
 .../cpu-topology4.x86_64-latest.args            |  2 +-
 .../cpu-translation.x86_64-latest.args          |  2 +-
 .../cpu-tsc-frequency.x86_64-latest.args        |  2 +-
 .../cputune-cpuset-big-id.x86_64-latest.args    |  2 +-
 .../cputune-numatune.x86_64-latest.args         |  2 +-
 .../cputune-zero-shares.x86_64-latest.args      |  2 +-
 .../qemuxmlconfdata/cputune.x86_64-latest.args  |  2 +-
 .../crypto-builtin.x86_64-latest.args           |  2 +-
 .../default-kvm-host-arch.x86_64-latest.args    |  2 +-
 .../default-qemu-host-arch.x86_64-latest.args   |  2 +-
 ...default-video-type-x86_64.x86_64-latest.args |  2 +-
 .../devices-acpi-index.x86_64-latest.args       |  2 +-
 .../disk-active-commit.x86_64-latest.args       |  2 +-
 .../disk-aio-io_uring.x86_64-latest.args        |  2 +-
 .../qemuxmlconfdata/disk-aio.x86_64-latest.args |  2 +-
 ...sk-backing-chains-noindex.x86_64-latest.args |  2 +-
 .../disk-blockio-no-discard.x86_64-latest.args  |  2 +-
 .../disk-blockio.x86_64-latest.args             |  2 +-
 .../disk-boot-cdrom.x86_64-latest.args          |  2 +-
 .../disk-boot-disk.x86_64-latest.args           |  2 +-
 .../disk-cache.x86_64-latest.args               |  2 +-
 ...rom-empty-network-invalid.x86_64-latest.args |  2 +-
 ...disk-cdrom-network-nbdkit.x86_64-latest.args |  2 +-
 .../disk-cdrom-network.x86_64-latest.args       |  2 +-
 .../disk-cdrom-tray.x86_64-latest.args          |  2 +-
 ...drom-usb-empty.x86_64-latest.abi-update.args |  2 +-
 .../disk-cdrom.x86_64-latest.args               |  2 +-
 .../disk-copy_on_read.x86_64-latest.args        |  2 +-
 .../disk-detect-zeroes.x86_64-latest.args       |  2 +-
 .../disk-discard.x86_64-latest.args             |  2 +-
 .../disk-discard_no_unref.x86_64-latest.args    |  2 +-
 .../disk-error-policy.x86_64-latest.args        |  2 +-
 .../disk-floppy-q35.x86_64-latest.args          |  2 +-
 .../disk-floppy-tray.x86_64-latest.args         |  2 +-
 .../disk-floppy.x86_64-latest.args              |  2 +-
 .../disk-fmt-qcow.x86_64-latest.args            |  2 +-
 .../disk-geometry.x86_64-latest.args            |  2 +-
 .../disk-ide-split.x86_64-latest.args           |  2 +-
 .../disk-ide-wwn.x86_64-latest.args             |  2 +-
 .../disk-ioeventfd.x86_64-latest.args           |  2 +-
 .../disk-metadata-cache.x86_64-latest.args      |  2 +-
 .../disk-mirror-old.x86_64-latest.args          |  2 +-
 .../disk-mirror.x86_64-latest.args              |  2 +-
 .../disk-network-http-nbdkit.x86_64-latest.args |  2 +-
 .../disk-network-http.x86_64-latest.args        |  2 +-
 .../disk-network-iscsi.x86_64-latest.args       |  2 +-
 .../disk-network-nbd.x86_64-latest.args         |  2 +-
 .../disk-network-nfs.x86_64-latest.args         |  2 +-
 ...k-rbd-encryption-layering.x86_64-latest.args |  2 +-
 ...k-rbd-encryption-luks-any.x86_64-latest.args |  2 +-
 ...sk-network-rbd-encryption.x86_64-latest.args |  2 +-
 ...disk-network-rbd-no-colon.x86_64-latest.args |  2 +-
 .../disk-network-rbd.x86_64-latest.args         |  2 +-
 .../disk-network-source-auth.x86_64-latest.args |  2 +-
 ...ource-curl-nbdkit-backing.x86_64-latest.args |  2 +-
 ...etwork-source-curl-nbdkit.x86_64-latest.args |  2 +-
 .../disk-network-source-curl.x86_64-latest.args |  2 +-
 .../disk-network-ssh-key.x86_64-latest.args     |  2 +-
 .../disk-network-ssh-nbdkit.x86_64-latest.args  |  2 +-
 ...disk-network-ssh-password.x86_64-latest.args |  2 +-
 .../disk-network-ssh.x86_64-latest.args         |  2 +-
 ...work-tlsx509-nbd-hostname.x86_64-latest.args |  2 +-
 .../disk-network-tlsx509-nbd.x86_64-latest.args |  2 +-
 .../disk-no-boot.x86_64-latest.args             |  2 +-
 .../disk-nvme.x86_64-latest.args                |  2 +-
 .../disk-order.x86_64-latest.args               |  2 +-
 ...disk-qcow2-datafile-store.x86_64-latest.args |  2 +-
 .../disk-readonly-disk.x86_64-latest.args       |  2 +-
 .../disk-rotation.x86_64-latest.args            |  2 +-
 .../disk-sata-device.x86_64-latest.args         |  2 +-
 .../disk-sata-product.x86_64-latest.args        |  2 +-
 .../disk-scsi-device-auto.x86_64-latest.args    |  2 +-
 .../disk-scsi-disk-split.x86_64-latest.args     |  2 +-
 .../disk-scsi-disk-vpd.x86_64-latest.args       |  2 +-
 .../disk-scsi-disk-wwn.x86_64-latest.args       |  2 +-
 ...disk-scsi-lun-passthrough.x86_64-latest.args |  2 +-
 .../disk-scsi.x86_64-latest.args                |  2 +-
 .../disk-serial.x86_64-latest.args              |  2 +-
 .../disk-shared.x86_64-latest.args              |  2 +-
 .../disk-slices.x86_64-latest.args              |  2 +-
 .../disk-snapshot.x86_64-latest.args            |  2 +-
 .../disk-source-fd.x86_64-latest.args           |  2 +-
 .../disk-source-pool-mode.x86_64-latest.args    |  2 +-
 .../disk-source-pool.x86_64-latest.args         |  2 +-
 ...artuppolicy-optional-drop.x86_64-latest.args |  2 +-
 ...disk-statistics-intervals.x86_64-latest.args |  2 +-
 .../disk-target-nvme.x86_64-latest.args         |  2 +-
 .../disk-transient.x86_64-latest.args           |  2 +-
 .../disk-usb-device-model.x86_64-latest.args    |  2 +-
 ...atest.QEMU_CAPS_DEVICE_USB_BOT-disabled.args |  2 +-
 ...pdate.QEMU_CAPS_DEVICE_USB_BOT-disabled.args |  2 +-
 ...isk-usb-device.x86_64-latest.abi-update.args |  2 +-
 .../disk-usb-device.x86_64-latest.args          |  2 +-
 .../disk-vhostuser-numa.x86_64-latest.args      |  2 +-
 .../disk-vhostuser.x86_64-latest.args           |  2 +-
 .../disk-vhostvdpa.x86_64-latest.args           |  2 +-
 .../disk-virtio-queues.x86_64-latest.args       |  2 +-
 ...-virtio-scsi-reservations.x86_64-latest.args |  2 +-
 .../disk-virtio.x86_64-latest.args              |  2 +-
 .../downscript.x86_64-latest.args               |  2 +-
 .../encrypted-disk-usage.x86_64-latest.args     |  2 +-
 .../encrypted-disk.x86_64-latest.args           |  2 +-
 .../eoi-disabled.x86_64-latest.args             |  2 +-
 .../eoi-enabled.x86_64-latest.args              |  2 +-
 .../event_idx.x86_64-latest.args                |  2 +-
 ...d-memory-no-numa-topology.x86_64-latest.args |  2 +-
 .../fd-memory-numa-topology.x86_64-latest.args  |  2 +-
 .../fd-memory-numa-topology2.x86_64-latest.args |  2 +-
 .../fd-memory-numa-topology3.x86_64-latest.args |  2 +-
 .../fd-memory-numa-topology4.x86_64-latest.args |  2 +-
 .../fips-enabled.x86_64-latest.args             |  2 +-
 ...mware-auto-bios-stateless.x86_64-latest.args |  2 +-
 .../firmware-auto-bios.x86_64-latest.args       |  2 +-
 ...re-auto-efi-enrolled-keys.x86_64-latest.args |  2 +-
 ...t-loader-qcow2-nvram-path.x86_64-latest.args |  2 +-
 ...o-efi-format-loader-qcow2.x86_64-latest.args |  2 +-
 ...-auto-efi-format-mismatch.x86_64-latest.args |  2 +-
 ...t-nvram-qcow2-network-nbd.x86_64-latest.args |  2 +-
 ...i-format-nvram-qcow2-path.x86_64-latest.args |  2 +-
 ...to-efi-format-nvram-qcow2.x86_64-latest.args |  2 +-
 ...mat-nvram-raw-loader-path.x86_64-latest.args |  2 +-
 ...am-raw-nvramtemplate-path.x86_64-latest.args |  2 +-
 ...rmat-nvram-raw.x86_64-latest.abi-update.args |  2 +-
 ...auto-efi-format-nvram-raw.x86_64-latest.args |  2 +-
 ...ormat-nvramtemplate-qcow2.x86_64-latest.args |  2 +-
 ...-auto-efi-loader-insecure.x86_64-latest.args |  2 +-
 ...ware-auto-efi-loader-path.x86_64-latest.args |  2 +-
 ...-loader-secure.x86_64-latest.abi-update.args |  2 +-
 ...re-auto-efi-loader-secure.x86_64-latest.args |  2 +-
 ...auto-efi-no-enrolled-keys.x86_64-latest.args |  2 +-
 ...mware-auto-efi-no-secboot.x86_64-latest.args |  2 +-
 ...mware-auto-efi-nvram-file.x86_64-latest.args |  2 +-
 ...o-efi-nvram-network-iscsi.x86_64-latest.args |  2 +-
 ...uto-efi-nvram-network-nbd.x86_64-latest.args |  2 +-
 ...mware-auto-efi-nvram-path.x86_64-latest.args |  2 +-
 ...e-auto-efi-nvram-template.x86_64-latest.args |  2 +-
 ...rmware-auto-efi-rw-pflash.x86_64-latest.args |  2 +-
 .../firmware-auto-efi-rw.x86_64-latest.args     |  2 +-
 ...firmware-auto-efi-secboot.x86_64-latest.args |  2 +-
 ...firmware-auto-efi-smm-off.x86_64-latest.args |  2 +-
 ...rmware-auto-efi-stateless.x86_64-latest.args |  2 +-
 ...are-auto-efi-varstore-q35.x86_64-latest.args |  2 +-
 ...mware-auto-efi.x86_64-latest.abi-update.args |  2 +-
 .../firmware-auto-efi.x86_64-latest.args        |  2 +-
 ...manual-bios-not-stateless.x86_64-latest.args |  2 +-
 ...are-manual-bios-stateless.x86_64-latest.args |  2 +-
 .../firmware-manual-bios.x86_64-latest.args     |  2 +-
 ...mware-manual-efi-acpi-q35.x86_64-latest.args |  2 +-
 ...mware-manual-efi-features.x86_64-latest.args |  2 +-
 ...i-loader-path-nonstandard.x86_64-latest.args |  2 +-
 ...-manual-efi-loader-secure.x86_64-latest.args |  2 +-
 ...nrolled-keys-legacy-paths.x86_64-latest.args |  2 +-
 ...nual-efi-no-enrolled-keys.x86_64-latest.args |  2 +-
 ...i-no-secboot-legacy-paths.x86_64-latest.args |  2 +-
 ...are-manual-efi-no-secboot.x86_64-latest.args |  2 +-
 ...are-manual-efi-nvram-file.x86_64-latest.args |  2 +-
 ...l-efi-nvram-network-iscsi.x86_64-latest.args |  2 +-
 ...ual-efi-nvram-network-nbd.x86_64-latest.args |  2 +-
 ...mplate-nonstandard-format.x86_64-latest.args |  2 +-
 ...-nonstandard-legacy-paths.x86_64-latest.args |  2 +-
 ...vram-template-nonstandard.x86_64-latest.args |  2 +-
 ...manual-efi-nvram-template.x86_64-latest.args |  2 +-
 ...re-manual-efi-rw-implicit.x86_64-latest.args |  2 +-
 ...anual-efi-rw-legacy-paths.x86_64-latest.args |  2 +-
 ...anual-efi-rw-modern-paths.x86_64-latest.args |  2 +-
 .../firmware-manual-efi-rw.x86_64-latest.args   |  2 +-
 ...-efi-secboot-legacy-paths.x86_64-latest.args |  2 +-
 ...rmware-manual-efi-secboot.x86_64-latest.args |  2 +-
 ...ware-manual-efi-stateless.x86_64-latest.args |  2 +-
 ...e-manual-efi-varstore-q35.x86_64-latest.args |  2 +-
 .../firmware-manual-efi.x86_64-latest.args      |  2 +-
 ...are-manual-noefi-acpi-q35.x86_64-latest.args |  2 +-
 ...e-manual-noefi-noacpi-q35.x86_64-latest.args |  2 +-
 .../floppy-drive-fat.x86_64-latest.args         |  2 +-
 tests/qemuxmlconfdata/fs9p.x86_64-latest.args   |  2 +-
 .../genid-auto.x86_64-latest.args               |  2 +-
 tests/qemuxmlconfdata/genid.x86_64-latest.args  |  2 +-
 .../graphics-dbus-address.x86_64-latest.args    |  2 +-
 .../graphics-dbus-audio.x86_64-latest.args      |  2 +-
 .../graphics-dbus-chardev.x86_64-latest.args    |  2 +-
 .../graphics-dbus-p2p.x86_64-latest.args        |  2 +-
 .../graphics-dbus-usbredir.x86_64-latest.args   |  2 +-
 .../graphics-dbus.x86_64-latest.args            |  2 +-
 ...s-egl-headless-rendernode.x86_64-latest.args |  2 +-
 .../graphics-egl-headless.x86_64-latest.args    |  2 +-
 .../graphics-listen-network.x86_64-latest.args  |  2 +-
 .../graphics-rdp.x86_64-latest.args             |  2 +-
 .../graphics-sdl-fullscreen.x86_64-latest.args  |  2 +-
 .../graphics-sdl.x86_64-latest.args             |  2 +-
 ...ics-spice-agent-file-xfer.x86_64-latest.args |  2 +-
 ...graphics-spice-agentmouse.x86_64-latest.args |  2 +-
 ...ics-spice-auto-socket-cfg.x86_64-latest.args |  2 +-
 ...raphics-spice-auto-socket.x86_64-latest.args |  2 +-
 ...raphics-spice-compression.x86_64-latest.args |  2 +-
 ...aphics-spice-egl-headless.x86_64-latest.args |  2 +-
 ...-spice-gl-auto-rendernode.x86_64-latest.args |  2 +-
 .../graphics-spice-no-args.x86_64-latest.args   |  2 +-
 .../graphics-spice-qxl-vga.x86_64-latest.args   |  2 +-
 .../graphics-spice-sasl.x86_64-latest.args      |  2 +-
 .../graphics-spice-socket.x86_64-latest.args    |  2 +-
 .../graphics-spice-timeout.x86_64-latest.args   |  2 +-
 .../graphics-spice-usb-redir.x86_64-latest.args |  2 +-
 .../graphics-spice.x86_64-latest.args           |  2 +-
 ...phics-vnc-auto-socket-cfg.x86_64-latest.args |  2 +-
 .../graphics-vnc-auto-socket.x86_64-latest.args |  2 +-
 ...graphics-vnc-egl-headless.x86_64-latest.args |  2 +-
 ...aphics-vnc-no-listen-attr.x86_64-latest.args |  2 +-
 .../graphics-vnc-none.x86_64-latest.args        |  2 +-
 .../graphics-vnc-policy.x86_64-latest.args      |  2 +-
 .../graphics-vnc-power.x86_64-latest.args       |  2 +-
 ...c-remove-generated-socket.x86_64-latest.args |  2 +-
 .../graphics-vnc-sasl.x86_64-latest.args        |  2 +-
 ...cs-vnc-socket-new-cmdline.x86_64-latest.args |  2 +-
 .../graphics-vnc-socket.x86_64-latest.args      |  2 +-
 ...aphics-vnc-standalone-p2p.x86_64-latest.args |  2 +-
 ...ics-vnc-standalone-socket.x86_64-latest.args |  2 +-
 .../graphics-vnc-standalone.x86_64-latest.args  |  2 +-
 .../graphics-vnc-tls-secret.x86_64-latest.args  |  2 +-
 .../graphics-vnc-tls.x86_64-latest.args         |  2 +-
 .../graphics-vnc-websocket.x86_64-latest.args   |  2 +-
 .../graphics-vnc.x86_64-latest.args             |  2 +-
 ...ostdev-mdev-display-ramfb.x86_64-latest.args |  2 +-
 ...isplay-spice-egl-headless.x86_64-latest.args |  2 +-
 ...mdev-display-spice-opengl.x86_64-latest.args |  2 +-
 ...-display-vnc-egl-headless.x86_64-latest.args |  2 +-
 .../hostdev-mdev-display-vnc.x86_64-latest.args |  2 +-
 .../hostdev-mdev-display.x86_64-latest.args     |  2 +-
 .../hostdev-mdev-precreated.x86_64-latest.args  |  2 +-
 ...ostdev-pci-address-device.x86_64-latest.args |  2 +-
 ...ev-pci-address-unassigned.x86_64-latest.args |  2 +-
 .../hostdev-pci-address.x86_64-latest.args      |  2 +-
 ...hostdev-pci-display-ramfb.x86_64-latest.args |  2 +-
 ...hostdev-pci-multifunction.x86_64-latest.args |  2 +-
 ...tdev-scsi-autogen-address.x86_64-latest.args |  2 +-
 .../hostdev-scsi-large-unit.x86_64-latest.args  |  2 +-
 .../hostdev-scsi-lsi.x86_64-latest.args         |  2 +-
 .../hostdev-scsi-shareable.x86_64-latest.args   |  2 +-
 ...stdev-scsi-vhost-scsi-pci.x86_64-latest.args |  2 +-
 ...tdev-scsi-vhost-scsi-pcie.x86_64-latest.args |  2 +-
 .../hostdev-scsi-virtio-scsi.x86_64-latest.args |  2 +-
 ...v-usb-address-device-boot.x86_64-latest.args |  2 +-
 ...ostdev-usb-address-device.x86_64-latest.args |  2 +-
 .../hostdev-usb-address-port.x86_64-latest.args |  2 +-
 .../hostdev-usb-address.x86_64-latest.args      |  2 +-
 ...ostdev-usb-vendor-product.x86_64-latest.args |  2 +-
 .../hostdev-vfio-multidomain.x86_64-latest.args |  2 +-
 .../hostdev-vfio.x86_64-latest.args             |  2 +-
 .../hotplug-base.x86_64-latest.args             |  2 +-
 .../hugepages-default-2M.x86_64-latest.args     |  2 +-
 ...pages-default-system-size.x86_64-latest.args |  2 +-
 .../hugepages-default.x86_64-latest.args        |  2 +-
 .../hugepages-memaccess.x86_64-latest.args      |  2 +-
 .../hugepages-memaccess2.x86_64-latest.args     |  2 +-
 .../hugepages-memaccess3.x86_64-latest.args     |  2 +-
 .../hugepages-nodeset.x86_64-latest.args        |  2 +-
 ...hugepages-numa-default-2M.x86_64-latest.args |  2 +-
 ...gepages-numa-default-dimm.x86_64-latest.args |  2 +-
 .../hugepages-numa-default.x86_64-latest.args   |  2 +-
 ...gepages-numa-nodeset-part.x86_64-latest.args |  2 +-
 .../hugepages-numa-nodeset.x86_64-latest.args   |  2 +-
 .../hugepages-nvdimm.x86_64-latest.args         |  2 +-
 .../hugepages-shared.x86_64-latest.args         |  2 +-
 tests/qemuxmlconfdata/hwuuid.x86_64-latest.args |  2 +-
 .../hyperv-host-model.x86_64-latest.args        |  2 +-
 .../hyperv-off.x86_64-latest.args               |  2 +-
 .../hyperv-panic.x86_64-latest.args             |  2 +-
 .../hyperv-passthrough.x86_64-latest.args       |  2 +-
 ...rv-spinlocks-never-notify.x86_64-latest.args |  2 +-
 .../hyperv-stimer-direct.x86_64-latest.args     |  2 +-
 tests/qemuxmlconfdata/hyperv.x86_64-latest.args |  2 +-
 .../input-linux.x86_64-latest.args              |  2 +-
 .../input-usbmouse-addr.x86_64-latest.args      |  2 +-
 .../input-usbmouse.x86_64-latest.args           |  2 +-
 .../input-usbtablet.x86_64-latest.args          |  2 +-
 .../intel-iommu-aw-bits.x86_64-latest.args      |  2 +-
 .../intel-iommu-caching-mode.x86_64-latest.args |  2 +-
 .../intel-iommu-device-iotlb.x86_64-latest.args |  2 +-
 ...tel-iommu-dma-translation.x86_64-latest.args |  2 +-
 ...mu-eim-autoadd.x86_64-latest.abi-update.args |  2 +-
 .../intel-iommu-eim.x86_64-latest.args          |  2 +-
 .../intel-iommu.x86_64-latest.args              |  2 +-
 .../iommufd-q35-fd.x86_64-latest.args           |  2 +-
 .../iommufd-q35.x86_64-latest.args              |  2 +-
 .../qemuxmlconfdata/iommufd.x86_64-latest.args  |  2 +-
 .../iothreads-disk.x86_64-latest.args           |  2 +-
 .../iothreads-ids-partial.x86_64-latest.args    |  2 +-
 .../iothreads-ids-pool-sizes.x86_64-latest.args |  2 +-
 .../iothreads-ids.x86_64-latest.args            |  2 +-
 ...reads-virtio-scsi-mapping.x86_64-latest.args |  2 +-
 ...iothreads-virtio-scsi-pci.x86_64-latest.args |  2 +-
 .../kvm-features-off.x86_64-latest.args         |  2 +-
 .../kvm-features.x86_64-latest.args             |  2 +-
 .../kvm-pit-delay.x86_64-latest.args            |  2 +-
 .../kvm-pit-discard.x86_64-latest.args          |  2 +-
 .../kvmclock+eoi-disabled.x86_64-latest.args    |  2 +-
 .../qemuxmlconfdata/kvmclock.x86_64-latest.args |  2 +-
 ...aunch-security-sev-direct.x86_64-latest.args |  2 +-
 .../launch-security-sev-snp.x86_64-latest.args  |  2 +-
 tests/qemuxmlconfdata/lease.x86_64-latest.args  |  2 +-
 .../luks-disks-source-qcow2.x86_64-latest.args  |  2 +-
 .../luks-disks-source.x86_64-latest.args        |  2 +-
 .../luks-disks.x86_64-latest.args               |  2 +-
 .../machine-aliases1.x86_64-latest.args         |  2 +-
 .../machine-aliases2.x86_64-latest.args         |  2 +-
 .../machine-core-off.x86_64-latest.args         |  2 +-
 .../machine-core-on.x86_64-latest.args          |  2 +-
 .../machine-i8042-off.x86_64-latest.args        |  2 +-
 .../machine-i8042-on.x86_64-latest.args         |  2 +-
 .../machine-smm-off.x86_64-latest.args          |  2 +-
 .../machine-smm-on.x86_64-latest.args           |  2 +-
 .../machine-vmport-opt.x86_64-latest.args       |  2 +-
 ...d-memory-default-hugepage.x86_64-latest.args |  2 +-
 .../memfd-memory-numa.x86_64-latest.args        |  2 +-
 .../memory-hotplug-dimm-addr.x86_64-latest.args |  2 +-
 .../memory-hotplug-dimm.x86_64-latest.args      |  2 +-
 .../memory-hotplug-multiple.x86_64-latest.args  |  2 +-
 ...ry-hotplug-numa-preferred.x86_64-latest.args |  2 +-
 ...ory-hotplug-nvdimm-access.x86_64-latest.args |  2 +-
 ...mory-hotplug-nvdimm-align.x86_64-latest.args |  2 +-
 ...mory-hotplug-nvdimm-label.x86_64-latest.args |  2 +-
 ...ry-hotplug-nvdimm-overlap.x86_64-latest.args |  2 +-
 ...emory-hotplug-nvdimm-pmem.x86_64-latest.args |  2 +-
 ...y-hotplug-nvdimm-readonly.x86_64-latest.args |  2 +-
 .../memory-hotplug-nvdimm.x86_64-latest.args    |  2 +-
 ...memory-hotplug-virtio-mem.x86_64-latest.args |  2 +-
 ...emory-hotplug-virtio-pmem.x86_64-latest.args |  2 +-
 .../memory-hotplug.x86_64-latest.args           |  2 +-
 .../memorybacking-set.x86_64-latest.args        |  2 +-
 .../memorybacking-unset.x86_64-latest.args      |  2 +-
 .../memtune-unlimited.x86_64-latest.args        |  2 +-
 .../qemuxmlconfdata/memtune.x86_64-latest.args  |  2 +-
 .../metadata-duplicate.x86_64-latest.args       |  2 +-
 .../qemuxmlconfdata/metadata.x86_64-latest.args |  2 +-
 .../migrate-numa-unaligned.x86_64-latest.args   |  2 +-
 .../qemuxmlconfdata/migrate.x86_64-latest.args  |  2 +-
 .../misc-disable-s3.x86_64-latest.args          |  2 +-
 .../misc-disable-suspends.x86_64-latest.args    |  2 +-
 .../misc-enable-s4.x86_64-latest.args           |  2 +-
 .../misc-no-reboot.x86_64-latest.args           |  2 +-
 .../misc-uuid.x86_64-latest.args                |  2 +-
 .../mlock-off.x86_64-latest.args                |  2 +-
 .../qemuxmlconfdata/mlock-on.x86_64-latest.args |  2 +-
 .../mtp-usb-device.x86_64-latest.args           |  2 +-
 .../multifunction-pci-device.x86_64-latest.args |  2 +-
 .../name-escape.x86_64-latest.args              |  2 +-
 .../net-bandwidth.x86_64-latest.args            |  2 +-
 .../net-bandwidth2.x86_64-latest.args           |  2 +-
 .../net-client.x86_64-latest.args               |  2 +-
 .../net-coalesce.x86_64-latest.args             |  2 +-
 .../net-eth-hostip.x86_64-latest.args           |  2 +-
 .../net-eth-ifname.x86_64-latest.args           |  2 +-
 .../net-eth-names.x86_64-latest.args            |  2 +-
 .../net-eth-unmanaged-tap.x86_64-latest.args    |  2 +-
 .../qemuxmlconfdata/net-eth.x86_64-latest.args  |  2 +-
 .../net-hostdev-bootorder.x86_64-latest.args    |  2 +-
 .../net-hostdev-multidomain.x86_64-latest.args  |  2 +-
 ...-hostdev-vfio-multidomain.x86_64-latest.args |  2 +-
 .../net-hostdev-vfio.x86_64-latest.args         |  2 +-
 .../net-hostdev.x86_64-latest.args              |  2 +-
 .../net-isolated-port.x86_64-latest.args        |  2 +-
 .../net-linkstate.x86_64-latest.args            |  2 +-
 .../net-many-models.x86_64-latest.args          |  2 +-
 .../net-mcast.x86_64-latest.args                |  2 +-
 .../net-midonet.x86_64-latest.args              |  2 +-
 .../qemuxmlconfdata/net-mtu.x86_64-latest.args  |  2 +-
 .../net-openvswitch.x86_64-latest.args          |  2 +-
 .../net-server.x86_64-latest.args               |  2 +-
 .../qemuxmlconfdata/net-udp.x86_64-latest.args  |  2 +-
 .../qemuxmlconfdata/net-usb.x86_64-latest.args  |  2 +-
 .../net-user-addr.x86_64-latest.args            |  2 +-
 .../net-user-passt.x86_64-latest.args           |  2 +-
 .../qemuxmlconfdata/net-user.x86_64-latest.args |  2 +-
 .../net-vdpa-multiqueue.x86_64-latest.args      |  2 +-
 .../qemuxmlconfdata/net-vdpa.x86_64-latest.args |  2 +-
 .../net-vhostuser-multiq.x86_64-latest.args     |  2 +-
 .../net-vhostuser-passt.x86_64-latest.args      |  2 +-
 .../net-vhostuser.x86_64-latest.args            |  2 +-
 .../net-virtio-device.x86_64-latest.args        |  2 +-
 ...t-virtio-disable-offloads.x86_64-latest.args |  2 +-
 .../net-virtio-netdev.x86_64-latest.args        |  2 +-
 ...-virtio-network-portgroup.x86_64-latest.args |  2 +-
 .../net-virtio-rss.x86_64-latest.args           |  2 +-
 .../net-virtio-rxtxqueuesize.x86_64-latest.args |  2 +-
 ...et-virtio-teaming-hostdev.x86_64-latest.args |  2 +-
 ...et-virtio-teaming-network.x86_64-latest.args |  2 +-
 .../net-virtio-teaming.x86_64-latest.args       |  2 +-
 .../net-virtio-vhost.x86_64-latest.args         |  2 +-
 .../net-virtio.x86_64-latest.args               |  2 +-
 .../nosharepages.x86_64-latest.args             |  2 +-
 ...d-auto-memory-vcpu-cpuset.x86_64-latest.args |  2 +-
 ...u-no-cpuset-and-placement.x86_64-latest.args |  2 +-
 ...mad-auto-vcpu-no-numatune.x86_64-latest.args |  2 +-
 ...auto-vcpu-static-numatune.x86_64-latest.args |  2 +-
 ...d-static-memory-auto-vcpu.x86_64-latest.args |  2 +-
 ...d-static-vcpu-no-numatune.x86_64-latest.args |  2 +-
 tests/qemuxmlconfdata/numad.x86_64-latest.args  |  2 +-
 ...tune-auto-nodeset-invalid.x86_64-latest.args |  2 +-
 .../numatune-auto-prefer.x86_64-latest.args     |  2 +-
 .../numatune-distances.x86_64-latest.args       |  2 +-
 .../numatune-hmat-none.x86_64-latest.args       |  2 +-
 .../numatune-hmat.x86_64-latest.args            |  2 +-
 ...umatune-memnode-no-memory.x86_64-latest.args |  2 +-
 ...-memnode-restrictive-mode.x86_64-latest.args |  2 +-
 .../numatune-memnode.x86_64-latest.args         |  2 +-
 .../numatune-no-vcpu.x86_64-latest.args         |  2 +-
 .../numatune-system-memory.x86_64-latest.args   |  2 +-
 ...mavcpus-topology-mismatch.x86_64-latest.args |  2 +-
 .../pages-dimm-discard.x86_64-latest.args       |  2 +-
 .../pages-discard-hugepages.x86_64-latest.args  |  2 +-
 .../pages-discard.x86_64-latest.args            |  2 +-
 .../panic-double.x86_64-latest.args             |  2 +-
 .../panic-no-address.x86_64-latest.args         |  2 +-
 tests/qemuxmlconfdata/panic.x86_64-latest.args  |  2 +-
 .../parallel-parport-chardev.x86_64-latest.args |  2 +-
 .../parallel-tcp-chardev.x86_64-latest.args     |  2 +-
 .../parallel-unix-chardev.x86_64-latest.args    |  2 +-
 ...acpi-root-hotplug-disable.x86_64-latest.args |  2 +-
 ...-acpi-root-hotplug-enable.x86_64-latest.args |  2 +-
 .../pci-autoadd-addr.x86_64-latest.args         |  2 +-
 .../pci-autoadd-idx.x86_64-latest.args          |  2 +-
 .../pci-autofill-addr.x86_64-latest.args        |  2 +-
 .../pci-bridge-many-disks.x86_64-latest.args    |  2 +-
 .../pci-bridge.x86_64-latest.args               |  2 +-
 .../pci-expander-bus.x86_64-latest.args         |  2 +-
 .../qemuxmlconfdata/pci-many.x86_64-latest.args |  2 +-
 .../pci-rom-disabled.x86_64-latest.args         |  2 +-
 .../qemuxmlconfdata/pci-rom.x86_64-latest.args  |  2 +-
 .../pci-serial-dev-chardev.x86_64-latest.args   |  2 +-
 .../pcie-expander-bus.x86_64-latest.args        |  2 +-
 ...e-root-port-model-generic.x86_64-latest.args |  2 +-
 ...e-root-port-model-ioh3420.x86_64-latest.args |  2 +-
 .../pcie-root-port-nohotplug.x86_64-latest.args |  2 +-
 .../pcie-root-port.x86_64-latest.args           |  2 +-
 .../pcie-root.x86_64-latest.args                |  2 +-
 ...ie-switch-downstream-port.x86_64-latest.args |  2 +-
 ...pcie-switch-upstream-port.x86_64-latest.args |  2 +-
 .../pcihole64-gib.x86_64-latest.args            |  2 +-
 .../pcihole64-q35.x86_64-latest.args            |  2 +-
 .../pcihole64.x86_64-latest.args                |  2 +-
 .../pmu-feature-off.x86_64-latest.args          |  2 +-
 .../pmu-feature.x86_64-latest.args              |  2 +-
 .../pstore-acpi-erst.x86_64-latest.args         |  2 +-
 .../pv-spinlock-disabled.x86_64-latest.args     |  2 +-
 .../pv-spinlock-enabled.x86_64-latest.args      |  2 +-
 .../pvpanic-pci-x86_64.x86_64-latest.args       |  2 +-
 .../q35-default-devices-only.x86_64-latest.args |  2 +-
 .../q35-multifunction.x86_64-latest.args        |  2 +-
 .../q35-pci-force-address.x86_64-latest.args    |  2 +-
 .../q35-pcie-autoadd.x86_64-latest.args         |  2 +-
 .../qemuxmlconfdata/q35-pcie.x86_64-latest.args |  2 +-
 .../q35-usb2-multi.x86_64-latest.args           |  2 +-
 .../q35-usb2-reorder.x86_64-latest.args         |  2 +-
 .../qemuxmlconfdata/q35-usb2.x86_64-latest.args |  2 +-
 .../q35-virt-manager-basic.x86_64-latest.args   |  2 +-
 tests/qemuxmlconfdata/q35.x86_64-latest.args    |  2 +-
 .../qemu-ns-alt.x86_64-latest.args              |  2 +-
 .../qemu-ns-commandline-ns0.x86_64-latest.args  |  2 +-
 .../qemu-ns-commandline-ns1.x86_64-latest.args  |  2 +-
 .../qemu-ns-commandline.x86_64-latest.args      |  2 +-
 ...ns-domain-commandline-ns0.x86_64-latest.args |  2 +-
 ...emu-ns-domain-commandline.x86_64-latest.args |  2 +-
 .../qemu-ns-domain-ns0.x86_64-latest.args       |  2 +-
 .../qemu-ns-no-env.x86_64-latest.args           |  2 +-
 .../qemuxmlconfdata/qemu-ns.x86_64-latest.args  |  2 +-
 .../reboot-timeout-disabled.x86_64-latest.args  |  2 +-
 .../reboot-timeout-enabled.x86_64-latest.args   |  2 +-
 .../restore-v2-fd.x86_64-latest.args            |  2 +-
 .../restore-v2.x86_64-latest.args               |  2 +-
 ...eorder-domain-subelements.x86_64-latest.args |  2 +-
 .../seclabel-dac-none.x86_64-latest.args        |  2 +-
 .../seclabel-device-multiple.x86_64-latest.args |  2 +-
 ...eclabel-dynamic-baselabel.x86_64-latest.args |  2 +-
 ...eclabel-dynamic-labelskip.x86_64-latest.args |  2 +-
 ...abel-dynamic-none-relabel.x86_64-latest.args |  2 +-
 .../seclabel-dynamic-none.x86_64-latest.args    |  2 +-
 ...seclabel-dynamic-override.x86_64-latest.args |  2 +-
 .../seclabel-dynamic-relabel.x86_64-latest.args |  2 +-
 .../seclabel-dynamic.x86_64-latest.args         |  2 +-
 .../seclabel-none.x86_64-latest.args            |  2 +-
 ...bel-selinux-none-override.x86_64-latest.args |  2 +-
 ...seclabel-static-labelskip.x86_64-latest.args |  2 +-
 .../seclabel-static-relabel.x86_64-latest.args  |  2 +-
 .../seclabel-static.x86_64-latest.args          |  2 +-
 .../serial-debugcon.x86_64-latest.args          |  2 +-
 ...serial-dev-chardev-iobase.x86_64-latest.args |  2 +-
 .../serial-dev-chardev.x86_64-latest.args       |  2 +-
 .../serial-file-chardev.x86_64-latest.args      |  2 +-
 .../serial-file-log.x86_64-latest.args          |  2 +-
 .../serial-many-chardev.x86_64-latest.args      |  2 +-
 .../serial-pty-chardev.x86_64-latest.args       |  2 +-
 .../serial-spiceport.x86_64-latest.args         |  2 +-
 .../serial-target-port-auto.x86_64-latest.args  |  2 +-
 .../serial-tcp-chardev.x86_64-latest.args       |  2 +-
 ...serial-tcp-telnet-chardev.x86_64-latest.args |  2 +-
 ...tcp-tlsx509-chardev-notls.x86_64-latest.args |  2 +-
 ...cp-tlsx509-chardev-verify.x86_64-latest.args |  2 +-
 ...erial-tcp-tlsx509-chardev.x86_64-latest.args |  2 +-
 ...cp-tlsx509-secret-chardev.x86_64-latest.args |  2 +-
 .../serial-udp-chardev.x86_64-latest.args       |  2 +-
 .../serial-unix-chardev.x86_64-latest.args      |  2 +-
 .../serial-vc-chardev.x86_64-latest.args        |  2 +-
 .../shmem-plain-doorbell.x86_64-latest.args     |  2 +-
 .../smartcard-controller.x86_64-latest.args     |  2 +-
 ...ost-certificates-database.x86_64-latest.args |  2 +-
 ...artcard-host-certificates.x86_64-latest.args |  2 +-
 .../smartcard-host.x86_64-latest.args           |  2 +-
 ...card-passthrough-spicevmc.x86_64-latest.args |  2 +-
 ...smartcard-passthrough-tcp.x86_64-latest.args |  2 +-
 ...martcard-passthrough-unix.x86_64-latest.args |  2 +-
 .../smbios-type-fwcfg.x86_64-latest.args        |  2 +-
 tests/qemuxmlconfdata/smbios.x86_64-latest.args |  2 +-
 .../sound-device-virtio.x86_64-latest.args      |  2 +-
 .../sound-device.x86_64-latest.args             |  2 +-
 .../tap-vhost-incorrect.x86_64-latest.args      |  2 +-
 .../tap-vhost.x86_64-latest.args                |  2 +-
 .../throttlefilter.x86_64-latest.args           |  2 +-
 .../tpm-emulator-crb-profile.x86_64-latest.args |  2 +-
 .../tpm-emulator-tpm2-enc.x86_64-latest.args    |  2 +-
 .../tpm-emulator-tpm2-pstate.x86_64-latest.args |  2 +-
 .../tpm-emulator-tpm2.x86_64-latest.args        |  2 +-
 .../tpm-emulator.x86_64-latest.args             |  2 +-
 .../tpm-external.x86_64-latest.args             |  2 +-
 .../tpm-passthrough-crb.x86_64-latest.args      |  2 +-
 .../tpm-passthrough.x86_64-latest.args          |  2 +-
 .../tseg-explicit-size.x86_64-latest.args       |  2 +-
 ...ntroller-automatic-i440fx.x86_64-latest.args |  2 +-
 ...ontroller-automatic-isapc.x86_64-latest.args |  2 +-
 ...troller-automatic-microvm.x86_64-latest.args |  2 +-
 ...-controller-automatic-q35.x86_64-latest.args |  2 +-
 ...automatic-unavailable-q35.x86_64-latest.args |  2 +-
 ...controller-default-i440fx.x86_64-latest.args |  2 +-
 ...sb-controller-default-q35.x86_64-latest.args |  2 +-
 ...ontroller-ich9-autoassign.x86_64-latest.args |  2 +-
 ...controller-ich9-companion.x86_64-latest.args |  2 +-
 ...controller-ich9-ehci-addr.x86_64-latest.args |  2 +-
 ...oller-nec-xhci-autoassign.x86_64-latest.args |  2 +-
 .../usb-controller-nec-xhci.x86_64-latest.args  |  2 +-
 .../usb-controller-piix3.x86_64-latest.args     |  2 +-
 .../usb-controller-qemu-xhci.x86_64-latest.args |  2 +-
 .../usb-hub-autoadd-deluxe.x86_64-latest.args   |  2 +-
 .../usb-hub-autoadd.x86_64-latest.args          |  2 +-
 .../qemuxmlconfdata/usb-hub.x86_64-latest.args  |  2 +-
 .../usb-long-port-path.x86_64-latest.args       |  2 +-
 .../qemuxmlconfdata/usb-none.x86_64-latest.args |  2 +-
 .../usb-port-autoassign.x86_64-latest.args      |  2 +-
 .../usb-port-missing.x86_64-latest.args         |  2 +-
 .../usb-ports.x86_64-latest.args                |  2 +-
 .../usb-redir-boot.x86_64-latest.args           |  2 +-
 .../usb-redir-filter-version.x86_64-latest.args |  2 +-
 .../usb-redir-filter.x86_64-latest.args         |  2 +-
 .../usb-redir-unix.x86_64-latest.args           |  2 +-
 .../usb-redir.x86_64-latest.args                |  2 +-
 .../usb1-usb2.x86_64-latest.args                |  2 +-
 .../user-aliases-usb.x86_64-latest.args         |  2 +-
 .../user-aliases.x86_64-latest.args             |  2 +-
 .../user-aliases2.x86_64-latest.args            |  2 +-
 .../vcpu-placement-static.x86_64-latest.args    |  2 +-
 .../vhost-user-fs-fd-memory.x86_64-latest.args  |  2 +-
 ...host-user-fs-fd-openfiles.x86_64-latest.args |  2 +-
 .../vhost-user-fs-hugepages.x86_64-latest.args  |  2 +-
 .../vhost-user-fs-readonly.x86_64-latest.args   |  2 +-
 .../vhost-user-fs-sock.x86_64-latest.args       |  2 +-
 .../vhost-user-gpu-secondary.x86_64-latest.args |  2 +-
 .../vhost-user-vga.x86_64-latest.args           |  2 +-
 .../vhost-vsock-auto.x86_64-latest.args         |  2 +-
 .../vhost-vsock.x86_64-latest.args              |  2 +-
 ...ideo-bochs-display-device.x86_64-latest.args |  2 +-
 .../video-bochs-edid-none.x86_64-latest.args    |  2 +-
 .../video-bochs-edid-off.x86_64-latest.args     |  2 +-
 .../video-bochs-edid-on.x86_64-latest.args      |  2 +-
 ...eo-device-pciaddr-default.x86_64-latest.args |  2 +-
 .../video-none-device.x86_64-latest.args        |  2 +-
 .../video-qxl-device-vgamem.x86_64-latest.args  |  2 +-
 .../video-qxl-device-vram64.x86_64-latest.args  |  2 +-
 .../video-qxl-device.x86_64-latest.args         |  2 +-
 .../video-qxl-heads.x86_64-latest.args          |  2 +-
 .../video-qxl-noheads.x86_64-latest.args        |  2 +-
 .../video-qxl-resolution.x86_64-latest.args     |  2 +-
 ...deo-qxl-sec-device-vgamem.x86_64-latest.args |  2 +-
 ...deo-qxl-sec-device-vram64.x86_64-latest.args |  2 +-
 .../video-qxl-sec-device.x86_64-latest.args     |  2 +-
 ...ideo-ramfb-display-device.x86_64-latest.args |  2 +-
 .../video-vga-device-vgamem.x86_64-latest.args  |  2 +-
 .../video-vga-device.x86_64-latest.args         |  2 +-
 .../video-vga-edid-none.x86_64-latest.args      |  2 +-
 .../video-vga-edid-off.x86_64-latest.args       |  2 +-
 .../video-vga-edid-on.x86_64-latest.args        |  2 +-
 .../video-vga-qxl-heads.x86_64-latest.args      |  2 +-
 .../video-virtio-blob-off.x86_64-latest.args    |  2 +-
 .../video-virtio-blob-on.x86_64-latest.args     |  2 +-
 .../video-virtio-edid-none.x86_64-latest.args   |  2 +-
 .../video-virtio-edid-off.x86_64-latest.args    |  2 +-
 .../video-virtio-edid-on.x86_64-latest.args     |  2 +-
 .../video-virtio-gpu-device.x86_64-latest.args  |  2 +-
 .../video-virtio-gpu-sdl-gl.x86_64-latest.args  |  2 +-
 ...ideo-virtio-gpu-secondary.x86_64-latest.args |  2 +-
 ...video-virtio-gpu-spice-gl.x86_64-latest.args |  2 +-
 .../video-virtio-gpu-virgl.x86_64-latest.args   |  2 +-
 ...rtio-vga-device-downgrade.x86_64-latest.args |  2 +-
 ...st.QEMU_CAPS_VIRTIO_GPU_GL_PCI-disabled.args |  2 +-
 ..._CAPS_VIRTIO_VGA_GL-disabled-ABI_UPDATE.args |  2 +-
 ...latest.QEMU_CAPS_VIRTIO_VGA_GL-disabled.args |  2 +-
 .../video-virtio-vga-gpu-gl.x86_64-latest.args  |  2 +-
 ...st.QEMU_CAPS_DEVICE_VIRTIO_VGA-disabled.args |  2 +-
 .../video-virtio-vga.x86_64-latest.args         |  2 +-
 .../virtio-9p-createmode.x86_64-latest.args     |  2 +-
 .../virtio-9p-multidevs.x86_64-latest.args      |  2 +-
 .../virtio-input-passthrough.x86_64-latest.args |  2 +-
 .../virtio-input.x86_64-latest.args             |  2 +-
 .../virtio-iommu-x86_64.x86_64-latest.args      |  2 +-
 .../virtio-non-transitional.x86_64-latest.args  |  2 +-
 ...io-options-controller-ats.x86_64-latest.args |  2 +-
 ...-options-controller-iommu.x86_64-latest.args |  2 +-
 ...options-controller-packed.x86_64-latest.args |  2 +-
 .../virtio-options-disk-ats.x86_64-latest.args  |  2 +-
 ...virtio-options-disk-iommu.x86_64-latest.args |  2 +-
 ...irtio-options-disk-packed.x86_64-latest.args |  2 +-
 .../virtio-options-fs-ats.x86_64-latest.args    |  2 +-
 .../virtio-options-fs-iommu.x86_64-latest.args  |  2 +-
 .../virtio-options-fs-packed.x86_64-latest.args |  2 +-
 .../virtio-options-input-ats.x86_64-latest.args |  2 +-
 ...irtio-options-input-iommu.x86_64-latest.args |  2 +-
 ...rtio-options-input-packed.x86_64-latest.args |  2 +-
 ...io-options-memballoon-ats.x86_64-latest.args |  2 +-
 ...alloon-freepage-reporting.x86_64-latest.args |  2 +-
 ...-options-memballoon-iommu.x86_64-latest.args |  2 +-
 ...options-memballoon-packed.x86_64-latest.args |  2 +-
 .../virtio-options-net-ats.x86_64-latest.args   |  2 +-
 .../virtio-options-net-iommu.x86_64-latest.args |  2 +-
 ...virtio-options-net-packed.x86_64-latest.args |  2 +-
 .../virtio-options-rng-ats.x86_64-latest.args   |  2 +-
 .../virtio-options-rng-iommu.x86_64-latest.args |  2 +-
 ...virtio-options-rng-packed.x86_64-latest.args |  2 +-
 .../virtio-options-video-ats.x86_64-latest.args |  2 +-
 ...irtio-options-video-iommu.x86_64-latest.args |  2 +-
 ...rtio-options-video-packed.x86_64-latest.args |  2 +-
 .../virtio-options.x86_64-latest.args           |  2 +-
 .../virtio-rng-builtin.x86_64-latest.args       |  2 +-
 .../virtio-rng-default.x86_64-latest.args       |  2 +-
 .../virtio-rng-egd-unix.x86_64-latest.args      |  2 +-
 .../virtio-rng-egd.x86_64-latest.args           |  2 +-
 .../virtio-rng-multiple.x86_64-latest.args      |  2 +-
 .../virtio-rng-random.x86_64-latest.args        |  2 +-
 .../virtio-transitional.x86_64-latest.args      |  2 +-
 .../vmcoreinfo.x86_64-latest.args               |  2 +-
 .../watchdog-device.x86_64-latest.args          |  2 +-
 .../watchdog-dump.x86_64-latest.args            |  2 +-
 .../watchdog-injectnmi.x86_64-latest.args       |  2 +-
 .../watchdog-q35-multiple.x86_64-latest.args    |  2 +-
 .../qemuxmlconfdata/watchdog.x86_64-latest.args |  2 +-
 .../x86-kvm-32-on-64.x86_64-latest.args         |  2 +-
 ...x86_64-default-cpu-kvm-pc.x86_64-latest.args |  2 +-
 ...86_64-default-cpu-kvm-q35.x86_64-latest.args |  2 +-
 ...-default-cpu-tcg-features.x86_64-latest.args |  2 +-
 ...x86_64-default-cpu-tcg-pc.x86_64-latest.args |  2 +-
 ...86_64-default-cpu-tcg-q35.x86_64-latest.args |  2 +-
 ...default-models.x86_64-latest.abi-update.args |  2 +-
 .../x86_64-pc-default-models.x86_64-latest.args |  2 +-
 .../x86_64-pc-graphics.x86_64-latest.args       |  2 +-
 .../x86_64-pc-headless.x86_64-latest.args       |  2 +-
 ..._64-pc-minimal.x86_64-latest.abi-update.args |  2 +-
 .../x86_64-pc-minimal.x86_64-latest.args        |  2 +-
 ...default-models.x86_64-latest.abi-update.args |  2 +-
 ...x86_64-q35-default-models.x86_64-latest.args |  2 +-
 .../x86_64-q35-graphics.x86_64-latest.args      |  2 +-
 .../x86_64-q35-headless.x86_64-latest.args      |  2 +-
 ...64-q35-minimal.x86_64-latest.abi-update.args |  2 +-
 .../x86_64-q35-minimal.x86_64-latest.args       |  2 +-
 825 files changed, 839 insertions(+), 826 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index e726dc661c..95e2ea9a6b 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5357,8 +5357,21 @@ qemuBuildMonitorCommandLine(virCommand *cmd,
                                 priv->qemuCaps) < 0)
         return -1;

-    virCommandAddArg(cmd, "-mon");
-    virCommandAddArg(cmd, "chardev=charmonitor,id=monitor,mode=control");
+    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_MONITOR_QMP)) {
+        g_autoptr(virJSONValue) props = NULL;
+
+        if (qemuMonitorCreateObjectProps(&props, "monitor-qmp",
+                                         "monitor",
+                                         "s:chardev", "charmonitor",
+                                         NULL) < 0)
+            return -1;
+
+        if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0)
+            return -1;
+    } else {
+        virCommandAddArg(cmd, "-mon");
+        virCommandAddArg(cmd, "chardev=charmonitor,id=monitor,mode=control");
+    }

     return 0;
 }
diff --git a/tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.args b/tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.args
index 0e69fab7e9..fe79c9c388 100644
--- a/tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.args
@@ -31,7 +31,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args b/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args
index e7ae567768..d86f230095 100644
--- a/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/acpi-table.x86_64-latest.args b/tests/qemuxmlconfdata/acpi-table.x86_64-latest.args
index 69180eb330..9b3821d402 100644
--- a/tests/qemuxmlconfdata/acpi-table.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/acpi-table.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args
index 041b6695d3..30a38131e5 100644
--- a/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/async-teardown.x86_64-latest.args b/tests/qemuxmlconfdata/async-teardown.x86_64-latest.args
index 481352318c..9d906ba832 100644
--- a/tests/qemuxmlconfdata/async-teardown.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/async-teardown.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-alsa-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-alsa-best.x86_64-latest.args
index 2e01b7f804..07a38c2856 100644
--- a/tests/qemuxmlconfdata/audio-alsa-best.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-alsa-best.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-alsa-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-alsa-full.x86_64-latest.args
index 6a14e8c3ed..80e4df7dbe 100644
--- a/tests/qemuxmlconfdata/audio-alsa-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-alsa-full.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-alsa-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-alsa-minimal.x86_64-latest.args
index bf3559e919..b06c4d93b7 100644
--- a/tests/qemuxmlconfdata/audio-alsa-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-alsa-minimal.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-coreaudio-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-coreaudio-best.x86_64-latest.args
index bbff4cdc1f..909c3fc0e1 100644
--- a/tests/qemuxmlconfdata/audio-coreaudio-best.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-coreaudio-best.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-coreaudio-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-coreaudio-full.x86_64-latest.args
index 81a405d0fb..cade91eba0 100644
--- a/tests/qemuxmlconfdata/audio-coreaudio-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-coreaudio-full.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-coreaudio-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-coreaudio-minimal.x86_64-latest.args
index 67f04ffde1..c440df365b 100644
--- a/tests/qemuxmlconfdata/audio-coreaudio-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-coreaudio-minimal.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-default-nographics.x86_64-latest.args b/tests/qemuxmlconfdata/audio-default-nographics.x86_64-latest.args
index bf3559e919..b06c4d93b7 100644
--- a/tests/qemuxmlconfdata/audio-default-nographics.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-default-nographics.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-default-sdl.x86_64-latest.args b/tests/qemuxmlconfdata/audio-default-sdl.x86_64-latest.args
index 005a02aec8..45f74b8eaf 100644
--- a/tests/qemuxmlconfdata/audio-default-sdl.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-default-sdl.x86_64-latest.args
@@ -22,7 +22,7 @@ SDL_AUDIODRIVER=esd \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-default-spice.x86_64-latest.args b/tests/qemuxmlconfdata/audio-default-spice.x86_64-latest.args
index cf9cbae6f6..0384f91dad 100644
--- a/tests/qemuxmlconfdata/audio-default-spice.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-default-spice.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-default-vnc.x86_64-latest.args b/tests/qemuxmlconfdata/audio-default-vnc.x86_64-latest.args
index 288cc08655..5dfe8561a4 100644
--- a/tests/qemuxmlconfdata/audio-default-vnc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-default-vnc.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-file-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-file-best.x86_64-latest.args
index 25f1d02971..987a5b9b49 100644
--- a/tests/qemuxmlconfdata/audio-file-best.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-file-best.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-file-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-file-full.x86_64-latest.args
index 4c1f5ecab8..58221ad079 100644
--- a/tests/qemuxmlconfdata/audio-file-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-file-full.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-file-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-file-minimal.x86_64-latest.args
index 6ace7f8b0a..11a1c48f34 100644
--- a/tests/qemuxmlconfdata/audio-file-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-file-minimal.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-jack-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-jack-full.x86_64-latest.args
index 0beed3b7fc..eac8afe141 100644
--- a/tests/qemuxmlconfdata/audio-jack-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-jack-full.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-jack-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-jack-minimal.x86_64-latest.args
index d00cb57391..b528337c5a 100644
--- a/tests/qemuxmlconfdata/audio-jack-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-jack-minimal.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-many-backends.x86_64-latest.args b/tests/qemuxmlconfdata/audio-many-backends.x86_64-latest.args
index 2d0c1301fe..64bb92a039 100644
--- a/tests/qemuxmlconfdata/audio-many-backends.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-many-backends.x86_64-latest.args
@@ -22,7 +22,7 @@ PIPEWIRE_RUNTIME_DIR=/run/user/1000 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-none-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-none-best.x86_64-latest.args
index ec31a2e37e..33a01eb377 100644
--- a/tests/qemuxmlconfdata/audio-none-best.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-none-best.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-none-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-none-full.x86_64-latest.args
index f378102bc3..500ca39b9f 100644
--- a/tests/qemuxmlconfdata/audio-none-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-none-full.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-none-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-none-minimal.x86_64-latest.args
index e527f1a552..819304446d 100644
--- a/tests/qemuxmlconfdata/audio-none-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-none-minimal.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-oss-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-oss-best.x86_64-latest.args
index 40359165d4..8797a36963 100644
--- a/tests/qemuxmlconfdata/audio-oss-best.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-oss-best.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-oss-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-oss-full.x86_64-latest.args
index 928c2ffd6e..884dd9c57a 100644
--- a/tests/qemuxmlconfdata/audio-oss-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-oss-full.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-oss-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-oss-minimal.x86_64-latest.args
index 832dd9fdcd..4847142e34 100644
--- a/tests/qemuxmlconfdata/audio-oss-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-oss-minimal.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-pipewire-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-pipewire-best.x86_64-latest.args
index cff31a2f38..c25f3a00ee 100644
--- a/tests/qemuxmlconfdata/audio-pipewire-best.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-pipewire-best.x86_64-latest.args
@@ -23,7 +23,7 @@ PIPEWIRE_RUNTIME_DIR=/run/user/1000 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-pipewire-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-pipewire-full.x86_64-latest.args
index 7999952c85..854e45a5ba 100644
--- a/tests/qemuxmlconfdata/audio-pipewire-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-pipewire-full.x86_64-latest.args
@@ -23,7 +23,7 @@ PIPEWIRE_RUNTIME_DIR=/run/user/1000 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-pipewire-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-pipewire-minimal.x86_64-latest.args
index 327383b1be..8dac83cada 100644
--- a/tests/qemuxmlconfdata/audio-pipewire-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-pipewire-minimal.x86_64-latest.args
@@ -23,7 +23,7 @@ PIPEWIRE_RUNTIME_DIR=/run/user/1000 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-pulseaudio-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-pulseaudio-best.x86_64-latest.args
index 969e18ba3d..af7172975b 100644
--- a/tests/qemuxmlconfdata/audio-pulseaudio-best.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-pulseaudio-best.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-pulseaudio-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-pulseaudio-full.x86_64-latest.args
index 403a593a7b..cdd1e3d4d1 100644
--- a/tests/qemuxmlconfdata/audio-pulseaudio-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-pulseaudio-full.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-pulseaudio-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-pulseaudio-minimal.x86_64-latest.args
index 8612c04541..1f7b88afef 100644
--- a/tests/qemuxmlconfdata/audio-pulseaudio-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-pulseaudio-minimal.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-sdl-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-sdl-best.x86_64-latest.args
index f41654ada4..4ba3448e6f 100644
--- a/tests/qemuxmlconfdata/audio-sdl-best.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-sdl-best.x86_64-latest.args
@@ -23,7 +23,7 @@ SDL_AUDIODRIVER=pulseaudio \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-sdl-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-sdl-full.x86_64-latest.args
index 35f479e9a9..d2fb81d1e6 100644
--- a/tests/qemuxmlconfdata/audio-sdl-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-sdl-full.x86_64-latest.args
@@ -23,7 +23,7 @@ SDL_AUDIODRIVER=pulseaudio \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-sdl-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-sdl-minimal.x86_64-latest.args
index b088f51b24..980c0c6844 100644
--- a/tests/qemuxmlconfdata/audio-sdl-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-sdl-minimal.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-spice-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-spice-best.x86_64-latest.args
index 889e246ff1..5b2c0e3c47 100644
--- a/tests/qemuxmlconfdata/audio-spice-best.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-spice-best.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-spice-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-spice-full.x86_64-latest.args
index e7da40575c..552a9d4a1b 100644
--- a/tests/qemuxmlconfdata/audio-spice-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-spice-full.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/audio-spice-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-spice-minimal.x86_64-latest.args
index cf9cbae6f6..0384f91dad 100644
--- a/tests/qemuxmlconfdata/audio-spice-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-spice-minimal.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/autoindex.x86_64-latest.args b/tests/qemuxmlconfdata/autoindex.x86_64-latest.args
index 97427c3683..0eccdecfce 100644
--- a/tests/qemuxmlconfdata/autoindex.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/autoindex.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/balloon-device-auto.x86_64-latest.args b/tests/qemuxmlconfdata/balloon-device-auto.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/balloon-device-auto.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/balloon-device-auto.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/balloon-device-deflate-off.x86_64-latest.args b/tests/qemuxmlconfdata/balloon-device-deflate-off.x86_64-latest.args
index b7129922f5..2f519cf074 100644
--- a/tests/qemuxmlconfdata/balloon-device-deflate-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/balloon-device-deflate-off.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/balloon-device-deflate.x86_64-latest.args b/tests/qemuxmlconfdata/balloon-device-deflate.x86_64-latest.args
index 524f48ed18..663c0da73b 100644
--- a/tests/qemuxmlconfdata/balloon-device-deflate.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/balloon-device-deflate.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/balloon-device-period.x86_64-latest.args b/tests/qemuxmlconfdata/balloon-device-period.x86_64-latest.args
index 2c7a068980..63ba9c524c 100644
--- a/tests/qemuxmlconfdata/balloon-device-period.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/balloon-device-period.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/balloon-device.x86_64-latest.args b/tests/qemuxmlconfdata/balloon-device.x86_64-latest.args
index 2c7a068980..63ba9c524c 100644
--- a/tests/qemuxmlconfdata/balloon-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/balloon-device.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/blkdeviotune-group-num.x86_64-latest.args b/tests/qemuxmlconfdata/blkdeviotune-group-num.x86_64-latest.args
index d550d0254e..defc6026ce 100644
--- a/tests/qemuxmlconfdata/blkdeviotune-group-num.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/blkdeviotune-group-num.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/blkdeviotune-max-length.x86_64-latest.args b/tests/qemuxmlconfdata/blkdeviotune-max-length.x86_64-latest.args
index d550d0254e..defc6026ce 100644
--- a/tests/qemuxmlconfdata/blkdeviotune-max-length.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/blkdeviotune-max-length.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/blkdeviotune-max.x86_64-latest.args b/tests/qemuxmlconfdata/blkdeviotune-max.x86_64-latest.args
index d550d0254e..defc6026ce 100644
--- a/tests/qemuxmlconfdata/blkdeviotune-max.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/blkdeviotune-max.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/blkdeviotune.x86_64-latest.args b/tests/qemuxmlconfdata/blkdeviotune.x86_64-latest.args
index d08e842de5..3e9a78b86e 100644
--- a/tests/qemuxmlconfdata/blkdeviotune.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/blkdeviotune.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/blkiotune-device.x86_64-latest.args b/tests/qemuxmlconfdata/blkiotune-device.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/blkiotune-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/blkiotune-device.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/blkiotune.x86_64-latest.args b/tests/qemuxmlconfdata/blkiotune.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/blkiotune.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/blkiotune.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/boot-cdrom.x86_64-latest.args b/tests/qemuxmlconfdata/boot-cdrom.x86_64-latest.args
index e527f1a552..819304446d 100644
--- a/tests/qemuxmlconfdata/boot-cdrom.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-cdrom.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/boot-complex.x86_64-latest.args b/tests/qemuxmlconfdata/boot-complex.x86_64-latest.args
index 560256f817..21fdbeb55d 100644
--- a/tests/qemuxmlconfdata/boot-complex.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-complex.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/boot-floppy-q35.x86_64-latest.args b/tests/qemuxmlconfdata/boot-floppy-q35.x86_64-latest.args
index 139df16e0c..3922e958a2 100644
--- a/tests/qemuxmlconfdata/boot-floppy-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-floppy-q35.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/boot-floppy.x86_64-latest.args b/tests/qemuxmlconfdata/boot-floppy.x86_64-latest.args
index bb2c61d848..ae48dcb129 100644
--- a/tests/qemuxmlconfdata/boot-floppy.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-floppy.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/boot-menu-disable-drive.x86_64-latest.args b/tests/qemuxmlconfdata/boot-menu-disable-drive.x86_64-latest.args
index 1c395e692b..52c4c5b6db 100644
--- a/tests/qemuxmlconfdata/boot-menu-disable-drive.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-menu-disable-drive.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=off,strict=on \
diff --git a/tests/qemuxmlconfdata/boot-menu-disable-with-timeout.x86_64-latest.args b/tests/qemuxmlconfdata/boot-menu-disable-with-timeout.x86_64-latest.args
index 1c395e692b..52c4c5b6db 100644
--- a/tests/qemuxmlconfdata/boot-menu-disable-with-timeout.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-menu-disable-with-timeout.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=off,strict=on \
diff --git a/tests/qemuxmlconfdata/boot-menu-disable.x86_64-latest.args b/tests/qemuxmlconfdata/boot-menu-disable.x86_64-latest.args
index 1c395e692b..52c4c5b6db 100644
--- a/tests/qemuxmlconfdata/boot-menu-disable.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-menu-disable.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=off,strict=on \
diff --git a/tests/qemuxmlconfdata/boot-menu-enable-with-timeout.x86_64-latest.args b/tests/qemuxmlconfdata/boot-menu-enable-with-timeout.x86_64-latest.args
index dbbb870316..3d517d25a3 100644
--- a/tests/qemuxmlconfdata/boot-menu-enable-with-timeout.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-menu-enable-with-timeout.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,splash-time=3000,strict=on \
diff --git a/tests/qemuxmlconfdata/boot-menu-enable.x86_64-latest.args b/tests/qemuxmlconfdata/boot-menu-enable.x86_64-latest.args
index 0bd2b840d5..693c28790c 100644
--- a/tests/qemuxmlconfdata/boot-menu-enable.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-menu-enable.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/boot-multi.x86_64-latest.args b/tests/qemuxmlconfdata/boot-multi.x86_64-latest.args
index 0bd2b840d5..693c28790c 100644
--- a/tests/qemuxmlconfdata/boot-multi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-multi.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/boot-network.x86_64-latest.args b/tests/qemuxmlconfdata/boot-network.x86_64-latest.args
index 437ea6705b..54b7393ddc 100644
--- a/tests/qemuxmlconfdata/boot-network.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-network.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/boot-order.x86_64-latest.args b/tests/qemuxmlconfdata/boot-order.x86_64-latest.args
index 4dd2a967ee..a981c021a7 100644
--- a/tests/qemuxmlconfdata/boot-order.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-order.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/channel-guestfwd.x86_64-latest.args b/tests/qemuxmlconfdata/channel-guestfwd.x86_64-latest.args
index 5ae6012019..5ec8e2fb17 100644
--- a/tests/qemuxmlconfdata/channel-guestfwd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-guestfwd.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/channel-qemu-vdagent-features.x86_64-latest.args b/tests/qemuxmlconfdata/channel-qemu-vdagent-features.x86_64-latest.args
index 0b5d84a6d2..b3456152be 100644
--- a/tests/qemuxmlconfdata/channel-qemu-vdagent-features.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-qemu-vdagent-features.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/channel-qemu-vdagent.x86_64-latest.args b/tests/qemuxmlconfdata/channel-qemu-vdagent.x86_64-latest.args
index 7934e9e496..895bdd3332 100644
--- a/tests/qemuxmlconfdata/channel-qemu-vdagent.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-qemu-vdagent.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/channel-spicevmc.x86_64-latest.args b/tests/qemuxmlconfdata/channel-spicevmc.x86_64-latest.args
index 0057c8ea39..c6e53c5309 100644
--- a/tests/qemuxmlconfdata/channel-spicevmc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-spicevmc.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args b/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args
index 5487c78b6b..1c8c73e23e 100644
--- a/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.args b/tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.args
index 6ec74a8504..69f405bd08 100644
--- a/tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/channel-virtio-auto.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-auto.x86_64-latest.args
index 522c135e1e..bbda596758 100644
--- a/tests/qemuxmlconfdata/channel-virtio-auto.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-virtio-auto.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/channel-virtio-autoadd.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-autoadd.x86_64-latest.args
index 30f65ade74..e0fed74680 100644
--- a/tests/qemuxmlconfdata/channel-virtio-autoadd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-virtio-autoadd.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/channel-virtio-autoassign.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-autoassign.x86_64-latest.args
index 1d01bb5791..594b555bc9 100644
--- a/tests/qemuxmlconfdata/channel-virtio-autoassign.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-virtio-autoassign.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/channel-virtio-default.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-default.x86_64-latest.args
index 4fb74a595d..d60fb3e6f9 100644
--- a/tests/qemuxmlconfdata/channel-virtio-default.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-virtio-default.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/channel-virtio-state.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-state.x86_64-latest.args
index c655cb04a8..f06e8a66b6 100644
--- a/tests/qemuxmlconfdata/channel-virtio-state.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-virtio-state.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args
index aa8255d135..73bdc25925 100644
--- a/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/channel-virtio.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio.x86_64-latest.args
index 8e4aa1c5cc..a4dd1d08cc 100644
--- a/tests/qemuxmlconfdata/channel-virtio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-virtio.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args
index 7e5540ff09..7c2cf25b42 100644
--- a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev '{"id":"charmonitor","backend":{"type":"socket","data":{"addr":{"type":"fd","data":{"str":"@mon-fd@"}},"server":true,"wait":false}}}' \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args b/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args
index 68357c42f1..b2b277fba1 100644
--- a/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args b/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args
index 1ceef01587..0eba2d14e1 100644
--- a/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-machine/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/chardev-reconnect.x86_64-latest.args b/tests/qemuxmlconfdata/chardev-reconnect.x86_64-latest.args
index e71229f173..3daf4a9321 100644
--- a/tests/qemuxmlconfdata/chardev-reconnect.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/chardev-reconnect.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/clock-absolute.x86_64-latest.args b/tests/qemuxmlconfdata/clock-absolute.x86_64-latest.args
index 3b1b19b590..d1c4162093 100644
--- a/tests/qemuxmlconfdata/clock-absolute.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-absolute.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=9999-12-31T23:59:59 \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/clock-catchup.x86_64-latest.args b/tests/qemuxmlconfdata/clock-catchup.x86_64-latest.args
index 519991d238..497fb24add 100644
--- a/tests/qemuxmlconfdata/clock-catchup.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-catchup.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc,driftfix=slew \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/clock-france.x86_64-latest.args b/tests/qemuxmlconfdata/clock-france.x86_64-latest.args
index 3b56c13745..48f3efa434 100644
--- a/tests/qemuxmlconfdata/clock-france.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-france.x86_64-latest.args
@@ -23,7 +23,7 @@ TZ=Europe/Paris \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=localtime \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/clock-hpet-off.x86_64-latest.args b/tests/qemuxmlconfdata/clock-hpet-off.x86_64-latest.args
index 1a277c5212..b2d3accb0c 100644
--- a/tests/qemuxmlconfdata/clock-hpet-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-hpet-off.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/clock-localtime-basis-localtime.x86_64-latest.args b/tests/qemuxmlconfdata/clock-localtime-basis-localtime.x86_64-latest.args
index 30372e7c13..8133de72e7 100644
--- a/tests/qemuxmlconfdata/clock-localtime-basis-localtime.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-localtime-basis-localtime.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=2009-02-14T00:01:30 \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/clock-localtime.x86_64-latest.args b/tests/qemuxmlconfdata/clock-localtime.x86_64-latest.args
index f6dd582eff..a248b605c4 100644
--- a/tests/qemuxmlconfdata/clock-localtime.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-localtime.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=localtime \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/clock-realtime.x86_64-latest.args b/tests/qemuxmlconfdata/clock-realtime.x86_64-latest.args
index 002c1b5b9e..f0b553d11f 100644
--- a/tests/qemuxmlconfdata/clock-realtime.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-realtime.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc,clock=rt \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/clock-timer-hyperv-rtc.x86_64-latest.args b/tests/qemuxmlconfdata/clock-timer-hyperv-rtc.x86_64-latest.args
index ac6a75cb5c..b0cda998aa 100644
--- a/tests/qemuxmlconfdata/clock-timer-hyperv-rtc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-timer-hyperv-rtc.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/clock-utc.x86_64-latest.args b/tests/qemuxmlconfdata/clock-utc.x86_64-latest.args
index d59f1717d9..542bf9c509 100644
--- a/tests/qemuxmlconfdata/clock-utc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-utc.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/clock-variable.x86_64-latest.args b/tests/qemuxmlconfdata/clock-variable.x86_64-latest.args
index 473a778b55..b12205872e 100644
--- a/tests/qemuxmlconfdata/clock-variable.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-variable.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=2009-02-15T09:49:06 \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/console-compat-auto.x86_64-latest.args b/tests/qemuxmlconfdata/console-compat-auto.x86_64-latest.args
index b49d6ed233..0db93d6d95 100644
--- a/tests/qemuxmlconfdata/console-compat-auto.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/console-compat-auto.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/console-compat-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/console-compat-chardev.x86_64-latest.args
index b49d6ed233..0db93d6d95 100644
--- a/tests/qemuxmlconfdata/console-compat-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/console-compat-chardev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/console-compat-crash.x86_64-latest.args b/tests/qemuxmlconfdata/console-compat-crash.x86_64-latest.args
index 01fbbc8729..cc9eac7e7a 100644
--- a/tests/qemuxmlconfdata/console-compat-crash.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/console-compat-crash.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-D/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/console-compat.x86_64-latest.args b/tests/qemuxmlconfdata/console-compat.x86_64-latest.args
index 5aa8e55ab8..212b14c98a 100644
--- a/tests/qemuxmlconfdata/console-compat.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/console-compat.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/console-compat2.x86_64-latest.args b/tests/qemuxmlconfdata/console-compat2.x86_64-latest.args
index 20361c86ed..72f3b00eb0 100644
--- a/tests/qemuxmlconfdata/console-compat2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/console-compat2.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/console-virtio-many.x86_64-latest.args b/tests/qemuxmlconfdata/console-virtio-many.x86_64-latest.args
index 48842c863b..064891b346 100644
--- a/tests/qemuxmlconfdata/console-virtio-many.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/console-virtio-many.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/console-virtio-serial-autoassign-address.x86_64-latest.args b/tests/qemuxmlconfdata/console-virtio-serial-autoassign-address.x86_64-latest.args
index 0c88619892..56994c4ad9 100644
--- a/tests/qemuxmlconfdata/console-virtio-serial-autoassign-address.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/console-virtio-serial-autoassign-address.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args b/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args
index 69d93383f8..d0b530fe1c 100644
--- a/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/console-virtio.x86_64-latest.args b/tests/qemuxmlconfdata/console-virtio.x86_64-latest.args
index 0d77888a65..c898e84fca 100644
--- a/tests/qemuxmlconfdata/console-virtio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/console-virtio.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/controller-order.x86_64-latest.args b/tests/qemuxmlconfdata/controller-order.x86_64-latest.args
index 87cae5c6bf..1fe30c93e5 100644
--- a/tests/qemuxmlconfdata/controller-order.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/controller-order.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=off,strict=on \
diff --git a/tests/qemuxmlconfdata/controller-scsi-auto.x86_64-latest.args b/tests/qemuxmlconfdata/controller-scsi-auto.x86_64-latest.args
index 210189306f..ff4276e5d0 100644
--- a/tests/qemuxmlconfdata/controller-scsi-auto.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/controller-scsi-auto.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/controller-scsi-inherit-model.x86_64-latest.args b/tests/qemuxmlconfdata/controller-scsi-inherit-model.x86_64-latest.args
index 2bcd9ed92f..78eda55940 100644
--- a/tests/qemuxmlconfdata/controller-scsi-inherit-model.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/controller-scsi-inherit-model.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args
index 3ad0b16b7b..dccd1fccdb 100644
--- a/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-rhel7/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -global PIIX4_PM.disable_s3=1 \
diff --git a/tests/qemuxmlconfdata/controller-virtio-scsi.x86_64-latest.args b/tests/qemuxmlconfdata/controller-virtio-scsi.x86_64-latest.args
index 93b14f58aa..26fa8d8185 100644
--- a/tests/qemuxmlconfdata/controller-virtio-scsi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/controller-virtio-scsi.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-Haswell-noTSX.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-Haswell-noTSX.x86_64-latest.args
index 26f22eb8e9..12dcb3298e 100644
--- a/tests/qemuxmlconfdata/cpu-Haswell-noTSX.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-Haswell-noTSX.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.args
index 48e1f4a085..1e56232044 100644
--- a/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.args
index 788e038354..f11f9c84ac 100644
--- a/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.args
index b221c5a612..3faa3f1b17 100644
--- a/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-Icelake-Server-pconfig.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
index c1b4e7561e..9c9506fba1 100644
--- a/tests/qemuxmlconfdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-cache-disable.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-cache-disable.x86_64-latest.args
index 958bf65bfc..da36f825b0 100644
--- a/tests/qemuxmlconfdata/cpu-cache-disable.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-cache-disable.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-cache-disable3.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-cache-disable3.x86_64-latest.args
index 1d2da8ae95..bc81ce2091 100644
--- a/tests/qemuxmlconfdata/cpu-cache-disable3.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-cache-disable3.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-cache-emulate-l3.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-cache-emulate-l3.x86_64-latest.args
index bcd8fdc5b7..609d04f12b 100644
--- a/tests/qemuxmlconfdata/cpu-cache-emulate-l3.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-cache-emulate-l3.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-cache-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-cache-passthrough.x86_64-latest.args
index b09a5aa8b6..6e14b33236 100644
--- a/tests/qemuxmlconfdata/cpu-cache-passthrough.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-cache-passthrough.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-check-default-none.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-check-default-none.x86_64-latest.args
index a0b72ec7c2..53b1e3d3d9 100644
--- a/tests/qemuxmlconfdata/cpu-check-default-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-check-default-none.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-check-default-none2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-check-default-none2.x86_64-latest.args
index e08ed48c1e..25c2eedf01 100644
--- a/tests/qemuxmlconfdata/cpu-check-default-none2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-check-default-none2.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-check-default-partial.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-check-default-partial.x86_64-latest.args
index 08048c9f29..f82e28417b 100644
--- a/tests/qemuxmlconfdata/cpu-check-default-partial.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-check-default-partial.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-check-default-partial2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-check-default-partial2.x86_64-latest.args
index c65d9fe085..52c76bacd2 100644
--- a/tests/qemuxmlconfdata/cpu-check-default-partial2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-check-default-partial2.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-check-none.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-check-none.x86_64-latest.args
index c65d9fe085..52c76bacd2 100644
--- a/tests/qemuxmlconfdata/cpu-check-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-check-none.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-empty.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-empty.x86_64-latest.args
index ad33e4bec9..eaac3c012d 100644
--- a/tests/qemuxmlconfdata/cpu-empty.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-empty.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-cpu-empty/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-eoi-disabled.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-eoi-disabled.x86_64-latest.args
index e56f11d838..e963cc689d 100644
--- a/tests/qemuxmlconfdata/cpu-eoi-disabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-eoi-disabled.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-eoi-enabled.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-eoi-enabled.x86_64-latest.args
index fca96ce4e4..5f619d2d3a 100644
--- a/tests/qemuxmlconfdata/cpu-eoi-enabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-eoi-enabled.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-exact1.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-exact1.x86_64-latest.args
index 5de6937548..c21930cd78 100644
--- a/tests/qemuxmlconfdata/cpu-exact1.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-exact1.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-exact2-nofallback.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-exact2-nofallback.x86_64-latest.args
index 51bf31b41a..ba16de556f 100644
--- a/tests/qemuxmlconfdata/cpu-exact2-nofallback.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-exact2-nofallback.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-exact2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-exact2.x86_64-latest.args
index 51bf31b41a..ba16de556f 100644
--- a/tests/qemuxmlconfdata/cpu-exact2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-exact2.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-host-kvmclock.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-kvmclock.x86_64-latest.args
index 51ccf7a7e2..8878dd0fa6 100644
--- a/tests/qemuxmlconfdata/cpu-host-kvmclock.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-kvmclock.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-cmt.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-cmt.x86_64-latest.args
index 1aaa804464..eed3bc8e28 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-cmt.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-cmt.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args
index df0decb6f1..ded40b5824 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args
index 355bfc698f..24e74d2696 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args
index cd61b6aa6c..a08b718823 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args
index 95eb6ed5d4..d89b93ad5d 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args
index df0decb6f1..ded40b5824 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args
index 355bfc698f..24e74d2696 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args
index 27234506b3..8f22653f84 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-vendor.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-model-vendor.x86_64-latest.args
index c556f6c1a9..b113c104b0 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-vendor.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-vendor.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-host-passthrough-features.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-passthrough-features.x86_64-latest.args
index 356de55fc8..f207c8138e 100644
--- a/tests/qemuxmlconfdata/cpu-host-passthrough-features.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-passthrough-features.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-host-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-passthrough.x86_64-latest.args
index a0b72ec7c2..53b1e3d3d9 100644
--- a/tests/qemuxmlconfdata/cpu-host-passthrough.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-passthrough.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-hotplug-startup.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-hotplug-startup.x86_64-latest.args
index 715639ce12..0ad396ea72 100644
--- a/tests/qemuxmlconfdata/cpu-hotplug-startup.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-hotplug-startup.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-kvmclock.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-kvmclock.x86_64-latest.args
index 20deb4dff4..bcf5d5fa77 100644
--- a/tests/qemuxmlconfdata/cpu-kvmclock.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-kvmclock.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-minimum1.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-minimum1.x86_64-latest.args
index 08048c9f29..f82e28417b 100644
--- a/tests/qemuxmlconfdata/cpu-minimum1.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-minimum1.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-minimum2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-minimum2.x86_64-latest.args
index eff6930c84..dfd728b9a9 100644
--- a/tests/qemuxmlconfdata/cpu-minimum2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-minimum2.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-no-removed-features.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-no-removed-features.x86_64-latest.args
index c65d9fe085..52c76bacd2 100644
--- a/tests/qemuxmlconfdata/cpu-no-removed-features.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-no-removed-features.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-numa-disjoint.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-numa-disjoint.x86_64-latest.args
index 448c1113a6..d85be5280a 100644
--- a/tests/qemuxmlconfdata/cpu-numa-disjoint.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-numa-disjoint.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-numa-disordered.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-numa-disordered.x86_64-latest.args
index 7bbb3422d7..9e6204c1f6 100644
--- a/tests/qemuxmlconfdata/cpu-numa-disordered.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-numa-disordered.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-numa-memshared.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-numa-memshared.x86_64-latest.args
index 97831d818e..86196f3bb8 100644
--- a/tests/qemuxmlconfdata/cpu-numa-memshared.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-numa-memshared.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-numa-no-memory-element.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-numa-no-memory-element.x86_64-latest.args
index 647531140c..5e7ec55ac6 100644
--- a/tests/qemuxmlconfdata/cpu-numa-no-memory-element.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-numa-no-memory-element.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-numa1.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-numa1.x86_64-latest.args
index 647531140c..5e7ec55ac6 100644
--- a/tests/qemuxmlconfdata/cpu-numa1.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-numa1.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-numa2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-numa2.x86_64-latest.args
index 647531140c..5e7ec55ac6 100644
--- a/tests/qemuxmlconfdata/cpu-numa2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-numa2.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-phys-bits-emulate-bare.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-phys-bits-emulate-bare.x86_64-latest.args
index a73bb20e47..e12c481670 100644
--- a/tests/qemuxmlconfdata/cpu-phys-bits-emulate-bare.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-phys-bits-emulate-bare.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-phys-bits-emulate.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-phys-bits-emulate.x86_64-latest.args
index 99251d2905..83410861a2 100644
--- a/tests/qemuxmlconfdata/cpu-phys-bits-emulate.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-phys-bits-emulate.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-phys-bits-emulate2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-phys-bits-emulate2.x86_64-latest.args
index 6f995a484a..de29a8a319 100644
--- a/tests/qemuxmlconfdata/cpu-phys-bits-emulate2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-phys-bits-emulate2.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-phys-bits-limit.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-phys-bits-limit.x86_64-latest.args
index 9a0187d6b6..b5dcfcb0d4 100644
--- a/tests/qemuxmlconfdata/cpu-phys-bits-limit.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-phys-bits-limit.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-phys-bits-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-phys-bits-passthrough.x86_64-latest.args
index 189b7af3d5..4b376810d8 100644
--- a/tests/qemuxmlconfdata/cpu-phys-bits-passthrough.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-phys-bits-passthrough.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.args
index 18f38c172d..a282ce8a05 100644
--- a/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-topology1.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-topology1.x86_64-latest.args
index 715639ce12..0ad396ea72 100644
--- a/tests/qemuxmlconfdata/cpu-topology1.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-topology1.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-topology2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-topology2.x86_64-latest.args
index 71b04e4d30..71f0edfc90 100644
--- a/tests/qemuxmlconfdata/cpu-topology2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-topology2.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-topology3.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-topology3.x86_64-latest.args
index a5ec1cce16..01d900ee98 100644
--- a/tests/qemuxmlconfdata/cpu-topology3.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-topology3.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-topology4.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-topology4.x86_64-latest.args
index 360da3bcf0..b1e8e3611d 100644
--- a/tests/qemuxmlconfdata/cpu-topology4.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-topology4.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args
index fab0aaabba..6373cb1679 100644
--- a/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.args
index eb4c3e0cbf..4223efd226 100644
--- a/tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cputune-cpuset-big-id.x86_64-latest.args b/tests/qemuxmlconfdata/cputune-cpuset-big-id.x86_64-latest.args
index 3916fa2e62..979e9b5e1c 100644
--- a/tests/qemuxmlconfdata/cputune-cpuset-big-id.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cputune-cpuset-big-id.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cputune-numatune.x86_64-latest.args b/tests/qemuxmlconfdata/cputune-numatune.x86_64-latest.args
index 5bf2b435b3..bcc7d31cc7 100644
--- a/tests/qemuxmlconfdata/cputune-numatune.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cputune-numatune.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-dummy2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cputune-zero-shares.x86_64-latest.args b/tests/qemuxmlconfdata/cputune-zero-shares.x86_64-latest.args
index 3916fa2e62..979e9b5e1c 100644
--- a/tests/qemuxmlconfdata/cputune-zero-shares.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cputune-zero-shares.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/cputune.x86_64-latest.args b/tests/qemuxmlconfdata/cputune.x86_64-latest.args
index ebd62e6bc6..c470973e82 100644
--- a/tests/qemuxmlconfdata/cputune.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cputune.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/crypto-builtin.x86_64-latest.args b/tests/qemuxmlconfdata/crypto-builtin.x86_64-latest.args
index 8e127b800a..2506e6ebe4 100644
--- a/tests/qemuxmlconfdata/crypto-builtin.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/crypto-builtin.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/default-kvm-host-arch.x86_64-latest.args b/tests/qemuxmlconfdata/default-kvm-host-arch.x86_64-latest.args
index 5b5d44004c..0daee466f0 100644
--- a/tests/qemuxmlconfdata/default-kvm-host-arch.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/default-kvm-host-arch.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-kvm/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/default-qemu-host-arch.x86_64-latest.args b/tests/qemuxmlconfdata/default-qemu-host-arch.x86_64-latest.args
index 6ac2549a5a..e85b649556 100644
--- a/tests/qemuxmlconfdata/default-qemu-host-arch.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/default-qemu-host-arch.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-qemu-host/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/default-video-type-x86_64.x86_64-latest.args b/tests/qemuxmlconfdata/default-video-type-x86_64.x86_64-latest.args
index a17838b713..f072d2b336 100644
--- a/tests/qemuxmlconfdata/default-video-type-x86_64.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/default-video-type-x86_64.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-default-video-type-x/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args b/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args
index 493b6a55c3..dfe80816d1 100644
--- a/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-active-commit.x86_64-latest.args b/tests/qemuxmlconfdata/disk-active-commit.x86_64-latest.args
index f06a3cbbbb..8abec48499 100644
--- a/tests/qemuxmlconfdata/disk-active-commit.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-active-commit.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-aio-io_uring.x86_64-latest.args b/tests/qemuxmlconfdata/disk-aio-io_uring.x86_64-latest.args
index dae20730db..375a15eef6 100644
--- a/tests/qemuxmlconfdata/disk-aio-io_uring.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-aio-io_uring.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-aio.x86_64-latest.args b/tests/qemuxmlconfdata/disk-aio.x86_64-latest.args
index 901ebfa699..29bd983155 100644
--- a/tests/qemuxmlconfdata/disk-aio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-aio.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.args b/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.args
index 68d38f9925..598627121f 100644
--- a/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-blockio-no-discard.x86_64-latest.args b/tests/qemuxmlconfdata/disk-blockio-no-discard.x86_64-latest.args
index 925962a636..51db8424cf 100644
--- a/tests/qemuxmlconfdata/disk-blockio-no-discard.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-blockio-no-discard.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-blockio.x86_64-latest.args b/tests/qemuxmlconfdata/disk-blockio.x86_64-latest.args
index b0f7a2beb4..46d915d767 100644
--- a/tests/qemuxmlconfdata/disk-blockio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-blockio.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-boot-cdrom.x86_64-latest.args b/tests/qemuxmlconfdata/disk-boot-cdrom.x86_64-latest.args
index 0dc92cdd11..e0f75ab340 100644
--- a/tests/qemuxmlconfdata/disk-boot-cdrom.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-boot-cdrom.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-boot-disk.x86_64-latest.args b/tests/qemuxmlconfdata/disk-boot-disk.x86_64-latest.args
index 07c9a74c0a..8bc6b06084 100644
--- a/tests/qemuxmlconfdata/disk-boot-disk.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-boot-disk.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-cache.x86_64-latest.args b/tests/qemuxmlconfdata/disk-cache.x86_64-latest.args
index ac7675a7c8..e48b9c41bc 100644
--- a/tests/qemuxmlconfdata/disk-cache.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-cache.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-cdrom-empty-network-invalid.x86_64-latest.args b/tests/qemuxmlconfdata/disk-cdrom-empty-network-invalid.x86_64-latest.args
index 2cc58c28de..9b32162714 100644
--- a/tests/qemuxmlconfdata/disk-cdrom-empty-network-invalid.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-cdrom-empty-network-invalid.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-cdrom-network-nbdkit.x86_64-latest.args b/tests/qemuxmlconfdata/disk-cdrom-network-nbdkit.x86_64-latest.args
index 2ad5c3d4a4..bf1083a08b 100644
--- a/tests/qemuxmlconfdata/disk-cdrom-network-nbdkit.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-cdrom-network-nbdkit.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-cdrom-network.x86_64-latest.args b/tests/qemuxmlconfdata/disk-cdrom-network.x86_64-latest.args
index abb6b4f0ad..d33c6031b1 100644
--- a/tests/qemuxmlconfdata/disk-cdrom-network.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-cdrom-network.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-cdrom-tray.x86_64-latest.args b/tests/qemuxmlconfdata/disk-cdrom-tray.x86_64-latest.args
index 96f260e293..352a18b862 100644
--- a/tests/qemuxmlconfdata/disk-cdrom-tray.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-cdrom-tray.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/disk-cdrom-usb-empty.x86_64-latest.abi-update.args b/tests/qemuxmlconfdata/disk-cdrom-usb-empty.x86_64-latest.abi-update.args
index 47625ca629..7367880a49 100644
--- a/tests/qemuxmlconfdata/disk-cdrom-usb-empty.x86_64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/disk-cdrom-usb-empty.x86_64-latest.abi-update.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-cdrom.x86_64-latest.args b/tests/qemuxmlconfdata/disk-cdrom.x86_64-latest.args
index f61e3d29b5..c1f1887dde 100644
--- a/tests/qemuxmlconfdata/disk-cdrom.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-cdrom.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-copy_on_read.x86_64-latest.args b/tests/qemuxmlconfdata/disk-copy_on_read.x86_64-latest.args
index c9d9ca0ea7..63c184aff6 100644
--- a/tests/qemuxmlconfdata/disk-copy_on_read.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-copy_on_read.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/disk-detect-zeroes.x86_64-latest.args b/tests/qemuxmlconfdata/disk-detect-zeroes.x86_64-latest.args
index 355875bc38..5638ee0417 100644
--- a/tests/qemuxmlconfdata/disk-detect-zeroes.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-detect-zeroes.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/disk-discard.x86_64-latest.args b/tests/qemuxmlconfdata/disk-discard.x86_64-latest.args
index 5f68a1be81..4c7ac32225 100644
--- a/tests/qemuxmlconfdata/disk-discard.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-discard.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/disk-discard_no_unref.x86_64-latest.args b/tests/qemuxmlconfdata/disk-discard_no_unref.x86_64-latest.args
index 32d7f8f54b..3b8000cc52 100644
--- a/tests/qemuxmlconfdata/disk-discard_no_unref.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-discard_no_unref.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/disk-error-policy.x86_64-latest.args b/tests/qemuxmlconfdata/disk-error-policy.x86_64-latest.args
index 764978323c..28fe713e27 100644
--- a/tests/qemuxmlconfdata/disk-error-policy.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-error-policy.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-floppy-q35.x86_64-latest.args b/tests/qemuxmlconfdata/disk-floppy-q35.x86_64-latest.args
index b83d649192..968590b4d3 100644
--- a/tests/qemuxmlconfdata/disk-floppy-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-floppy-q35.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-floppy-tray.x86_64-latest.args b/tests/qemuxmlconfdata/disk-floppy-tray.x86_64-latest.args
index 0c7fd9d28b..2641d581fc 100644
--- a/tests/qemuxmlconfdata/disk-floppy-tray.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-floppy-tray.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-floppy.x86_64-latest.args b/tests/qemuxmlconfdata/disk-floppy.x86_64-latest.args
index a41769966c..309b6af040 100644
--- a/tests/qemuxmlconfdata/disk-floppy.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-floppy.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-fmt-qcow.x86_64-latest.args b/tests/qemuxmlconfdata/disk-fmt-qcow.x86_64-latest.args
index 69dff80b6c..fc4e69761f 100644
--- a/tests/qemuxmlconfdata/disk-fmt-qcow.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-fmt-qcow.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-geometry.x86_64-latest.args b/tests/qemuxmlconfdata/disk-geometry.x86_64-latest.args
index 883a62da63..3492232a0b 100644
--- a/tests/qemuxmlconfdata/disk-geometry.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-geometry.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-ide-split.x86_64-latest.args b/tests/qemuxmlconfdata/disk-ide-split.x86_64-latest.args
index 220ca34fca..40c3cbd0aa 100644
--- a/tests/qemuxmlconfdata/disk-ide-split.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-ide-split.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-ide-wwn.x86_64-latest.args b/tests/qemuxmlconfdata/disk-ide-wwn.x86_64-latest.args
index 4395901816..fec681589a 100644
--- a/tests/qemuxmlconfdata/disk-ide-wwn.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-ide-wwn.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-ioeventfd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-ioeventfd.x86_64-latest.args
index e63bad3599..ad0b5b94cb 100644
--- a/tests/qemuxmlconfdata/disk-ioeventfd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-ioeventfd.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/disk-metadata-cache.x86_64-latest.args b/tests/qemuxmlconfdata/disk-metadata-cache.x86_64-latest.args
index d05f644f36..1e91062ea8 100644
--- a/tests/qemuxmlconfdata/disk-metadata-cache.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-metadata-cache.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-mirror-old.x86_64-latest.args b/tests/qemuxmlconfdata/disk-mirror-old.x86_64-latest.args
index 01a96a3791..506fe7ba79 100644
--- a/tests/qemuxmlconfdata/disk-mirror-old.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-mirror-old.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-mirror.x86_64-latest.args b/tests/qemuxmlconfdata/disk-mirror.x86_64-latest.args
index e21c97dd67..39f2ebce64 100644
--- a/tests/qemuxmlconfdata/disk-mirror.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-mirror.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-http-nbdkit.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-http-nbdkit.x86_64-latest.args
index aa026ac94a..c13ee3e749 100644
--- a/tests/qemuxmlconfdata/disk-network-http-nbdkit.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-http-nbdkit.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-http.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-http.x86_64-latest.args
index d139425d49..dc52d94a25 100644
--- a/tests/qemuxmlconfdata/disk-network-http.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-http.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-iscsi.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-iscsi.x86_64-latest.args
index 5af5658c2b..197c4a4d23 100644
--- a/tests/qemuxmlconfdata/disk-network-iscsi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-iscsi.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-nbd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-nbd.x86_64-latest.args
index 54d5d40f94..9c30f1eded 100644
--- a/tests/qemuxmlconfdata/disk-network-nbd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-nbd.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args
index 50bc8c20a1..8ecd2856f4 100644
--- a/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.args
index 264fd5121d..83e8f68f0f 100644
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.args
index 4e1c4155f3..5a345c1a97 100644
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args
index 778a049b56..087a19bd33 100644
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-rbd-no-colon.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd-no-colon.x86_64-latest.args
index 19703afac5..cdaccb70f5 100644
--- a/tests/qemuxmlconfdata/disk-network-rbd-no-colon.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-rbd-no-colon.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-rbd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd.x86_64-latest.args
index 21a771b040..3ee394c533 100644
--- a/tests/qemuxmlconfdata/disk-network-rbd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-rbd.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-source-auth.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-source-auth.x86_64-latest.args
index e1f4f97624..9a6868dcba 100644
--- a/tests/qemuxmlconfdata/disk-network-source-auth.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-source-auth.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit-backing.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit-backing.x86_64-latest.args
index 1383cf2716..bcace41be8 100644
--- a/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit-backing.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit-backing.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit.x86_64-latest.args
index 8cf9d627c7..1a08d88610 100644
--- a/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-source-curl.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-source-curl.x86_64-latest.args
index 9e935d327c..10b53e1fff 100644
--- a/tests/qemuxmlconfdata/disk-network-source-curl.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-source-curl.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-ssh-key.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-ssh-key.x86_64-latest.args
index 11c1df578d..1a628fb62f 100644
--- a/tests/qemuxmlconfdata/disk-network-ssh-key.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-ssh-key.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-ssh-nbdkit.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-ssh-nbdkit.x86_64-latest.args
index 71aa2f4275..65f7c67fe1 100644
--- a/tests/qemuxmlconfdata/disk-network-ssh-nbdkit.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-ssh-nbdkit.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-ssh-password.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-ssh-password.x86_64-latest.args
index 71aa2f4275..65f7c67fe1 100644
--- a/tests/qemuxmlconfdata/disk-network-ssh-password.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-ssh-password.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-ssh.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-ssh.x86_64-latest.args
index 3df53d3305..80441a1cab 100644
--- a/tests/qemuxmlconfdata/disk-network-ssh.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-ssh.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args
index ed3fb618f6..34e8222701 100644
--- a/tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-network-tlsx509-nbd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd.x86_64-latest.args
index 18e65ca27a..1c8d185336 100644
--- a/tests/qemuxmlconfdata/disk-network-tlsx509-nbd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-no-boot.x86_64-latest.args b/tests/qemuxmlconfdata/disk-no-boot.x86_64-latest.args
index a151fdfd6d..d8e543536c 100644
--- a/tests/qemuxmlconfdata/disk-no-boot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-no-boot.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-nvme.x86_64-latest.args b/tests/qemuxmlconfdata/disk-nvme.x86_64-latest.args
index 6a8c22797d..1d002131df 100644
--- a/tests/qemuxmlconfdata/disk-nvme.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-nvme.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-order.x86_64-latest.args b/tests/qemuxmlconfdata/disk-order.x86_64-latest.args
index 01a96a3791..506fe7ba79 100644
--- a/tests/qemuxmlconfdata/disk-order.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-order.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-qcow2-datafile-store.x86_64-latest.args b/tests/qemuxmlconfdata/disk-qcow2-datafile-store.x86_64-latest.args
index 5227dcf635..3adae7dccd 100644
--- a/tests/qemuxmlconfdata/disk-qcow2-datafile-store.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-qcow2-datafile-store.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-readonly-disk.x86_64-latest.args b/tests/qemuxmlconfdata/disk-readonly-disk.x86_64-latest.args
index 7745709790..5923b74851 100644
--- a/tests/qemuxmlconfdata/disk-readonly-disk.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-readonly-disk.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-rotation.x86_64-latest.args b/tests/qemuxmlconfdata/disk-rotation.x86_64-latest.args
index 5d80fdb158..b1150ca9eb 100644
--- a/tests/qemuxmlconfdata/disk-rotation.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-rotation.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-sata-device.x86_64-latest.args b/tests/qemuxmlconfdata/disk-sata-device.x86_64-latest.args
index 5417bb7854..16bdda1e42 100644
--- a/tests/qemuxmlconfdata/disk-sata-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-sata-device.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-sata-product.x86_64-latest.args b/tests/qemuxmlconfdata/disk-sata-product.x86_64-latest.args
index 408a91c867..432ca0f996 100644
--- a/tests/qemuxmlconfdata/disk-sata-product.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-sata-product.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-scsi-device-auto.x86_64-latest.args b/tests/qemuxmlconfdata/disk-scsi-device-auto.x86_64-latest.args
index 865e8b0222..d61b0449b2 100644
--- a/tests/qemuxmlconfdata/disk-scsi-device-auto.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-scsi-device-auto.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-scsi-disk-split.x86_64-latest.args b/tests/qemuxmlconfdata/disk-scsi-disk-split.x86_64-latest.args
index 79830d65bd..ac610de25a 100644
--- a/tests/qemuxmlconfdata/disk-scsi-disk-split.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-scsi-disk-split.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.args
index 11a436b083..bf45db67fd 100644
--- a/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-scsi-disk-wwn.x86_64-latest.args b/tests/qemuxmlconfdata/disk-scsi-disk-wwn.x86_64-latest.args
index 37de215637..b081410081 100644
--- a/tests/qemuxmlconfdata/disk-scsi-disk-wwn.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-scsi-disk-wwn.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-scsi-lun-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/disk-scsi-lun-passthrough.x86_64-latest.args
index 271526eb81..f2e8c0c21f 100644
--- a/tests/qemuxmlconfdata/disk-scsi-lun-passthrough.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-scsi-lun-passthrough.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-scsi.x86_64-latest.args b/tests/qemuxmlconfdata/disk-scsi.x86_64-latest.args
index 03d369fc0d..5f1142f7c0 100644
--- a/tests/qemuxmlconfdata/disk-scsi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-scsi.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-serial.x86_64-latest.args b/tests/qemuxmlconfdata/disk-serial.x86_64-latest.args
index e0f9595595..676bf0b77e 100644
--- a/tests/qemuxmlconfdata/disk-serial.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-serial.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-shared.x86_64-latest.args b/tests/qemuxmlconfdata/disk-shared.x86_64-latest.args
index 3057ef5790..434620723a 100644
--- a/tests/qemuxmlconfdata/disk-shared.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-shared.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-slices.x86_64-latest.args b/tests/qemuxmlconfdata/disk-slices.x86_64-latest.args
index 2ad705f034..ac754dcfe1 100644
--- a/tests/qemuxmlconfdata/disk-slices.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-slices.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-snapshot.x86_64-latest.args b/tests/qemuxmlconfdata/disk-snapshot.x86_64-latest.args
index 794a6add26..7f8e090ba5 100644
--- a/tests/qemuxmlconfdata/disk-snapshot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-snapshot.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args
index 4a3dfdc0bf..6fda4ecf50 100644
--- a/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-source-pool-mode.x86_64-latest.args b/tests/qemuxmlconfdata/disk-source-pool-mode.x86_64-latest.args
index 041cd4c9fc..e45a8fda21 100644
--- a/tests/qemuxmlconfdata/disk-source-pool-mode.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-source-pool-mode.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-source-pool.x86_64-latest.args b/tests/qemuxmlconfdata/disk-source-pool.x86_64-latest.args
index 209d0a738a..5a839d23bc 100644
--- a/tests/qemuxmlconfdata/disk-source-pool.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-source-pool.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.x86_64-latest.args b/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.x86_64-latest.args
index 78e7c9df68..e2c685ff77 100644
--- a/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.args b/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.args
index b95cf55623..a78bf99e28 100644
--- a/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args b/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args
index 66603bed0c..1ef513d672 100644
--- a/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-bar/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-transient.x86_64-latest.args b/tests/qemuxmlconfdata/disk-transient.x86_64-latest.args
index 61d733925e..e726decfed 100644
--- a/tests/qemuxmlconfdata/disk-transient.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-transient.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-usb-device-model.x86_64-latest.args b/tests/qemuxmlconfdata/disk-usb-device-model.x86_64-latest.args
index 18c401e1be..5d5c43b595 100644
--- a/tests/qemuxmlconfdata/disk-usb-device-model.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-usb-device-model.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.QEMU_CAPS_DEVICE_USB_BOT-disabled.args b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.QEMU_CAPS_DEVICE_USB_BOT-disabled.args
index e9871e9483..3ba24bb864 100644
--- a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.QEMU_CAPS_DEVICE_USB_BOT-disabled.args
+++ b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.QEMU_CAPS_DEVICE_USB_BOT-disabled.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update.QEMU_CAPS_DEVICE_USB_BOT-disabled.args b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update.QEMU_CAPS_DEVICE_USB_BOT-disabled.args
index e9871e9483..3ba24bb864 100644
--- a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update.QEMU_CAPS_DEVICE_USB_BOT-disabled.args
+++ b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update.QEMU_CAPS_DEVICE_USB_BOT-disabled.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update.args b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update.args
index df81ca60ed..d1b7adb821 100644
--- a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.args b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.args
index e9871e9483..3ba24bb864 100644
--- a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args b/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args
index 56bfe4a7c2..28af0348dd 100644
--- a/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-vhostuser.x86_64-latest.args b/tests/qemuxmlconfdata/disk-vhostuser.x86_64-latest.args
index 9380146ee3..de72caf931 100644
--- a/tests/qemuxmlconfdata/disk-vhostuser.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-vhostuser.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args b/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args
index 692df969ba..6d8828d1eb 100644
--- a/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-virtio-queues.x86_64-latest.args b/tests/qemuxmlconfdata/disk-virtio-queues.x86_64-latest.args
index f34e1ea6ca..d9cbe4f16a 100644
--- a/tests/qemuxmlconfdata/disk-virtio-queues.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-virtio-queues.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-latest.args b/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-latest.args
index 516aadbfc6..8ce86e2fba 100644
--- a/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/disk-virtio.x86_64-latest.args b/tests/qemuxmlconfdata/disk-virtio.x86_64-latest.args
index d1148f774b..85b6e59ea6 100644
--- a/tests/qemuxmlconfdata/disk-virtio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-virtio.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/downscript.x86_64-latest.args b/tests/qemuxmlconfdata/downscript.x86_64-latest.args
index d3b1b8ec23..6ee1d402b5 100644
--- a/tests/qemuxmlconfdata/downscript.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/downscript.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/encrypted-disk-usage.x86_64-latest.args b/tests/qemuxmlconfdata/encrypted-disk-usage.x86_64-latest.args
index 13b837a3af..3d677fb5cb 100644
--- a/tests/qemuxmlconfdata/encrypted-disk-usage.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/encrypted-disk-usage.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/encrypted-disk.x86_64-latest.args b/tests/qemuxmlconfdata/encrypted-disk.x86_64-latest.args
index 6990c63023..95cb7c6d05 100644
--- a/tests/qemuxmlconfdata/encrypted-disk.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/encrypted-disk.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/eoi-disabled.x86_64-latest.args b/tests/qemuxmlconfdata/eoi-disabled.x86_64-latest.args
index ec72cc8a2a..8a1b6a2c4c 100644
--- a/tests/qemuxmlconfdata/eoi-disabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/eoi-disabled.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/eoi-enabled.x86_64-latest.args b/tests/qemuxmlconfdata/eoi-enabled.x86_64-latest.args
index 170e6f1fd5..100a335e39 100644
--- a/tests/qemuxmlconfdata/eoi-enabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/eoi-enabled.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/event_idx.x86_64-latest.args b/tests/qemuxmlconfdata/event_idx.x86_64-latest.args
index 6aa7c4cf14..a5588fdb62 100644
--- a/tests/qemuxmlconfdata/event_idx.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/event_idx.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/fd-memory-no-numa-topology.x86_64-latest.args b/tests/qemuxmlconfdata/fd-memory-no-numa-topology.x86_64-latest.args
index df66c5bf16..4e18f21260 100644
--- a/tests/qemuxmlconfdata/fd-memory-no-numa-topology.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/fd-memory-no-numa-topology.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology.x86_64-latest.args b/tests/qemuxmlconfdata/fd-memory-numa-topology.x86_64-latest.args
index 479a213c2b..574c935035 100644
--- a/tests/qemuxmlconfdata/fd-memory-numa-topology.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/fd-memory-numa-topology.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology2.x86_64-latest.args b/tests/qemuxmlconfdata/fd-memory-numa-topology2.x86_64-latest.args
index 92705fa234..cbbbb4a5ff 100644
--- a/tests/qemuxmlconfdata/fd-memory-numa-topology2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/fd-memory-numa-topology2.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology3.x86_64-latest.args b/tests/qemuxmlconfdata/fd-memory-numa-topology3.x86_64-latest.args
index 2fad64ad1a..6d2b4fe4fc 100644
--- a/tests/qemuxmlconfdata/fd-memory-numa-topology3.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/fd-memory-numa-topology3.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.args b/tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.args
index 9f147bbb64..cb7c8b9681 100644
--- a/tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pc/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/fips-enabled.x86_64-latest.args b/tests/qemuxmlconfdata/fips-enabled.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/fips-enabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/fips-enabled.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args
index 6265f0b718..4242686983 100644
--- a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args
index 6265f0b718..4242686983 100644
--- a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args
index a17764ccd7..65c83ccb0e 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.args
index a80a9b3c78..2f483f6874 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.args
index a824939895..6d62462886 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest.args
index b0d0a03b0e..cb4613a1b6 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.args
index f08d30b52f..bec1286c9b 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nbd.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args
index a80a9b3c78..2f483f6874 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args
index a824939895..6d62462886 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-loader-path.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-loader-path.x86_64-latest.args
index 16a34040bd..8a269cee46 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-loader-path.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-loader-path.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-nvramtemplate-path.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-nvramtemplate-path.x86_64-latest.args
index 16a34040bd..8a269cee46 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-nvramtemplate-path.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-nvramtemplate-path.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw.x86_64-latest.abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw.x86_64-latest.abi-update.args
index a17764ccd7..65c83ccb0e 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw.x86_64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw.x86_64-latest.abi-update.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw.x86_64-latest.args
index a17764ccd7..65c83ccb0e 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvramtemplate-qcow2.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvramtemplate-qcow2.x86_64-latest.args
index a824939895..6d62462886 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvramtemplate-qcow2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvramtemplate-qcow2.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest.args
index 05ad82842e..69bd07a9f9 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.args
index 05ad82842e..69bd07a9f9 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.abi-update.args
index a824939895..6d62462886 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.abi-update.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.args
index a17764ccd7..65c83ccb0e 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args
index a17764ccd7..65c83ccb0e 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.args
index 05ad82842e..69bd07a9f9 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.args
index 376e47487f..34e05d53b6 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-latest.args
index 9c43a1a793..205bb1a67c 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-latest.args
index b465ca5ccc..ba08150dfa 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.args
index e4d9d1f643..537308efcd 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.args
index a17764ccd7..65c83ccb0e 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-latest.args
index 779ba70768..b58f4369bc 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.args
index 779ba70768..b58f4369bc 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.args
index a17764ccd7..65c83ccb0e 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.args
index b1196a599c..0103e852cb 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.args
index 81ddc73d48..d32e426b51 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-varstore-q35.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-varstore-q35.x86_64-latest.args
index 2d75ef55f1..bd13774430 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-varstore-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-varstore-q35.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.args
index a824939895..6d62462886 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args
index a17764ccd7..65c83ccb0e 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.x86_64-latest.args
index ee19f80c46..67717280db 100644
--- a/tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.args
index ee19f80c46..67717280db 100644
--- a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args
index ee19f80c46..67717280db 100644
--- a/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.args
index 50ab59acec..54d0a3699c 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.args
index ac6cf076d4..69e4a99e95 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.args
index 9e900b9711..ae2c05a200 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest.args
index 3f805244b6..461cf89146 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.args
index 308010ee5d..dce77422de 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.args
index 3f805244b6..461cf89146 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.args
index a2a6ca920e..7b9cabcd8a 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.args
index 50ab59acec..54d0a3699c 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.args
index 376e47487f..34e05d53b6 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args
index 9c43a1a793..205bb1a67c 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args
index b465ca5ccc..ba08150dfa 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard-format.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard-format.x86_64-latest.args
index 8784526f93..79b0a70e5f 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard-format.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard-format.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard-legacy-paths.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard-legacy-paths.x86_64-latest.args
index 20d8cd5c37..de8203c131 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard-legacy-paths.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard-legacy-paths.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.args
index 05ad82842e..69bd07a9f9 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-latest.args
index ac6cf076d4..69e4a99e95 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.args
index 749d116748..1b1a59d051 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.args
index 45ecfc8aa4..1e26b2c90d 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.args
index 474babca98..b4b9c28659 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.args
index 749d116748..1b1a59d051 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.args
index 308010ee5d..dce77422de 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.args
index 3f805244b6..461cf89146 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.args
index ede3bb02ea..8556fe0308 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-varstore-q35.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-varstore-q35.x86_64-latest.args
index 1643d13961..32c979db05 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-varstore-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-varstore-q35.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args
index 376e47487f..34e05d53b6 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args
index ee2b3d58cb..582cc36eb6 100644
--- a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args
index 825fc41042..5e9fa4abd5 100644
--- a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/floppy-drive-fat.x86_64-latest.args b/tests/qemuxmlconfdata/floppy-drive-fat.x86_64-latest.args
index 0b7018608b..5284689621 100644
--- a/tests/qemuxmlconfdata/floppy-drive-fat.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/floppy-drive-fat.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/fs9p.x86_64-latest.args b/tests/qemuxmlconfdata/fs9p.x86_64-latest.args
index 86274046e8..4b9d8443bd 100644
--- a/tests/qemuxmlconfdata/fs9p.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/fs9p.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/genid-auto.x86_64-latest.args b/tests/qemuxmlconfdata/genid-auto.x86_64-latest.args
index 1bbdbeedd3..7f77745fe0 100644
--- a/tests/qemuxmlconfdata/genid-auto.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/genid-auto.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/genid.x86_64-latest.args b/tests/qemuxmlconfdata/genid.x86_64-latest.args
index 99c5f1000d..d5249208b7 100644
--- a/tests/qemuxmlconfdata/genid.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/genid.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-dbus-address.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-dbus-address.x86_64-latest.args
index 3132dcd63d..df4eb11b03 100644
--- a/tests/qemuxmlconfdata/graphics-dbus-address.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-dbus-address.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-dbus-audio.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-dbus-audio.x86_64-latest.args
index fd7b84d79a..e83828fe71 100644
--- a/tests/qemuxmlconfdata/graphics-dbus-audio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-dbus-audio.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-dbus-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-dbus-chardev.x86_64-latest.args
index 45aec4f08f..1e522b9dc1 100644
--- a/tests/qemuxmlconfdata/graphics-dbus-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-dbus-chardev.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-dbus-p2p.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-dbus-p2p.x86_64-latest.args
index 7b86736fab..77503a881a 100644
--- a/tests/qemuxmlconfdata/graphics-dbus-p2p.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-dbus-p2p.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-dbus-usbredir.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-dbus-usbredir.x86_64-latest.args
index 7cde6c7055..6d01d35d1e 100644
--- a/tests/qemuxmlconfdata/graphics-dbus-usbredir.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-dbus-usbredir.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-dbus.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-dbus.x86_64-latest.args
index 8b10b8ea17..24bec518d6 100644
--- a/tests/qemuxmlconfdata/graphics-dbus.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-dbus.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-egl-headless-rendernode.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-egl-headless-rendernode.x86_64-latest.args
index 1a3ffd795a..971dc5c5a9 100644
--- a/tests/qemuxmlconfdata/graphics-egl-headless-rendernode.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-egl-headless-rendernode.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-egl-headless.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-egl-headless.x86_64-latest.args
index 1a3ffd795a..971dc5c5a9 100644
--- a/tests/qemuxmlconfdata/graphics-egl-headless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-egl-headless.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-listen-network.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-listen-network.x86_64-latest.args
index d0fecb663b..ca255fbaad 100644
--- a/tests/qemuxmlconfdata/graphics-listen-network.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-listen-network.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-rdp.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-rdp.x86_64-latest.args
index 2a5916c456..6e0b581919 100644
--- a/tests/qemuxmlconfdata/graphics-rdp.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-rdp.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-sdl-fullscreen.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-sdl-fullscreen.x86_64-latest.args
index 66510ce199..fc95baa56a 100644
--- a/tests/qemuxmlconfdata/graphics-sdl-fullscreen.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-sdl-fullscreen.x86_64-latest.args
@@ -23,7 +23,7 @@ DISPLAY=:0.1 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-sdl.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-sdl.x86_64-latest.args
index e072a36568..b3bf0834a7 100644
--- a/tests/qemuxmlconfdata/graphics-sdl.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-sdl.x86_64-latest.args
@@ -23,7 +23,7 @@ DISPLAY=:0.1 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-spice-agent-file-xfer.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-agent-file-xfer.x86_64-latest.args
index e15eefd2ca..8b32599864 100644
--- a/tests/qemuxmlconfdata/graphics-spice-agent-file-xfer.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-agent-file-xfer.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-spice-agentmouse.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-agentmouse.x86_64-latest.args
index 9ad6b43c65..3f39cbee18 100644
--- a/tests/qemuxmlconfdata/graphics-spice-agentmouse.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-agentmouse.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-spice-auto-socket-cfg.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-auto-socket-cfg.x86_64-latest.args
index 1c67f3e2e2..58038bf73f 100644
--- a/tests/qemuxmlconfdata/graphics-spice-auto-socket-cfg.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-auto-socket-cfg.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-spice-auto-socket.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-auto-socket.x86_64-latest.args
index 1c67f3e2e2..58038bf73f 100644
--- a/tests/qemuxmlconfdata/graphics-spice-auto-socket.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-auto-socket.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-spice-compression.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-compression.x86_64-latest.args
index f8b497d23b..f64fbd6615 100644
--- a/tests/qemuxmlconfdata/graphics-spice-compression.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-compression.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-spice-egl-headless.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-egl-headless.x86_64-latest.args
index 686e847d2d..bb702abcf9 100644
--- a/tests/qemuxmlconfdata/graphics-spice-egl-headless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-egl-headless.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
index d360e288c0..50e14817c6 100644
--- a/tests/qemuxmlconfdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-spice-no-args.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-no-args.x86_64-latest.args
index 0e2c03af8e..c6b39c5a5b 100644
--- a/tests/qemuxmlconfdata/graphics-spice-no-args.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-no-args.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-spice-qxl-vga.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-qxl-vga.x86_64-latest.args
index 62e0fba4bc..fc6dcdc468 100644
--- a/tests/qemuxmlconfdata/graphics-spice-qxl-vga.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-qxl-vga.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args
index dbecc45ba6..8b85bc8221 100644
--- a/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args
@@ -22,7 +22,7 @@ SASL_CONF_PATH=/etc/sasl2 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-spice-socket.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-socket.x86_64-latest.args
index 52fc703d66..cb9d3c5448 100644
--- a/tests/qemuxmlconfdata/graphics-spice-socket.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-socket.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args
index 841a161654..b1ca3ace07 100644
--- a/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-f14/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-spice-usb-redir.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-usb-redir.x86_64-latest.args
index 995c8bf4dd..279089d9de 100644
--- a/tests/qemuxmlconfdata/graphics-spice-usb-redir.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-usb-redir.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-spice.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice.x86_64-latest.args
index a6064162a7..b2d7adb9f6 100644
--- a/tests/qemuxmlconfdata/graphics-spice.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args
index 509a8e4643..3dbc899217 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-auto-socket.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-auto-socket.x86_64-latest.args
index 8a1bfaeed5..759538faea 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-auto-socket.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-auto-socket.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-egl-headless.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-egl-headless.x86_64-latest.args
index 9578f68a69..32c5c33a70 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-egl-headless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-egl-headless.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-no-listen-attr.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-no-listen-attr.x86_64-latest.args
index b07f4abd64..2af19a21cf 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-no-listen-attr.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-no-listen-attr.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-none.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-none.x86_64-latest.args
index 7f9f2ea726..d2185f8e6b 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-none.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-policy.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-policy.x86_64-latest.args
index cbf23b6b5b..b024f1a701 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-policy.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-policy.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-power.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-power.x86_64-latest.args
index 722ce9599f..6551bac313 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-power.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-power.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-remove-generated-socket.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-remove-generated-socket.x86_64-latest.args
index c694022e3f..6dc238bd73 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-remove-generated-socket.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-remove-generated-socket.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args
index 236e91d47c..cfc1d4e1ce 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args
@@ -22,7 +22,7 @@ SASL_CONF_PATH=/etc/sasl2 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-socket-new-cmdline.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-socket-new-cmdline.x86_64-latest.args
index b1739c3d66..7cd4d41c8a 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-socket-new-cmdline.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-socket-new-cmdline.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-socket.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-socket.x86_64-latest.args
index 4f2f89cd06..18490df6b6 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-socket.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-socket.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-standalone-p2p.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-standalone-p2p.x86_64-latest.args
index e7dd32f8d5..dbb5f9691a 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-standalone-p2p.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-standalone-p2p.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-standalone-socket.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-standalone-socket.x86_64-latest.args
index b25e567391..5f2295d100 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-standalone-socket.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-standalone-socket.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-standalone.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-standalone.x86_64-latest.args
index b25e567391..5f2295d100 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-standalone.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-standalone.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args
index a0b092e955..1c0aa5a4b3 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args
@@ -22,7 +22,7 @@ SASL_CONF_PATH=/etc/sasl2 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args
index 49b5e87ed8..a394268ba6 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args
@@ -22,7 +22,7 @@ SASL_CONF_PATH=/etc/sasl2 \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-websocket.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-websocket.x86_64-latest.args
index b647510666..cc58470560 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-websocket.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-websocket.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/graphics-vnc.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc.x86_64-latest.args
index b07f4abd64..2af19a21cf 100644
--- a/tests/qemuxmlconfdata/graphics-vnc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-mdev-display-ramfb.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-mdev-display-ramfb.x86_64-latest.args
index 65e2528c56..af51cc5952 100644
--- a/tests/qemuxmlconfdata/hostdev-mdev-display-ramfb.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-mdev-display-ramfb.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
index a748007cd9..1154ea2a9f 100644
--- a/tests/qemuxmlconfdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
index 69a30d0a80..5ad891b882 100644
--- a/tests/qemuxmlconfdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
index c8cc164c3b..8984724990 100644
--- a/tests/qemuxmlconfdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-mdev-display-vnc.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-mdev-display-vnc.x86_64-latest.args
index 9bf72f072b..a697fc53e2 100644
--- a/tests/qemuxmlconfdata/hostdev-mdev-display-vnc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-mdev-display-vnc.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-mdev-display.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-mdev-display.x86_64-latest.args
index 9bf72f072b..a697fc53e2 100644
--- a/tests/qemuxmlconfdata/hostdev-mdev-display.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-mdev-display.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-mdev-precreated.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-mdev-precreated.x86_64-latest.args
index 63d9645561..07211c926b 100644
--- a/tests/qemuxmlconfdata/hostdev-mdev-precreated.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-mdev-precreated.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-pci-address-device.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-pci-address-device.x86_64-latest.args
index db9c331048..301f88f8bc 100644
--- a/tests/qemuxmlconfdata/hostdev-pci-address-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-pci-address-device.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-pci-address-unassigned.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-pci-address-unassigned.x86_64-latest.args
index 75b9de2a0e..dc129d3550 100644
--- a/tests/qemuxmlconfdata/hostdev-pci-address-unassigned.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-pci-address-unassigned.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-pci-address.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-pci-address.x86_64-latest.args
index ed49378c98..1d8dbc23ae 100644
--- a/tests/qemuxmlconfdata/hostdev-pci-address.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-pci-address.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.args
index 936cdf678b..6e7103436a 100644
--- a/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-pci-multifunction.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-pci-multifunction.x86_64-latest.args
index 92b049640a..96a26fb82b 100644
--- a/tests/qemuxmlconfdata/hostdev-pci-multifunction.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-pci-multifunction.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-scsi-autogen-address.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-autogen-address.x86_64-latest.args
index 30490d95f8..7556af5e8f 100644
--- a/tests/qemuxmlconfdata/hostdev-scsi-autogen-address.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-scsi-autogen-address.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-scsi-large-unit.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-large-unit.x86_64-latest.args
index 2dc0ffca24..dbbb2db0e9 100644
--- a/tests/qemuxmlconfdata/hostdev-scsi-large-unit.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-scsi-large-unit.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-scsi-lsi.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-lsi.x86_64-latest.args
index 59db6a485d..45329485ae 100644
--- a/tests/qemuxmlconfdata/hostdev-scsi-lsi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-scsi-lsi.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-scsi-shareable.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-shareable.x86_64-latest.args
index 2dc0ffca24..dbbb2db0e9 100644
--- a/tests/qemuxmlconfdata/hostdev-scsi-shareable.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-scsi-shareable.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.args
index 260859c48d..27357694a1 100644
--- a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args
index b7aa90d25f..2a86cb06b2 100644
--- a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-scsi-virtio-scsi.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-virtio-scsi.x86_64-latest.args
index 736b7e7dc0..4c06712df5 100644
--- a/tests/qemuxmlconfdata/hostdev-scsi-virtio-scsi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-scsi-virtio-scsi.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-usb-address-device-boot.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-usb-address-device-boot.x86_64-latest.args
index 81f0287c38..a08290b4fe 100644
--- a/tests/qemuxmlconfdata/hostdev-usb-address-device-boot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-usb-address-device-boot.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-usb-address-device.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-usb-address-device.x86_64-latest.args
index d226e95c12..3ab91b17cf 100644
--- a/tests/qemuxmlconfdata/hostdev-usb-address-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-usb-address-device.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-usb-address-port.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-usb-address-port.x86_64-latest.args
index c4b96f015e..9e86ddc2e5 100644
--- a/tests/qemuxmlconfdata/hostdev-usb-address-port.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-usb-address-port.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-usb-address.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-usb-address.x86_64-latest.args
index 497dc5b1da..7297d90d5d 100644
--- a/tests/qemuxmlconfdata/hostdev-usb-address.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-usb-address.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-usb-vendor-product.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-usb-vendor-product.x86_64-latest.args
index 8f393c3db9..9623cab499 100644
--- a/tests/qemuxmlconfdata/hostdev-usb-vendor-product.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-usb-vendor-product.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-vfio-multidomain.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-multidomain.x86_64-latest.args
index 35c2ace727..6e3eabc1da 100644
--- a/tests/qemuxmlconfdata/hostdev-vfio-multidomain.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-vfio-multidomain.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hostdev-vfio.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-vfio.x86_64-latest.args
index 379853248d..40fef9144f 100644
--- a/tests/qemuxmlconfdata/hostdev-vfio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-vfio.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hotplug-base.x86_64-latest.args b/tests/qemuxmlconfdata/hotplug-base.x86_64-latest.args
index e93f2c8726..991f871051 100644
--- a/tests/qemuxmlconfdata/hotplug-base.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hotplug-base.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-hotplug/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hugepages-default-2M.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-default-2M.x86_64-latest.args
index eb10fc39f5..d715f33b21 100644
--- a/tests/qemuxmlconfdata/hugepages-default-2M.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-default-2M.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-SomeDummyHugepagesGu/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hugepages-default-system-size.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-default-system-size.x86_64-latest.args
index decdca9516..fa1ac8c344 100644
--- a/tests/qemuxmlconfdata/hugepages-default-system-size.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-default-system-size.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-SomeDummyHugepagesGu/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hugepages-default.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-default.x86_64-latest.args
index 39447a1e03..5ddf0d672f 100644
--- a/tests/qemuxmlconfdata/hugepages-default.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-default.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hugepages-memaccess.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-memaccess.x86_64-latest.args
index 3cb19a22d7..1dae581c95 100644
--- a/tests/qemuxmlconfdata/hugepages-memaccess.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-memaccess.x86_64-latest.args
@@ -33,7 +33,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hugepages-memaccess2.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-memaccess2.x86_64-latest.args
index d7a8595fa9..2823044027 100644
--- a/tests/qemuxmlconfdata/hugepages-memaccess2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-memaccess2.x86_64-latest.args
@@ -30,7 +30,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-latest.args
index 51e197b728..647226916d 100644
--- a/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fedora/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/hugepages-nodeset.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-nodeset.x86_64-latest.args
index eb10fc39f5..d715f33b21 100644
--- a/tests/qemuxmlconfdata/hugepages-nodeset.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-nodeset.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-SomeDummyHugepagesGu/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hugepages-numa-default-2M.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-numa-default-2M.x86_64-latest.args
index a504fec129..c9f9e23f41 100644
--- a/tests/qemuxmlconfdata/hugepages-numa-default-2M.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-numa-default-2M.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-SomeDummyHugepagesGu/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hugepages-numa-default-dimm.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-numa-default-dimm.x86_64-latest.args
index 128640b6af..ba89c782ea 100644
--- a/tests/qemuxmlconfdata/hugepages-numa-default-dimm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-numa-default-dimm.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fedora/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hugepages-numa-default.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-numa-default.x86_64-latest.args
index ad08f817d8..d92e89b89a 100644
--- a/tests/qemuxmlconfdata/hugepages-numa-default.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-numa-default.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fedora/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hugepages-numa-nodeset-part.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-numa-nodeset-part.x86_64-latest.args
index 801269b9f1..b9c1bd45b8 100644
--- a/tests/qemuxmlconfdata/hugepages-numa-nodeset-part.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-numa-nodeset-part.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-SomeDummyHugepagesGu/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hugepages-numa-nodeset.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-numa-nodeset.x86_64-latest.args
index fdb67cf130..e0354e2316 100644
--- a/tests/qemuxmlconfdata/hugepages-numa-nodeset.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-numa-nodeset.x86_64-latest.args
@@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-nvdimm.x86_64-latest.args
index 6c8be34341..77e74c4ec9 100644
--- a/tests/qemuxmlconfdata/hugepages-nvdimm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-nvdimm.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hugepages-shared.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-shared.x86_64-latest.args
index e272117c04..a5fc17d362 100644
--- a/tests/qemuxmlconfdata/hugepages-shared.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-shared.x86_64-latest.args
@@ -33,7 +33,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hwuuid.x86_64-latest.args b/tests/qemuxmlconfdata/hwuuid.x86_64-latest.args
index cf64daffea..a043e6967b 100644
--- a/tests/qemuxmlconfdata/hwuuid.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hwuuid.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hyperv-host-model.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv-host-model.x86_64-latest.args
index 1253948a18..0759fe35a9 100644
--- a/tests/qemuxmlconfdata/hyperv-host-model.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hyperv-host-model.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hyperv-off.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv-off.x86_64-latest.args
index 87d89be1ee..3436c692e2 100644
--- a/tests/qemuxmlconfdata/hyperv-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hyperv-off.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hyperv-panic.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv-panic.x86_64-latest.args
index ead6f2efc5..ee0f8551c2 100644
--- a/tests/qemuxmlconfdata/hyperv-panic.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hyperv-panic.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hyperv-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv-passthrough.x86_64-latest.args
index 2dc01446ca..1c3d80ce2a 100644
--- a/tests/qemuxmlconfdata/hyperv-passthrough.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hyperv-passthrough.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hyperv-spinlocks-never-notify.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv-spinlocks-never-notify.x86_64-latest.args
index 95919fb3f1..cc05d07a82 100644
--- a/tests/qemuxmlconfdata/hyperv-spinlocks-never-notify.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hyperv-spinlocks-never-notify.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hyperv-stimer-direct.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv-stimer-direct.x86_64-latest.args
index cd733ab1cd..c9c637cc86 100644
--- a/tests/qemuxmlconfdata/hyperv-stimer-direct.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hyperv-stimer-direct.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/hyperv.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv.x86_64-latest.args
index 19f17f96e3..ec54e01726 100644
--- a/tests/qemuxmlconfdata/hyperv.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hyperv.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/input-linux.x86_64-latest.args b/tests/qemuxmlconfdata/input-linux.x86_64-latest.args
index 322bdd20b1..6a8b3f90be 100644
--- a/tests/qemuxmlconfdata/input-linux.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/input-linux.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/input-usbmouse-addr.x86_64-latest.args b/tests/qemuxmlconfdata/input-usbmouse-addr.x86_64-latest.args
index 860b80ee0c..02ac55c0f7 100644
--- a/tests/qemuxmlconfdata/input-usbmouse-addr.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/input-usbmouse-addr.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/input-usbmouse.x86_64-latest.args b/tests/qemuxmlconfdata/input-usbmouse.x86_64-latest.args
index df4019eb87..1b71f4df61 100644
--- a/tests/qemuxmlconfdata/input-usbmouse.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/input-usbmouse.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/input-usbtablet.x86_64-latest.args b/tests/qemuxmlconfdata/input-usbtablet.x86_64-latest.args
index 027c13c94e..a6ce931650 100644
--- a/tests/qemuxmlconfdata/input-usbtablet.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/input-usbtablet.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/intel-iommu-aw-bits.x86_64-latest.args b/tests/qemuxmlconfdata/intel-iommu-aw-bits.x86_64-latest.args
index cec07e1aa6..fd1d3a1984 100644
--- a/tests/qemuxmlconfdata/intel-iommu-aw-bits.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/intel-iommu-aw-bits.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/intel-iommu-caching-mode.x86_64-latest.args b/tests/qemuxmlconfdata/intel-iommu-caching-mode.x86_64-latest.args
index 55140a086a..71ab231192 100644
--- a/tests/qemuxmlconfdata/intel-iommu-caching-mode.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/intel-iommu-caching-mode.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/intel-iommu-device-iotlb.x86_64-latest.args b/tests/qemuxmlconfdata/intel-iommu-device-iotlb.x86_64-latest.args
index 772e737a15..9cd3b4e7fc 100644
--- a/tests/qemuxmlconfdata/intel-iommu-device-iotlb.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/intel-iommu-device-iotlb.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/intel-iommu-dma-translation.x86_64-latest.args b/tests/qemuxmlconfdata/intel-iommu-dma-translation.x86_64-latest.args
index 873674e9a9..a0ffec8dfb 100644
--- a/tests/qemuxmlconfdata/intel-iommu-dma-translation.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/intel-iommu-dma-translation.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/intel-iommu-eim-autoadd.x86_64-latest.abi-update.args b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd.x86_64-latest.abi-update.args
index 0162941b6e..733460e251 100644
--- a/tests/qemuxmlconfdata/intel-iommu-eim-autoadd.x86_64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd.x86_64-latest.abi-update.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/intel-iommu-eim.x86_64-latest.args b/tests/qemuxmlconfdata/intel-iommu-eim.x86_64-latest.args
index 0162941b6e..733460e251 100644
--- a/tests/qemuxmlconfdata/intel-iommu-eim.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/intel-iommu-eim.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/intel-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/intel-iommu.x86_64-latest.args
index cb63b25689..47de98e8b6 100644
--- a/tests/qemuxmlconfdata/intel-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/intel-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args b/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args
index 463192fbff..23237bd62c 100644
--- a/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args
index 52f705f21c..33be284801 100644
--- a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args b/tests/qemuxmlconfdata/iommufd.x86_64-latest.args
index 123f816e3d..f7882ed40b 100644
--- a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iommufd.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/iothreads-disk.x86_64-latest.args b/tests/qemuxmlconfdata/iothreads-disk.x86_64-latest.args
index 35f843f5aa..ec1c1be564 100644
--- a/tests/qemuxmlconfdata/iothreads-disk.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iothreads-disk.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/iothreads-ids-partial.x86_64-latest.args b/tests/qemuxmlconfdata/iothreads-ids-partial.x86_64-latest.args
index 308db90028..281ee7748d 100644
--- a/tests/qemuxmlconfdata/iothreads-ids-partial.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iothreads-ids-partial.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/iothreads-ids-pool-sizes.x86_64-latest.args b/tests/qemuxmlconfdata/iothreads-ids-pool-sizes.x86_64-latest.args
index 4cfce9b9da..d8f0678090 100644
--- a/tests/qemuxmlconfdata/iothreads-ids-pool-sizes.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iothreads-ids-pool-sizes.x86_64-latest.args
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/iothreads-ids.x86_64-latest.args b/tests/qemuxmlconfdata/iothreads-ids.x86_64-latest.args
index 4d56d4c2c0..e1f9aec596 100644
--- a/tests/qemuxmlconfdata/iothreads-ids.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iothreads-ids.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/iothreads-virtio-scsi-mapping.x86_64-latest.args b/tests/qemuxmlconfdata/iothreads-virtio-scsi-mapping.x86_64-latest.args
index ee98a94823..6ed6241b2b 100644
--- a/tests/qemuxmlconfdata/iothreads-virtio-scsi-mapping.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iothreads-virtio-scsi-mapping.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.x86_64-latest.args b/tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.x86_64-latest.args
index aff65f577a..d365ad7db3 100644
--- a/tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/kvm-features-off.x86_64-latest.args b/tests/qemuxmlconfdata/kvm-features-off.x86_64-latest.args
index 70b1fb83e1..bb7af6868f 100644
--- a/tests/qemuxmlconfdata/kvm-features-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/kvm-features-off.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/kvm-features.x86_64-latest.args b/tests/qemuxmlconfdata/kvm-features.x86_64-latest.args
index 8221fdb16f..089a223269 100644
--- a/tests/qemuxmlconfdata/kvm-features.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/kvm-features.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/kvm-pit-delay.x86_64-latest.args b/tests/qemuxmlconfdata/kvm-pit-delay.x86_64-latest.args
index e076cc25e9..d2fa971b42 100644
--- a/tests/qemuxmlconfdata/kvm-pit-delay.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/kvm-pit-delay.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -global kvm-pit.lost_tick_policy=delay \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/kvm-pit-discard.x86_64-latest.args b/tests/qemuxmlconfdata/kvm-pit-discard.x86_64-latest.args
index b92331e051..ca39a7dbf8 100644
--- a/tests/qemuxmlconfdata/kvm-pit-discard.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/kvm-pit-discard.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -global kvm-pit.lost_tick_policy=discard \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/kvmclock+eoi-disabled.x86_64-latest.args b/tests/qemuxmlconfdata/kvmclock+eoi-disabled.x86_64-latest.args
index 15bdc3babb..12a3ed6039 100644
--- a/tests/qemuxmlconfdata/kvmclock+eoi-disabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/kvmclock+eoi-disabled.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/kvmclock.x86_64-latest.args b/tests/qemuxmlconfdata/kvmclock.x86_64-latest.args
index 6e46d1b7f8..482778bfa2 100644
--- a/tests/qemuxmlconfdata/kvmclock.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/kvmclock.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest.args b/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest.args
index 3271bfcb50..df9e315405 100644
--- a/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.args b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.args
index 324c318e90..3b11bb2d7a 100644
--- a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/lease.x86_64-latest.args b/tests/qemuxmlconfdata/lease.x86_64-latest.args
index 7523db7d72..9aa9e2642c 100644
--- a/tests/qemuxmlconfdata/lease.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/lease.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/luks-disks-source-qcow2.x86_64-latest.args b/tests/qemuxmlconfdata/luks-disks-source-qcow2.x86_64-latest.args
index 1f3056dd96..3bc1b65801 100644
--- a/tests/qemuxmlconfdata/luks-disks-source-qcow2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/luks-disks-source-qcow2.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args b/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args
index ac19a60ac8..acee3f2c81 100644
--- a/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args b/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args
index 8fe957cb26..294eb309fe 100644
--- a/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/machine-aliases1.x86_64-latest.args b/tests/qemuxmlconfdata/machine-aliases1.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/machine-aliases1.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/machine-aliases1.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/machine-aliases2.x86_64-latest.args b/tests/qemuxmlconfdata/machine-aliases2.x86_64-latest.args
index bb3015c76d..8a23ea64bc 100644
--- a/tests/qemuxmlconfdata/machine-aliases2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/machine-aliases2.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/machine-core-off.x86_64-latest.args b/tests/qemuxmlconfdata/machine-core-off.x86_64-latest.args
index d59f1717d9..542bf9c509 100644
--- a/tests/qemuxmlconfdata/machine-core-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/machine-core-off.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/machine-core-on.x86_64-latest.args b/tests/qemuxmlconfdata/machine-core-on.x86_64-latest.args
index 50936d34f8..480cd04b1b 100644
--- a/tests/qemuxmlconfdata/machine-core-on.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/machine-core-on.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/machine-i8042-off.x86_64-latest.args b/tests/qemuxmlconfdata/machine-i8042-off.x86_64-latest.args
index fcdbf0a6e1..0573cd5243 100644
--- a/tests/qemuxmlconfdata/machine-i8042-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/machine-i8042-off.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/machine-i8042-on.x86_64-latest.args b/tests/qemuxmlconfdata/machine-i8042-on.x86_64-latest.args
index 57c593aa3a..19b917b562 100644
--- a/tests/qemuxmlconfdata/machine-i8042-on.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/machine-i8042-on.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/machine-smm-off.x86_64-latest.args b/tests/qemuxmlconfdata/machine-smm-off.x86_64-latest.args
index 386e4e9a74..aeba742b19 100644
--- a/tests/qemuxmlconfdata/machine-smm-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/machine-smm-off.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/machine-smm-on.x86_64-latest.args b/tests/qemuxmlconfdata/machine-smm-on.x86_64-latest.args
index fe9e1b6228..4603e85eb2 100644
--- a/tests/qemuxmlconfdata/machine-smm-on.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/machine-smm-on.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/machine-vmport-opt.x86_64-latest.args b/tests/qemuxmlconfdata/machine-vmport-opt.x86_64-latest.args
index 9c7cf202ea..3a7a71acaf 100644
--- a/tests/qemuxmlconfdata/machine-vmport-opt.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/machine-vmport-opt.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args
index c6aed849c4..0e94092ba3 100644
--- a/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args
index a5a4bab6c1..6810b3c55e 100644
--- a/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-dimm-addr.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-dimm-addr.x86_64-latest.args
index 82844926c5..59e76d9550 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-dimm-addr.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-dimm-addr.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-dimm.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-dimm.x86_64-latest.args
index 7f5c6b2888..4f3cb14645 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-dimm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-dimm.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-multiple.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-multiple.x86_64-latest.args
index 353b9294f2..31569bbaa0 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-multiple.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-multiple.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-numa-preferred.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-numa-preferred.x86_64-latest.args
index 75a0813a19..7c927c97bb 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-numa-preferred.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-numa-preferred.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-access.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-access.x86_64-latest.args
index 71616e7aa7..a0d18f62c2 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-access.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-access.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-latest.args
index 6e8a6442ac..2d5062536e 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-latest.args
index bd27981a78..bcd1427d63 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-overlap.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-overlap.x86_64-latest.args
index 093d8f2a8f..77576246a1 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-overlap.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-overlap.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
index 254636bf35..5eb96bca93 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
index 5bfa663004..fec7f560e4 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm.x86_64-latest.args
index 9b7837d73f..58e793e9b7 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem.x86_64-latest.args
index 20de4e2797..c99ec05155 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-latest.args
index 1196724c2b..2b5d38efee 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memory-hotplug.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug.x86_64-latest.args
index 31c62ec38c..21a3c26e0b 100644
--- a/tests/qemuxmlconfdata/memory-hotplug.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memorybacking-set.x86_64-latest.args b/tests/qemuxmlconfdata/memorybacking-set.x86_64-latest.args
index f021fa996c..fa637d538a 100644
--- a/tests/qemuxmlconfdata/memorybacking-set.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memorybacking-set.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-SomeDummyGuest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memorybacking-unset.x86_64-latest.args b/tests/qemuxmlconfdata/memorybacking-unset.x86_64-latest.args
index f7d6278654..7541ce09d4 100644
--- a/tests/qemuxmlconfdata/memorybacking-unset.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memorybacking-unset.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-SomeDummyGuest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memtune-unlimited.x86_64-latest.args b/tests/qemuxmlconfdata/memtune-unlimited.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/memtune-unlimited.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memtune-unlimited.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/memtune.x86_64-latest.args b/tests/qemuxmlconfdata/memtune.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/memtune.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memtune.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/metadata-duplicate.x86_64-latest.args b/tests/qemuxmlconfdata/metadata-duplicate.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/metadata-duplicate.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/metadata-duplicate.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/metadata.x86_64-latest.args b/tests/qemuxmlconfdata/metadata.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/metadata.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/metadata.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/migrate-numa-unaligned.x86_64-latest.args b/tests/qemuxmlconfdata/migrate-numa-unaligned.x86_64-latest.args
index 0b975dc51c..051bcc0c95 100644
--- a/tests/qemuxmlconfdata/migrate-numa-unaligned.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/migrate-numa-unaligned.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/migrate.x86_64-latest.args b/tests/qemuxmlconfdata/migrate.x86_64-latest.args
index 456a6dc79e..ffa14cf1c8 100644
--- a/tests/qemuxmlconfdata/migrate.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/migrate.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/misc-disable-s3.x86_64-latest.args b/tests/qemuxmlconfdata/misc-disable-s3.x86_64-latest.args
index 48015d5546..ede03cc2f3 100644
--- a/tests/qemuxmlconfdata/misc-disable-s3.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/misc-disable-s3.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -global PIIX4_PM.disable_s3=1 \
diff --git a/tests/qemuxmlconfdata/misc-disable-suspends.x86_64-latest.args b/tests/qemuxmlconfdata/misc-disable-suspends.x86_64-latest.args
index 68743f6b78..058419b6f9 100644
--- a/tests/qemuxmlconfdata/misc-disable-suspends.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/misc-disable-suspends.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -global PIIX4_PM.disable_s3=1 \
diff --git a/tests/qemuxmlconfdata/misc-enable-s4.x86_64-latest.args b/tests/qemuxmlconfdata/misc-enable-s4.x86_64-latest.args
index c0f17e959e..be5b5f5058 100644
--- a/tests/qemuxmlconfdata/misc-enable-s4.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/misc-enable-s4.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -global PIIX4_PM.disable_s4=0 \
diff --git a/tests/qemuxmlconfdata/misc-no-reboot.x86_64-latest.args b/tests/qemuxmlconfdata/misc-no-reboot.x86_64-latest.args
index d59f1717d9..542bf9c509 100644
--- a/tests/qemuxmlconfdata/misc-no-reboot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/misc-no-reboot.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/misc-uuid.x86_64-latest.args b/tests/qemuxmlconfdata/misc-uuid.x86_64-latest.args
index 2d052351fa..5740f7ea4d 100644
--- a/tests/qemuxmlconfdata/misc-uuid.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/misc-uuid.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/mlock-off.x86_64-latest.args b/tests/qemuxmlconfdata/mlock-off.x86_64-latest.args
index a08dae37e7..ff98ea4b3b 100644
--- a/tests/qemuxmlconfdata/mlock-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/mlock-off.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/mlock-on.x86_64-latest.args b/tests/qemuxmlconfdata/mlock-on.x86_64-latest.args
index 7e703e9106..7a7bdd5155 100644
--- a/tests/qemuxmlconfdata/mlock-on.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/mlock-on.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/mtp-usb-device.x86_64-latest.args b/tests/qemuxmlconfdata/mtp-usb-device.x86_64-latest.args
index 8af45b4c6d..ea24fe563f 100644
--- a/tests/qemuxmlconfdata/mtp-usb-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/mtp-usb-device.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/multifunction-pci-device.x86_64-latest.args b/tests/qemuxmlconfdata/multifunction-pci-device.x86_64-latest.args
index 0f641f9293..2da3f26d8f 100644
--- a/tests/qemuxmlconfdata/multifunction-pci-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/multifunction-pci-device.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/name-escape.x86_64-latest.args b/tests/qemuxmlconfdata/name-escape.x86_64-latest.args
index 072afcfb5b..2d50bb690f 100644
--- a/tests/qemuxmlconfdata/name-escape.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/name-escape.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo=1,bar=2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args b/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args
index e1d4e5c902..569244f92f 100644
--- a/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-f14-60/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args b/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args
index edcdaa997e..8a4636ffd3 100644
--- a/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-f14-60/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/net-client.x86_64-latest.args b/tests/qemuxmlconfdata/net-client.x86_64-latest.args
index e390929043..efcb7289bc 100644
--- a/tests/qemuxmlconfdata/net-client.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-client.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args b/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args
index 26c174778a..688a19f91a 100644
--- a/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args
index 2bea0659df..0e1786284e 100644
--- a/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args
index 2bea0659df..0e1786284e 100644
--- a/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args
index 4e7109e54a..2b7b5ae926 100644
--- a/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args
index 695a08b9a9..902b70d17f 100644
--- a/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-eth.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth.x86_64-latest.args
index 2bea0659df..0e1786284e 100644
--- a/tests/qemuxmlconfdata/net-eth.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-eth.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-hostdev-bootorder.x86_64-latest.args b/tests/qemuxmlconfdata/net-hostdev-bootorder.x86_64-latest.args
index 5772fea1c2..0d87ce1c2d 100644
--- a/tests/qemuxmlconfdata/net-hostdev-bootorder.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-hostdev-bootorder.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-hostdev-multidomain.x86_64-latest.args b/tests/qemuxmlconfdata/net-hostdev-multidomain.x86_64-latest.args
index 839011e0e9..791523476a 100644
--- a/tests/qemuxmlconfdata/net-hostdev-multidomain.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-hostdev-multidomain.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-hostdev-vfio-multidomain.x86_64-latest.args b/tests/qemuxmlconfdata/net-hostdev-vfio-multidomain.x86_64-latest.args
index 8bbaf6d279..9831bd8abd 100644
--- a/tests/qemuxmlconfdata/net-hostdev-vfio-multidomain.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-hostdev-vfio-multidomain.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-hostdev-vfio.x86_64-latest.args b/tests/qemuxmlconfdata/net-hostdev-vfio.x86_64-latest.args
index 1ea3597a13..bbbaba5bec 100644
--- a/tests/qemuxmlconfdata/net-hostdev-vfio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-hostdev-vfio.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-hostdev.x86_64-latest.args b/tests/qemuxmlconfdata/net-hostdev.x86_64-latest.args
index a5302f08b4..2682dfabdc 100644
--- a/tests/qemuxmlconfdata/net-hostdev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-hostdev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args b/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args
index d76c6fa4ac..fcb202cd23 100644
--- a/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-linkstate.x86_64-latest.args b/tests/qemuxmlconfdata/net-linkstate.x86_64-latest.args
index 8f52311d2a..4f8034537b 100644
--- a/tests/qemuxmlconfdata/net-linkstate.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-linkstate.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-many-models.x86_64-latest.args b/tests/qemuxmlconfdata/net-many-models.x86_64-latest.args
index 55d271319d..9686718684 100644
--- a/tests/qemuxmlconfdata/net-many-models.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-many-models.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-mcast.x86_64-latest.args b/tests/qemuxmlconfdata/net-mcast.x86_64-latest.args
index 8fe56a04ef..421f0e8f50 100644
--- a/tests/qemuxmlconfdata/net-mcast.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-mcast.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args b/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args
index e98688963c..13bc83b4cb 100644
--- a/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args b/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args
index 0479462ebb..922552cd8b 100644
--- a/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args b/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args
index 813b0509d6..c9602fc133 100644
--- a/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-server.x86_64-latest.args b/tests/qemuxmlconfdata/net-server.x86_64-latest.args
index 5818f4f050..5af789d291 100644
--- a/tests/qemuxmlconfdata/net-server.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-server.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-udp.x86_64-latest.args b/tests/qemuxmlconfdata/net-udp.x86_64-latest.args
index 5b66fee2da..c5a99dfea4 100644
--- a/tests/qemuxmlconfdata/net-udp.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-udp.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-usb.x86_64-latest.args b/tests/qemuxmlconfdata/net-usb.x86_64-latest.args
index 092bf99e22..8c8f401f10 100644
--- a/tests/qemuxmlconfdata/net-usb.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-usb.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-user-addr.x86_64-latest.args b/tests/qemuxmlconfdata/net-user-addr.x86_64-latest.args
index d51441df84..672f125b5a 100644
--- a/tests/qemuxmlconfdata/net-user-addr.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-user-addr.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-user-passt.x86_64-latest.args b/tests/qemuxmlconfdata/net-user-passt.x86_64-latest.args
index ff93aa4df6..c13cd82c23 100644
--- a/tests/qemuxmlconfdata/net-user-passt.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-user-passt.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-user.x86_64-latest.args b/tests/qemuxmlconfdata/net-user.x86_64-latest.args
index 19dd3e6879..7d6345965f 100644
--- a/tests/qemuxmlconfdata/net-user.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-user.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args b/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args
index 4de9a8667b..660be2cec8 100644
--- a/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args b/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args
index ecefa3d59d..d62b555dd8 100644
--- a/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args b/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args
index 5d5f0f2d08..a102348a55 100644
--- a/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args
index bc606a6b05..3f02a99c68 100644
--- a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.args b/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.args
index 5bbe1989d0..0224c16b8c 100644
--- a/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-virtio-device.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-device.x86_64-latest.args
index f5c837a104..24d742e3da 100644
--- a/tests/qemuxmlconfdata/net-virtio-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-device.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-virtio-disable-offloads.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-disable-offloads.x86_64-latest.args
index 1d625a1338..b5d0aa019b 100644
--- a/tests/qemuxmlconfdata/net-virtio-disable-offloads.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-disable-offloads.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-virtio-netdev.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-netdev.x86_64-latest.args
index e17069aedd..271a14e5b7 100644
--- a/tests/qemuxmlconfdata/net-virtio-netdev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-netdev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args
index 7c0e901f1d..e45b7b330e 100644
--- a/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-virtio-rss.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-rss.x86_64-latest.args
index 46853fe77f..632eb0de6a 100644
--- a/tests/qemuxmlconfdata/net-virtio-rss.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-rss.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-virtio-rxtxqueuesize.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-rxtxqueuesize.x86_64-latest.args
index 7268d180e9..b7b0dd2e0a 100644
--- a/tests/qemuxmlconfdata/net-virtio-rxtxqueuesize.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-rxtxqueuesize.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-virtio-teaming-hostdev.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-teaming-hostdev.x86_64-latest.args
index 4c18f4a53f..c61fee8896 100644
--- a/tests/qemuxmlconfdata/net-virtio-teaming-hostdev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-teaming-hostdev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args
index 0a55473d12..ffaf2aa911 100644
--- a/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-virtio-teaming.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-teaming.x86_64-latest.args
index 1f8876d7a8..08118890c4 100644
--- a/tests/qemuxmlconfdata/net-virtio-teaming.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-teaming.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args
index acbb8a53ec..da1c3a3d76 100644
--- a/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/net-virtio.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio.x86_64-latest.args
index 56f97699d2..a803756f5e 100644
--- a/tests/qemuxmlconfdata/net-virtio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/nosharepages.x86_64-latest.args b/tests/qemuxmlconfdata/nosharepages.x86_64-latest.args
index 0d91649703..67cfcd2d42 100644
--- a/tests/qemuxmlconfdata/nosharepages.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/nosharepages.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args b/tests/qemuxmlconfdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args
index 48122a005c..ca96b0fe74 100644
--- a/tests/qemuxmlconfdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args b/tests/qemuxmlconfdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args
index 48122a005c..ca96b0fe74 100644
--- a/tests/qemuxmlconfdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/numad-auto-vcpu-no-numatune.x86_64-latest.args b/tests/qemuxmlconfdata/numad-auto-vcpu-no-numatune.x86_64-latest.args
index 0b720d7f3e..d0ae6d36ec 100644
--- a/tests/qemuxmlconfdata/numad-auto-vcpu-no-numatune.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numad-auto-vcpu-no-numatune.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/numad-auto-vcpu-static-numatune.x86_64-latest.args b/tests/qemuxmlconfdata/numad-auto-vcpu-static-numatune.x86_64-latest.args
index cfcb747db1..99ea457d14 100644
--- a/tests/qemuxmlconfdata/numad-auto-vcpu-static-numatune.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numad-auto-vcpu-static-numatune.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/numad-static-memory-auto-vcpu.x86_64-latest.args b/tests/qemuxmlconfdata/numad-static-memory-auto-vcpu.x86_64-latest.args
index 48122a005c..ca96b0fe74 100644
--- a/tests/qemuxmlconfdata/numad-static-memory-auto-vcpu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numad-static-memory-auto-vcpu.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/numad-static-vcpu-no-numatune.x86_64-latest.args b/tests/qemuxmlconfdata/numad-static-vcpu-no-numatune.x86_64-latest.args
index 805bdda302..925b0c169d 100644
--- a/tests/qemuxmlconfdata/numad-static-vcpu-no-numatune.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numad-static-vcpu-no-numatune.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/numad.x86_64-latest.args b/tests/qemuxmlconfdata/numad.x86_64-latest.args
index 48122a005c..ca96b0fe74 100644
--- a/tests/qemuxmlconfdata/numad.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numad.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/numatune-auto-nodeset-invalid.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-auto-nodeset-invalid.x86_64-latest.args
index 490aa8b5a6..22ccb964c5 100644
--- a/tests/qemuxmlconfdata/numatune-auto-nodeset-invalid.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-auto-nodeset-invalid.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/numatune-auto-prefer.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-auto-prefer.x86_64-latest.args
index efeb509e22..4bad8edc32 100644
--- a/tests/qemuxmlconfdata/numatune-auto-prefer.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-auto-prefer.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/numatune-distances.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-distances.x86_64-latest.args
index cb10375116..a56e82d805 100644
--- a/tests/qemuxmlconfdata/numatune-distances.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-distances.x86_64-latest.args
@@ -69,7 +69,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/numatune-hmat-none.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-hmat-none.x86_64-latest.args
index afe6c8df24..bddd56b599 100644
--- a/tests/qemuxmlconfdata/numatune-hmat-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-hmat-none.x86_64-latest.args
@@ -38,7 +38,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/numatune-hmat.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-hmat.x86_64-latest.args
index c6f5d7195b..cbb2e6e716 100644
--- a/tests/qemuxmlconfdata/numatune-hmat.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-hmat.x86_64-latest.args
@@ -38,7 +38,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/numatune-memnode-no-memory.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-memnode-no-memory.x86_64-latest.args
index 8ba2a3bb1e..3e5abb92bc 100644
--- a/tests/qemuxmlconfdata/numatune-memnode-no-memory.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-memnode-no-memory.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/numatune-memnode-restrictive-mode.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-memnode-restrictive-mode.x86_64-latest.args
index a7062b5dd0..febf364389 100644
--- a/tests/qemuxmlconfdata/numatune-memnode-restrictive-mode.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-memnode-restrictive-mode.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/numatune-memnode.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-memnode.x86_64-latest.args
index 25809ac603..b4e4c5a88f 100644
--- a/tests/qemuxmlconfdata/numatune-memnode.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-memnode.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/numatune-no-vcpu.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-no-vcpu.x86_64-latest.args
index 26ce3e4054..dee932ecc6 100644
--- a/tests/qemuxmlconfdata/numatune-no-vcpu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-no-vcpu.x86_64-latest.args
@@ -33,7 +33,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/numatune-system-memory.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-system-memory.x86_64-latest.args
index 06d43dec48..44d86d08fe 100644
--- a/tests/qemuxmlconfdata/numatune-system-memory.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-system-memory.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args
index 14f0c2c595..98d69c41d4 100644
--- a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-dummy/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pages-dimm-discard.x86_64-latest.args b/tests/qemuxmlconfdata/pages-dimm-discard.x86_64-latest.args
index d28339fc23..bd34ed3dec 100644
--- a/tests/qemuxmlconfdata/pages-dimm-discard.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pages-dimm-discard.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fedora/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pages-discard-hugepages.x86_64-latest.args b/tests/qemuxmlconfdata/pages-discard-hugepages.x86_64-latest.args
index 1146ca7ee6..dc23b64fed 100644
--- a/tests/qemuxmlconfdata/pages-discard-hugepages.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pages-discard-hugepages.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-SomeDummyHugepagesGu/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pages-discard.x86_64-latest.args b/tests/qemuxmlconfdata/pages-discard.x86_64-latest.args
index 4545f5a0fa..3280738893 100644
--- a/tests/qemuxmlconfdata/pages-discard.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pages-discard.x86_64-latest.args
@@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/panic-double.x86_64-latest.args b/tests/qemuxmlconfdata/panic-double.x86_64-latest.args
index e8295a205f..9c5b3a7694 100644
--- a/tests/qemuxmlconfdata/panic-double.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/panic-double.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/panic-no-address.x86_64-latest.args b/tests/qemuxmlconfdata/panic-no-address.x86_64-latest.args
index edd542f688..eef32ef4d6 100644
--- a/tests/qemuxmlconfdata/panic-no-address.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/panic-no-address.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/panic.x86_64-latest.args b/tests/qemuxmlconfdata/panic.x86_64-latest.args
index e64717ba6c..60193d610c 100644
--- a/tests/qemuxmlconfdata/panic.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/panic.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/parallel-parport-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/parallel-parport-chardev.x86_64-latest.args
index cc60c2ba7e..fe9de2aeec 100644
--- a/tests/qemuxmlconfdata/parallel-parport-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/parallel-parport-chardev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/parallel-tcp-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/parallel-tcp-chardev.x86_64-latest.args
index cd8ca587a2..c20ebf65d4 100644
--- a/tests/qemuxmlconfdata/parallel-tcp-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/parallel-tcp-chardev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args
index 719b2cc062..e2fc26a81d 100644
--- a/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args
index 959bc9a2fe..a5eb79e294 100644
--- a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-i440fx/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.args b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.args
index 6418fae461..0017941a8a 100644
--- a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-i440fx/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pci-autoadd-addr.x86_64-latest.args b/tests/qemuxmlconfdata/pci-autoadd-addr.x86_64-latest.args
index 05fe35e50f..b12c3b4805 100644
--- a/tests/qemuxmlconfdata/pci-autoadd-addr.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-autoadd-addr.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pci-autoadd-idx.x86_64-latest.args b/tests/qemuxmlconfdata/pci-autoadd-idx.x86_64-latest.args
index 8733f1f61b..5a64b39553 100644
--- a/tests/qemuxmlconfdata/pci-autoadd-idx.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-autoadd-idx.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pci-autofill-addr.x86_64-latest.args b/tests/qemuxmlconfdata/pci-autofill-addr.x86_64-latest.args
index aed6f28244..efbd8dfcb8 100644
--- a/tests/qemuxmlconfdata/pci-autofill-addr.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-autofill-addr.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pci-bridge-many-disks.x86_64-latest.args b/tests/qemuxmlconfdata/pci-bridge-many-disks.x86_64-latest.args
index 0cde25cd1d..dbe0b8fc94 100644
--- a/tests/qemuxmlconfdata/pci-bridge-many-disks.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-bridge-many-disks.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-lots-of-disks/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pci-bridge.x86_64-latest.args b/tests/qemuxmlconfdata/pci-bridge.x86_64-latest.args
index 196d8bf362..181f2f5189 100644
--- a/tests/qemuxmlconfdata/pci-bridge.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-bridge.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pci-expander-bus.x86_64-latest.args b/tests/qemuxmlconfdata/pci-expander-bus.x86_64-latest.args
index 1a968c7b61..a2c4b685b9 100644
--- a/tests/qemuxmlconfdata/pci-expander-bus.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-expander-bus.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-expander-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pci-many.x86_64-latest.args b/tests/qemuxmlconfdata/pci-many.x86_64-latest.args
index c6ff7a88a3..0c075cd84b 100644
--- a/tests/qemuxmlconfdata/pci-many.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-many.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pci-rom-disabled.x86_64-latest.args b/tests/qemuxmlconfdata/pci-rom-disabled.x86_64-latest.args
index 965d27ddb2..008cdd0c79 100644
--- a/tests/qemuxmlconfdata/pci-rom-disabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-rom-disabled.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pci-rom.x86_64-latest.args b/tests/qemuxmlconfdata/pci-rom.x86_64-latest.args
index e2bd79ec0c..e2ebf2ecbf 100644
--- a/tests/qemuxmlconfdata/pci-rom.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-rom.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pci-serial-dev-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/pci-serial-dev-chardev.x86_64-latest.args
index e25117f2a8..2fa61399a8 100644
--- a/tests/qemuxmlconfdata/pci-serial-dev-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-serial-dev-chardev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pcie-expander-bus.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-expander-bus.x86_64-latest.args
index 960b200456..5e793f2515 100644
--- a/tests/qemuxmlconfdata/pcie-expander-bus.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcie-expander-bus.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pcie-root-port-model-generic.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-root-port-model-generic.x86_64-latest.args
index 4f04041b8a..1408313dde 100644
--- a/tests/qemuxmlconfdata/pcie-root-port-model-generic.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcie-root-port-model-generic.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pcie-root-port-model-ioh3420.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-root-port-model-ioh3420.x86_64-latest.args
index 8c74197be6..a8e05996ba 100644
--- a/tests/qemuxmlconfdata/pcie-root-port-model-ioh3420.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcie-root-port-model-ioh3420.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pcie-root-port-nohotplug.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-root-port-nohotplug.x86_64-latest.args
index 12ede653d7..a438d6c279 100644
--- a/tests/qemuxmlconfdata/pcie-root-port-nohotplug.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcie-root-port-nohotplug.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pcie-root-port.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-root-port.x86_64-latest.args
index 7fe61b07fc..4f6b027a96 100644
--- a/tests/qemuxmlconfdata/pcie-root-port.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcie-root-port.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pcie-root.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-root.x86_64-latest.args
index 258f19b119..d81fc7eda8 100644
--- a/tests/qemuxmlconfdata/pcie-root.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcie-root.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pcie-switch-downstream-port.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-switch-downstream-port.x86_64-latest.args
index 97b7e7d1e8..aa7d9b0a50 100644
--- a/tests/qemuxmlconfdata/pcie-switch-downstream-port.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcie-switch-downstream-port.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pcie-switch-upstream-port.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-switch-upstream-port.x86_64-latest.args
index fe3e5efde0..9b9c0ded5d 100644
--- a/tests/qemuxmlconfdata/pcie-switch-upstream-port.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcie-switch-upstream-port.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pcihole64-gib.x86_64-latest.args b/tests/qemuxmlconfdata/pcihole64-gib.x86_64-latest.args
index b10a8abb1b..41b90c198c 100644
--- a/tests/qemuxmlconfdata/pcihole64-gib.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcihole64-gib.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pcihole64-q35.x86_64-latest.args b/tests/qemuxmlconfdata/pcihole64-q35.x86_64-latest.args
index 2678f3a8e9..f5b5b1e4ba 100644
--- a/tests/qemuxmlconfdata/pcihole64-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcihole64-q35.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pcihole64.x86_64-latest.args b/tests/qemuxmlconfdata/pcihole64.x86_64-latest.args
index 7208dff53f..dea13032de 100644
--- a/tests/qemuxmlconfdata/pcihole64.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcihole64.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pmu-feature-off.x86_64-latest.args b/tests/qemuxmlconfdata/pmu-feature-off.x86_64-latest.args
index 8224afd641..b46da96cca 100644
--- a/tests/qemuxmlconfdata/pmu-feature-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pmu-feature-off.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pmu-feature.x86_64-latest.args b/tests/qemuxmlconfdata/pmu-feature.x86_64-latest.args
index 06a556b04a..b7156421e9 100644
--- a/tests/qemuxmlconfdata/pmu-feature.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pmu-feature.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pstore-acpi-erst.x86_64-latest.args b/tests/qemuxmlconfdata/pstore-acpi-erst.x86_64-latest.args
index a07af47b2f..a6a29230aa 100644
--- a/tests/qemuxmlconfdata/pstore-acpi-erst.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pstore-acpi-erst.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pv-spinlock-disabled.x86_64-latest.args b/tests/qemuxmlconfdata/pv-spinlock-disabled.x86_64-latest.args
index af47bb71f7..b9d9679083 100644
--- a/tests/qemuxmlconfdata/pv-spinlock-disabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pv-spinlock-disabled.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pv-spinlock-enabled.x86_64-latest.args b/tests/qemuxmlconfdata/pv-spinlock-enabled.x86_64-latest.args
index 0fdb3c7481..6abc84c538 100644
--- a/tests/qemuxmlconfdata/pv-spinlock-enabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pv-spinlock-enabled.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/pvpanic-pci-x86_64.x86_64-latest.args b/tests/qemuxmlconfdata/pvpanic-pci-x86_64.x86_64-latest.args
index c650f7c38c..ab0f3df750 100644
--- a/tests/qemuxmlconfdata/pvpanic-pci-x86_64.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pvpanic-pci-x86_64.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-latest.args b/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-latest.args
index 458efb7188..d5dcecd81a 100644
--- a/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/q35-multifunction.x86_64-latest.args b/tests/qemuxmlconfdata/q35-multifunction.x86_64-latest.args
index 45d20ff3ec..e663812a79 100644
--- a/tests/qemuxmlconfdata/q35-multifunction.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-multifunction.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/q35-pci-force-address.x86_64-latest.args b/tests/qemuxmlconfdata/q35-pci-force-address.x86_64-latest.args
index 9a10a484f6..b670e9ebbb 100644
--- a/tests/qemuxmlconfdata/q35-pci-force-address.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-pci-force-address.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-latest.args b/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-latest.args
index e478408ef7..2f46c4820d 100644
--- a/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/q35-pcie.x86_64-latest.args b/tests/qemuxmlconfdata/q35-pcie.x86_64-latest.args
index de392a1a89..3df8074349 100644
--- a/tests/qemuxmlconfdata/q35-pcie.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-pcie.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/q35-usb2-multi.x86_64-latest.args b/tests/qemuxmlconfdata/q35-usb2-multi.x86_64-latest.args
index 25d568ee78..50ef3ab8d3 100644
--- a/tests/qemuxmlconfdata/q35-usb2-multi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-usb2-multi.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/q35-usb2-reorder.x86_64-latest.args b/tests/qemuxmlconfdata/q35-usb2-reorder.x86_64-latest.args
index 95e3b11d41..77b03d5f12 100644
--- a/tests/qemuxmlconfdata/q35-usb2-reorder.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-usb2-reorder.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/q35-usb2.x86_64-latest.args b/tests/qemuxmlconfdata/q35-usb2.x86_64-latest.args
index 4d6ec71820..329df6d723 100644
--- a/tests/qemuxmlconfdata/q35-usb2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-usb2.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.args b/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.args
index b476bfe761..801cb44712 100644
--- a/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-virt-manager-basic/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/q35.x86_64-latest.args b/tests/qemuxmlconfdata/q35.x86_64-latest.args
index a3ce32772c..e605f05121 100644
--- a/tests/qemuxmlconfdata/q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -global ICH9-LPC.disable_s3=1 \
diff --git a/tests/qemuxmlconfdata/qemu-ns-alt.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns-alt.x86_64-latest.args
index 06ec76d1b3..4c425f506b 100644
--- a/tests/qemuxmlconfdata/qemu-ns-alt.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/qemu-ns-alt.x86_64-latest.args
@@ -24,7 +24,7 @@ BAR='' \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/qemu-ns-commandline-ns0.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns-commandline-ns0.x86_64-latest.args
index 8a19dac9c8..7e8b1998fb 100644
--- a/tests/qemuxmlconfdata/qemu-ns-commandline-ns0.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/qemu-ns-commandline-ns0.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/qemu-ns-commandline-ns1.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns-commandline-ns1.x86_64-latest.args
index 8a19dac9c8..7e8b1998fb 100644
--- a/tests/qemuxmlconfdata/qemu-ns-commandline-ns1.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/qemu-ns-commandline-ns1.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/qemu-ns-commandline.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns-commandline.x86_64-latest.args
index 8a19dac9c8..7e8b1998fb 100644
--- a/tests/qemuxmlconfdata/qemu-ns-commandline.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/qemu-ns-commandline.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/qemu-ns-domain-commandline-ns0.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns-domain-commandline-ns0.x86_64-latest.args
index 8a19dac9c8..7e8b1998fb 100644
--- a/tests/qemuxmlconfdata/qemu-ns-domain-commandline-ns0.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/qemu-ns-domain-commandline-ns0.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/qemu-ns-domain-commandline.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns-domain-commandline.x86_64-latest.args
index 8a19dac9c8..7e8b1998fb 100644
--- a/tests/qemuxmlconfdata/qemu-ns-domain-commandline.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/qemu-ns-domain-commandline.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/qemu-ns-domain-ns0.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns-domain-ns0.x86_64-latest.args
index 8a19dac9c8..7e8b1998fb 100644
--- a/tests/qemuxmlconfdata/qemu-ns-domain-ns0.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/qemu-ns-domain-ns0.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/qemu-ns-no-env.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns-no-env.x86_64-latest.args
index 1c624fa658..75c88ed7b4 100644
--- a/tests/qemuxmlconfdata/qemu-ns-no-env.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/qemu-ns-no-env.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/qemu-ns.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns.x86_64-latest.args
index 459950e911..cf60d1e591 100644
--- a/tests/qemuxmlconfdata/qemu-ns.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/qemu-ns.x86_64-latest.args
@@ -25,7 +25,7 @@ BAR='' \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/reboot-timeout-disabled.x86_64-latest.args b/tests/qemuxmlconfdata/reboot-timeout-disabled.x86_64-latest.args
index faf0da785f..6438fd4486 100644
--- a/tests/qemuxmlconfdata/reboot-timeout-disabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/reboot-timeout-disabled.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot reboot-timeout=-1,strict=on \
diff --git a/tests/qemuxmlconfdata/reboot-timeout-enabled.x86_64-latest.args b/tests/qemuxmlconfdata/reboot-timeout-enabled.x86_64-latest.args
index 605a6a7f7f..0cb87a508a 100644
--- a/tests/qemuxmlconfdata/reboot-timeout-enabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/reboot-timeout-enabled.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot reboot-timeout=128,strict=on \
diff --git a/tests/qemuxmlconfdata/restore-v2-fd.x86_64-latest.args b/tests/qemuxmlconfdata/restore-v2-fd.x86_64-latest.args
index 273eaddd6d..729784e9a9 100644
--- a/tests/qemuxmlconfdata/restore-v2-fd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/restore-v2-fd.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/restore-v2.x86_64-latest.args b/tests/qemuxmlconfdata/restore-v2.x86_64-latest.args
index 5cab2a5138..78f9befbf1 100644
--- a/tests/qemuxmlconfdata/restore-v2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/restore-v2.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/schema-reorder-domain-subelements.x86_64-latest.args b/tests/qemuxmlconfdata/schema-reorder-domain-subelements.x86_64-latest.args
index 5cc171d512..3cc56d9145 100644
--- a/tests/qemuxmlconfdata/schema-reorder-domain-subelements.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/schema-reorder-domain-subelements.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-passtvhostuu/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/seclabel-dac-none.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dac-none.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/seclabel-dac-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-dac-none.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/seclabel-device-multiple.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-device-multiple.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/seclabel-device-multiple.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-device-multiple.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/seclabel-dynamic-baselabel.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic-baselabel.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/seclabel-dynamic-baselabel.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-dynamic-baselabel.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/seclabel-dynamic-labelskip.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic-labelskip.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/seclabel-dynamic-labelskip.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-dynamic-labelskip.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/seclabel-dynamic-none-relabel.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic-none-relabel.x86_64-latest.args
index 8b6a26156d..c5a5279db3 100644
--- a/tests/qemuxmlconfdata/seclabel-dynamic-none-relabel.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-dynamic-none-relabel.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-migt10/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/seclabel-dynamic-none.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic-none.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/seclabel-dynamic-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-dynamic-none.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/seclabel-dynamic-override.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic-override.x86_64-latest.args
index 070683ac77..b5e889b463 100644
--- a/tests/qemuxmlconfdata/seclabel-dynamic-override.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-dynamic-override.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/seclabel-dynamic-relabel.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic-relabel.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/seclabel-dynamic-relabel.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-dynamic-relabel.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/seclabel-dynamic.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/seclabel-dynamic.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-dynamic.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/seclabel-none.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-none.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/seclabel-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-none.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/seclabel-selinux-none-override.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-selinux-none-override.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/seclabel-selinux-none-override.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-selinux-none-override.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/seclabel-static-labelskip.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-static-labelskip.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/seclabel-static-labelskip.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-static-labelskip.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/seclabel-static-relabel.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-static-relabel.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/seclabel-static-relabel.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-static-relabel.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/seclabel-static.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-static.x86_64-latest.args
index 689b636c57..84bb1b9c91 100644
--- a/tests/qemuxmlconfdata/seclabel-static.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-static.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/serial-debugcon.x86_64-latest.args b/tests/qemuxmlconfdata/serial-debugcon.x86_64-latest.args
index d4cd55756a..ddd4c5a616 100644
--- a/tests/qemuxmlconfdata/serial-debugcon.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-debugcon.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/serial-dev-chardev-iobase.x86_64-latest.args b/tests/qemuxmlconfdata/serial-dev-chardev-iobase.x86_64-latest.args
index 4f17962ad8..c1ce38c2d3 100644
--- a/tests/qemuxmlconfdata/serial-dev-chardev-iobase.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-dev-chardev-iobase.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/serial-dev-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-dev-chardev.x86_64-latest.args
index f652d91ee4..743ccaa068 100644
--- a/tests/qemuxmlconfdata/serial-dev-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-dev-chardev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args
index b59e693928..0ea33c1305 100644
--- a/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args b/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args
index 17a1eeb098..9b3e37aba4 100644
--- a/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args
index 59a8f2369b..974eed2c56 100644
--- a/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/serial-pty-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-pty-chardev.x86_64-latest.args
index b49d6ed233..0db93d6d95 100644
--- a/tests/qemuxmlconfdata/serial-pty-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-pty-chardev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/serial-spiceport.x86_64-latest.args b/tests/qemuxmlconfdata/serial-spiceport.x86_64-latest.args
index d1110f5ffd..f8260ba18e 100644
--- a/tests/qemuxmlconfdata/serial-spiceport.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-spiceport.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/serial-target-port-auto.x86_64-latest.args b/tests/qemuxmlconfdata/serial-target-port-auto.x86_64-latest.args
index 64173810ea..0671ccb674 100644
--- a/tests/qemuxmlconfdata/serial-target-port-auto.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-target-port-auto.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/serial-tcp-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-tcp-chardev.x86_64-latest.args
index d06f18055e..49dbe1da4d 100644
--- a/tests/qemuxmlconfdata/serial-tcp-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-tcp-chardev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/serial-tcp-telnet-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-tcp-telnet-chardev.x86_64-latest.args
index ac1af3a533..fd5e5405ec 100644
--- a/tests/qemuxmlconfdata/serial-tcp-telnet-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-tcp-telnet-chardev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.args b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.args
index d46be03c01..3fcedd75db 100644
--- a/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-verify.x86_64-latest.args b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-verify.x86_64-latest.args
index fa87b76d78..a8b0cedfe4 100644
--- a/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-verify.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-verify.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev.x86_64-latest.args
index fa87b76d78..a8b0cedfe4 100644
--- a/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest.args
index d127cc4ecf..47d3766f3e 100644
--- a/tests/qemuxmlconfdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/serial-udp-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-udp-chardev.x86_64-latest.args
index b36d4ddddf..64f166249b 100644
--- a/tests/qemuxmlconfdata/serial-udp-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-udp-chardev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args
index abb68a8d49..8c207ba07f 100644
--- a/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/serial-vc-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-vc-chardev.x86_64-latest.args
index e5355f6040..865cc6838f 100644
--- a/tests/qemuxmlconfdata/serial-vc-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-vc-chardev.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/shmem-plain-doorbell.x86_64-latest.args b/tests/qemuxmlconfdata/shmem-plain-doorbell.x86_64-latest.args
index c68e42d014..c2d28a6e25 100644
--- a/tests/qemuxmlconfdata/shmem-plain-doorbell.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/shmem-plain-doorbell.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/smartcard-controller.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-controller.x86_64-latest.args
index 0959020464..3876f79d89 100644
--- a/tests/qemuxmlconfdata/smartcard-controller.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smartcard-controller.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/smartcard-host-certificates-database.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-host-certificates-database.x86_64-latest.args
index c4f04d5736..5fdd1704e8 100644
--- a/tests/qemuxmlconfdata/smartcard-host-certificates-database.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smartcard-host-certificates-database.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/smartcard-host-certificates.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-host-certificates.x86_64-latest.args
index bd3a94aaf3..c659e83735 100644
--- a/tests/qemuxmlconfdata/smartcard-host-certificates.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smartcard-host-certificates.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/smartcard-host.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-host.x86_64-latest.args
index 0959020464..3876f79d89 100644
--- a/tests/qemuxmlconfdata/smartcard-host.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smartcard-host.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/smartcard-passthrough-spicevmc.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-passthrough-spicevmc.x86_64-latest.args
index 2177b6f6cc..1f8585b546 100644
--- a/tests/qemuxmlconfdata/smartcard-passthrough-spicevmc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smartcard-passthrough-spicevmc.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/smartcard-passthrough-tcp.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-passthrough-tcp.x86_64-latest.args
index c495083dde..5fcea1f864 100644
--- a/tests/qemuxmlconfdata/smartcard-passthrough-tcp.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smartcard-passthrough-tcp.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args
index ca1fd472c3..5b41a08819 100644
--- a/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/smbios-type-fwcfg.x86_64-latest.args b/tests/qemuxmlconfdata/smbios-type-fwcfg.x86_64-latest.args
index 85037b665e..17fdea275d 100644
--- a/tests/qemuxmlconfdata/smbios-type-fwcfg.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smbios-type-fwcfg.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/smbios.x86_64-latest.args b/tests/qemuxmlconfdata/smbios.x86_64-latest.args
index eac754934f..f321ff4374 100644
--- a/tests/qemuxmlconfdata/smbios.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smbios.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/sound-device-virtio.x86_64-latest.args b/tests/qemuxmlconfdata/sound-device-virtio.x86_64-latest.args
index 128e09de9f..83aa07540e 100644
--- a/tests/qemuxmlconfdata/sound-device-virtio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/sound-device-virtio.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/sound-device.x86_64-latest.args b/tests/qemuxmlconfdata/sound-device.x86_64-latest.args
index adfd33395e..e82d7f1dd1 100644
--- a/tests/qemuxmlconfdata/sound-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/sound-device.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args b/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args
index 156683c5a0..2a9229f3f6 100644
--- a/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args b/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args
index f66842a89d..3b36e2f6ce 100644
--- a/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/throttlefilter.x86_64-latest.args b/tests/qemuxmlconfdata/throttlefilter.x86_64-latest.args
index a49915f69d..c5e74db660 100644
--- a/tests/qemuxmlconfdata/throttlefilter.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/throttlefilter.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.args
index ab982e5ef3..4b3600a12d 100644
--- a/tests/qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args
index 868c59fbb9..5a74e1e519 100644
--- a/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args
index 868c59fbb9..5a74e1e519 100644
--- a/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args
index 868c59fbb9..5a74e1e519 100644
--- a/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args
index 868c59fbb9..5a74e1e519 100644
--- a/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args
index c5b4198d38..90e6df68fe 100644
--- a/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args
index 856bdb03aa..62042c55ac 100644
--- a/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args
index 42738cf4ea..3f21f09ee0 100644
--- a/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args b/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args
index 8e53f8388c..afecf59a10 100644
--- a/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-i440fx.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-i440fx.x86_64-latest.args
index a08dae37e7..ff98ea4b3b 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-i440fx.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-i440fx.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-isapc.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-isapc.x86_64-latest.args
index b39522b193..66fa22f0ae 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-isapc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-isapc.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-microvm.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-microvm.x86_64-latest.args
index e5a1550c66..22b3b7943f 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-microvm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-microvm.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-q35.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-q35.x86_64-latest.args
index 108e66bb44..4972ee4e55 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-q35.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-q35.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-q35.x86_64-latest.args
index 772fc92764..63d86062cf 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-q35.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.args
index a08dae37e7..ff98ea4b3b 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-q35.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-q35.x86_64-latest.args
index 29a8a8f251..a57631c862 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-q35.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.args
index d6201c5380..e933593617 100644
--- a/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.args
index 9d8f457b1a..2269218081 100644
--- a/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-latest.args
index 3090e9388f..dbc019dbfe 100644
--- a/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-controller-nec-xhci-autoassign.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-nec-xhci-autoassign.x86_64-latest.args
index fc2bfd5144..4ff158583a 100644
--- a/tests/qemuxmlconfdata/usb-controller-nec-xhci-autoassign.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-nec-xhci-autoassign.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-controller-nec-xhci.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-nec-xhci.x86_64-latest.args
index 303a2f791f..c4448d4748 100644
--- a/tests/qemuxmlconfdata/usb-controller-nec-xhci.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-nec-xhci.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.args
index a08dae37e7..ff98ea4b3b 100644
--- a/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-controller-qemu-xhci.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-qemu-xhci.x86_64-latest.args
index 8f471e15b5..ae35a78262 100644
--- a/tests/qemuxmlconfdata/usb-controller-qemu-xhci.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-qemu-xhci.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-hub-autoadd-deluxe.x86_64-latest.args b/tests/qemuxmlconfdata/usb-hub-autoadd-deluxe.x86_64-latest.args
index 55d7d9e96c..21edc49b73 100644
--- a/tests/qemuxmlconfdata/usb-hub-autoadd-deluxe.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-hub-autoadd-deluxe.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-hub-autoadd.x86_64-latest.args b/tests/qemuxmlconfdata/usb-hub-autoadd.x86_64-latest.args
index c388433db7..ef9eb8f186 100644
--- a/tests/qemuxmlconfdata/usb-hub-autoadd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-hub-autoadd.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-hub.x86_64-latest.args b/tests/qemuxmlconfdata/usb-hub.x86_64-latest.args
index c8cb25adcb..fa82ac2ffe 100644
--- a/tests/qemuxmlconfdata/usb-hub.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-hub.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-long-port-path.x86_64-latest.args b/tests/qemuxmlconfdata/usb-long-port-path.x86_64-latest.args
index 65450eeb87..12c524af65 100644
--- a/tests/qemuxmlconfdata/usb-long-port-path.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-long-port-path.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-none.x86_64-latest.args b/tests/qemuxmlconfdata/usb-none.x86_64-latest.args
index 9f1fc86dcd..b66244e942 100644
--- a/tests/qemuxmlconfdata/usb-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-none.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-port-autoassign.x86_64-latest.args b/tests/qemuxmlconfdata/usb-port-autoassign.x86_64-latest.args
index b2f1b19903..d87efcce77 100644
--- a/tests/qemuxmlconfdata/usb-port-autoassign.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-port-autoassign.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-port-missing.x86_64-latest.args b/tests/qemuxmlconfdata/usb-port-missing.x86_64-latest.args
index b81c3e6ae3..0b32919dbc 100644
--- a/tests/qemuxmlconfdata/usb-port-missing.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-port-missing.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-ports.x86_64-latest.args b/tests/qemuxmlconfdata/usb-ports.x86_64-latest.args
index c42e3b825a..de6c7e1fe1 100644
--- a/tests/qemuxmlconfdata/usb-ports.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-ports.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-redir-boot.x86_64-latest.args b/tests/qemuxmlconfdata/usb-redir-boot.x86_64-latest.args
index 34cf5b6658..a3e7004c47 100644
--- a/tests/qemuxmlconfdata/usb-redir-boot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-redir-boot.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-redir-filter-version.x86_64-latest.args b/tests/qemuxmlconfdata/usb-redir-filter-version.x86_64-latest.args
index 839db22f12..2e598bb8b5 100644
--- a/tests/qemuxmlconfdata/usb-redir-filter-version.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-redir-filter-version.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-redir-filter.x86_64-latest.args b/tests/qemuxmlconfdata/usb-redir-filter.x86_64-latest.args
index a811ca0e09..5152f7c6d4 100644
--- a/tests/qemuxmlconfdata/usb-redir-filter.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-redir-filter.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args b/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args
index 9be7acf12e..69f9c7cd76 100644
--- a/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb-redir.x86_64-latest.args b/tests/qemuxmlconfdata/usb-redir.x86_64-latest.args
index a9e7332d12..94132f2668 100644
--- a/tests/qemuxmlconfdata/usb-redir.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-redir.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/usb1-usb2.x86_64-latest.args b/tests/qemuxmlconfdata/usb1-usb2.x86_64-latest.args
index 7f196528fc..20952c59a3 100644
--- a/tests/qemuxmlconfdata/usb1-usb2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb1-usb2.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/user-aliases-usb.x86_64-latest.args b/tests/qemuxmlconfdata/user-aliases-usb.x86_64-latest.args
index ffc95850fb..478750c649 100644
--- a/tests/qemuxmlconfdata/user-aliases-usb.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/user-aliases-usb.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-gentoo/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -global PIIX4_PM.disable_s3=0 \
diff --git a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args b/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args
index bd48634c40..fd806491c3 100644
--- a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-gentoo/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -global PIIX4_PM.disable_s3=0 \
diff --git a/tests/qemuxmlconfdata/user-aliases2.x86_64-latest.args b/tests/qemuxmlconfdata/user-aliases2.x86_64-latest.args
index 139df16e0c..3922e958a2 100644
--- a/tests/qemuxmlconfdata/user-aliases2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/user-aliases2.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/vcpu-placement-static.x86_64-latest.args b/tests/qemuxmlconfdata/vcpu-placement-static.x86_64-latest.args
index 239c7b494a..c7c8d8ff29 100644
--- a/tests/qemuxmlconfdata/vcpu-placement-static.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vcpu-placement-static.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-dummy2/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/vhost-user-fs-fd-memory.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-user-fs-fd-memory.x86_64-latest.args
index 967ae0a962..18c16939be 100644
--- a/tests/qemuxmlconfdata/vhost-user-fs-fd-memory.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-user-fs-fd-memory.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/vhost-user-fs-fd-openfiles.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-user-fs-fd-openfiles.x86_64-latest.args
index ac42fda09a..4f6cd9ee82 100644
--- a/tests/qemuxmlconfdata/vhost-user-fs-fd-openfiles.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-user-fs-fd-openfiles.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.args
index 32a48fa840..3dd8355753 100644
--- a/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/vhost-user-fs-readonly.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-user-fs-readonly.x86_64-latest.args
index 967ae0a962..18c16939be 100644
--- a/tests/qemuxmlconfdata/vhost-user-fs-readonly.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-user-fs-readonly.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/vhost-user-fs-sock.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-user-fs-sock.x86_64-latest.args
index 136da432dd..1a3487962e 100644
--- a/tests/qemuxmlconfdata/vhost-user-fs-sock.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-user-fs-sock.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.args
index 7e684d2965..b37a58e240 100644
--- a/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args
index 59ce629b40..e177468a43 100644
--- a/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args
index ff42814fb3..9c9b59ed0f 100644
--- a/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args
index 49dc0f85b1..9090ac072a 100644
--- a/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot menu=on,strict=on \
diff --git a/tests/qemuxmlconfdata/video-bochs-display-device.x86_64-latest.args b/tests/qemuxmlconfdata/video-bochs-display-device.x86_64-latest.args
index 97921f0414..1b0fbb12b0 100644
--- a/tests/qemuxmlconfdata/video-bochs-display-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-bochs-display-device.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-bochs-edid-none.x86_64-latest.args b/tests/qemuxmlconfdata/video-bochs-edid-none.x86_64-latest.args
index da3dfcd166..6046526c90 100644
--- a/tests/qemuxmlconfdata/video-bochs-edid-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-bochs-edid-none.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-bochs-edid-off.x86_64-latest.args b/tests/qemuxmlconfdata/video-bochs-edid-off.x86_64-latest.args
index e4c5ac43e8..879e79a38f 100644
--- a/tests/qemuxmlconfdata/video-bochs-edid-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-bochs-edid-off.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-bochs-edid-on.x86_64-latest.args b/tests/qemuxmlconfdata/video-bochs-edid-on.x86_64-latest.args
index ff8e263b6d..381220f539 100644
--- a/tests/qemuxmlconfdata/video-bochs-edid-on.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-bochs-edid-on.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-device-pciaddr-default.x86_64-latest.args b/tests/qemuxmlconfdata/video-device-pciaddr-default.x86_64-latest.args
index ff124bf000..9142416630 100644
--- a/tests/qemuxmlconfdata/video-device-pciaddr-default.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-device-pciaddr-default.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-none-device.x86_64-latest.args b/tests/qemuxmlconfdata/video-none-device.x86_64-latest.args
index 94c269df53..a5e8e550c5 100644
--- a/tests/qemuxmlconfdata/video-none-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-none-device.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-qxl-device-vgamem.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-device-vgamem.x86_64-latest.args
index 8d1453ccba..2d50414f27 100644
--- a/tests/qemuxmlconfdata/video-qxl-device-vgamem.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-qxl-device-vgamem.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-qxl-device-vram64.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-device-vram64.x86_64-latest.args
index 635fe95fae..822b159ab4 100644
--- a/tests/qemuxmlconfdata/video-qxl-device-vram64.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-qxl-device-vram64.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-qxl-device.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-device.x86_64-latest.args
index 8d1453ccba..2d50414f27 100644
--- a/tests/qemuxmlconfdata/video-qxl-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-qxl-device.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-qxl-heads.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-heads.x86_64-latest.args
index 87887998ac..37022fff30 100644
--- a/tests/qemuxmlconfdata/video-qxl-heads.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-qxl-heads.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-qxl-noheads.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-noheads.x86_64-latest.args
index c00f4452e2..9fce0e4a3f 100644
--- a/tests/qemuxmlconfdata/video-qxl-noheads.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-qxl-noheads.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-qxl-resolution.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-resolution.x86_64-latest.args
index 5a61a41593..bfdfdedc05 100644
--- a/tests/qemuxmlconfdata/video-qxl-resolution.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-qxl-resolution.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-qxl-sec-device-vgamem.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-sec-device-vgamem.x86_64-latest.args
index 7385968638..2c13de712d 100644
--- a/tests/qemuxmlconfdata/video-qxl-sec-device-vgamem.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-qxl-sec-device-vgamem.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-qxl-sec-device-vram64.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-sec-device-vram64.x86_64-latest.args
index 80ad486061..1ff5fb24bf 100644
--- a/tests/qemuxmlconfdata/video-qxl-sec-device-vram64.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-qxl-sec-device-vram64.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-qxl-sec-device.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-sec-device.x86_64-latest.args
index 7385968638..2c13de712d 100644
--- a/tests/qemuxmlconfdata/video-qxl-sec-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-qxl-sec-device.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-ramfb-display-device.x86_64-latest.args b/tests/qemuxmlconfdata/video-ramfb-display-device.x86_64-latest.args
index cfbbd5c921..6fba2b37cb 100644
--- a/tests/qemuxmlconfdata/video-ramfb-display-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-ramfb-display-device.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-vga-device-vgamem.x86_64-latest.args b/tests/qemuxmlconfdata/video-vga-device-vgamem.x86_64-latest.args
index 400b39104b..0014b84f3b 100644
--- a/tests/qemuxmlconfdata/video-vga-device-vgamem.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-vga-device-vgamem.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-vga-device.x86_64-latest.args b/tests/qemuxmlconfdata/video-vga-device.x86_64-latest.args
index 400b39104b..0014b84f3b 100644
--- a/tests/qemuxmlconfdata/video-vga-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-vga-device.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-vga-edid-none.x86_64-latest.args b/tests/qemuxmlconfdata/video-vga-edid-none.x86_64-latest.args
index 29487e9e50..d62d35efbb 100644
--- a/tests/qemuxmlconfdata/video-vga-edid-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-vga-edid-none.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-vga-edid-off.x86_64-latest.args b/tests/qemuxmlconfdata/video-vga-edid-off.x86_64-latest.args
index f3481bae44..30416079b6 100644
--- a/tests/qemuxmlconfdata/video-vga-edid-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-vga-edid-off.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-vga-edid-on.x86_64-latest.args b/tests/qemuxmlconfdata/video-vga-edid-on.x86_64-latest.args
index 4fb0d7477b..19c825aee3 100644
--- a/tests/qemuxmlconfdata/video-vga-edid-on.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-vga-edid-on.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-vga-qxl-heads.x86_64-latest.args b/tests/qemuxmlconfdata/video-vga-qxl-heads.x86_64-latest.args
index 87887998ac..37022fff30 100644
--- a/tests/qemuxmlconfdata/video-vga-qxl-heads.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-vga-qxl-heads.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-virtio-blob-off.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-blob-off.x86_64-latest.args
index daeb7c64dc..a7b0c0988d 100644
--- a/tests/qemuxmlconfdata/video-virtio-blob-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-blob-off.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-virtio-blob-on.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-blob-on.x86_64-latest.args
index a9cea4fb41..9c768c0cc2 100644
--- a/tests/qemuxmlconfdata/video-virtio-blob-on.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-blob-on.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-virtio-edid-none.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-edid-none.x86_64-latest.args
index 05a522bd13..8e819e40a8 100644
--- a/tests/qemuxmlconfdata/video-virtio-edid-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-edid-none.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-virtio-edid-off.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-edid-off.x86_64-latest.args
index 576803a41f..5d12dad6ea 100644
--- a/tests/qemuxmlconfdata/video-virtio-edid-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-edid-off.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-virtio-edid-on.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-edid-on.x86_64-latest.args
index e7bd9401be..fc861e15ce 100644
--- a/tests/qemuxmlconfdata/video-virtio-edid-on.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-edid-on.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-virtio-gpu-device.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-gpu-device.x86_64-latest.args
index 74b64b3c91..8a7c6419c4 100644
--- a/tests/qemuxmlconfdata/video-virtio-gpu-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-gpu-device.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-virtio-gpu-sdl-gl.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-gpu-sdl-gl.x86_64-latest.args
index 1acbc159f1..4e5f9eebc8 100644
--- a/tests/qemuxmlconfdata/video-virtio-gpu-sdl-gl.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-gpu-sdl-gl.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-virtio-gpu-secondary.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-gpu-secondary.x86_64-latest.args
index 67c9c4fcbb..edcb034986 100644
--- a/tests/qemuxmlconfdata/video-virtio-gpu-secondary.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-gpu-secondary.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-virtio-gpu-spice-gl.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-gpu-spice-gl.x86_64-latest.args
index 5224433d91..c82fa4016b 100644
--- a/tests/qemuxmlconfdata/video-virtio-gpu-spice-gl.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-gpu-spice-gl.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-virtio-gpu-virgl.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-gpu-virgl.x86_64-latest.args
index d7e683a734..dfeb93b0cd 100644
--- a/tests/qemuxmlconfdata/video-virtio-gpu-virgl.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-gpu-virgl.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-virtio-vga-device-downgrade.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-vga-device-downgrade.x86_64-latest.args
index 34d0ab7ce1..0ca3eb3436 100644
--- a/tests/qemuxmlconfdata/video-virtio-vga-device-downgrade.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-vga-device-downgrade.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.QEMU_CAPS_VIRTIO_GPU_GL_PCI-disabled.args b/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.QEMU_CAPS_VIRTIO_GPU_GL_PCI-disabled.args
index cd19fd5d17..d47e9c56b4 100644
--- a/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.QEMU_CAPS_VIRTIO_GPU_GL_PCI-disabled.args
+++ b/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.QEMU_CAPS_VIRTIO_GPU_GL_PCI-disabled.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.QEMU_CAPS_VIRTIO_VGA_GL-disabled-ABI_UPDATE.args b/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.QEMU_CAPS_VIRTIO_VGA_GL-disabled-ABI_UPDATE.args
index 1171a862d7..6db6db2f49 100644
--- a/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.QEMU_CAPS_VIRTIO_VGA_GL-disabled-ABI_UPDATE.args
+++ b/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.QEMU_CAPS_VIRTIO_VGA_GL-disabled-ABI_UPDATE.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.QEMU_CAPS_VIRTIO_VGA_GL-disabled.args b/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.QEMU_CAPS_VIRTIO_VGA_GL-disabled.args
index c84e9ee9a2..47cbebab08 100644
--- a/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.QEMU_CAPS_VIRTIO_VGA_GL-disabled.args
+++ b/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.QEMU_CAPS_VIRTIO_VGA_GL-disabled.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.args
index d9096cfc1b..a5fad81322 100644
--- a/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.QEMU_CAPS_DEVICE_VIRTIO_VGA-disabled.args b/tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.QEMU_CAPS_DEVICE_VIRTIO_VGA-disabled.args
index 34d0ab7ce1..0ca3eb3436 100644
--- a/tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.QEMU_CAPS_DEVICE_VIRTIO_VGA-disabled.args
+++ b/tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.QEMU_CAPS_DEVICE_VIRTIO_VGA-disabled.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.args
index 74b64b3c91..8a7c6419c4 100644
--- a/tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-9p-createmode.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-9p-createmode.x86_64-latest.args
index c9499b2098..fe9becefdd 100644
--- a/tests/qemuxmlconfdata/virtio-9p-createmode.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-9p-createmode.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-9p-multidevs.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-9p-multidevs.x86_64-latest.args
index 2c3584a99e..bcdd817c31 100644
--- a/tests/qemuxmlconfdata/virtio-9p-multidevs.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-9p-multidevs.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-input-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-input-passthrough.x86_64-latest.args
index 04c8a29191..bd03ae63ac 100644
--- a/tests/qemuxmlconfdata/virtio-input-passthrough.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-input-passthrough.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-input.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-input.x86_64-latest.args
index 02afdf6506..29ea162e95 100644
--- a/tests/qemuxmlconfdata/virtio-input.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-input.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-iommu-x86_64.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-iommu-x86_64.x86_64-latest.args
index 7706aa3905..71f6e3bb72 100644
--- a/tests/qemuxmlconfdata/virtio-iommu-x86_64.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-iommu-x86_64.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args
index aab6118333..31d2740dbe 100644
--- a/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-controller-ats.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-controller-ats.x86_64-latest.args
index 1723c24d04..c9646127cf 100644
--- a/tests/qemuxmlconfdata/virtio-options-controller-ats.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-controller-ats.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-controller-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-controller-iommu.x86_64-latest.args
index a55ff345a3..3be6a9c18f 100644
--- a/tests/qemuxmlconfdata/virtio-options-controller-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-controller-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-controller-packed.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-controller-packed.x86_64-latest.args
index 644283b585..9b7e0046d6 100644
--- a/tests/qemuxmlconfdata/virtio-options-controller-packed.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-controller-packed.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-disk-ats.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-disk-ats.x86_64-latest.args
index 58750eb659..1bfb6aaf8d 100644
--- a/tests/qemuxmlconfdata/virtio-options-disk-ats.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-disk-ats.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-disk-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-disk-iommu.x86_64-latest.args
index 42eace3f23..bec04b1c92 100644
--- a/tests/qemuxmlconfdata/virtio-options-disk-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-disk-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-disk-packed.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-disk-packed.x86_64-latest.args
index ac6e4badaa..69ee5c02a1 100644
--- a/tests/qemuxmlconfdata/virtio-options-disk-packed.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-disk-packed.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-fs-ats.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-fs-ats.x86_64-latest.args
index eb9d3b0fdb..016ec22ed1 100644
--- a/tests/qemuxmlconfdata/virtio-options-fs-ats.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-fs-ats.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-fs-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-fs-iommu.x86_64-latest.args
index 6d43517b23..93779d6629 100644
--- a/tests/qemuxmlconfdata/virtio-options-fs-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-fs-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-fs-packed.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-fs-packed.x86_64-latest.args
index 11e366d2b0..efc31cd541 100644
--- a/tests/qemuxmlconfdata/virtio-options-fs-packed.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-fs-packed.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-input-ats.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-input-ats.x86_64-latest.args
index 93a7219ac1..f9dd195f07 100644
--- a/tests/qemuxmlconfdata/virtio-options-input-ats.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-input-ats.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-input-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-input-iommu.x86_64-latest.args
index c41bad1d36..09b04cda55 100644
--- a/tests/qemuxmlconfdata/virtio-options-input-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-input-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-input-packed.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-input-packed.x86_64-latest.args
index 83b6d4dd8a..41d1f1e21a 100644
--- a/tests/qemuxmlconfdata/virtio-options-input-packed.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-input-packed.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-memballoon-ats.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-memballoon-ats.x86_64-latest.args
index 23fad7b10e..90f3227af9 100644
--- a/tests/qemuxmlconfdata/virtio-options-memballoon-ats.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-memballoon-ats.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args
index 3506eff224..f2ec040db2 100644
--- a/tests/qemuxmlconfdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-memballoon-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-memballoon-iommu.x86_64-latest.args
index b1e3b366f5..833261d549 100644
--- a/tests/qemuxmlconfdata/virtio-options-memballoon-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-memballoon-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-memballoon-packed.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-memballoon-packed.x86_64-latest.args
index 61ca7f73a9..b1d39ab5cd 100644
--- a/tests/qemuxmlconfdata/virtio-options-memballoon-packed.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-memballoon-packed.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-net-ats.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-net-ats.x86_64-latest.args
index 65cc6f259e..f8615b8637 100644
--- a/tests/qemuxmlconfdata/virtio-options-net-ats.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-net-ats.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-net-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-net-iommu.x86_64-latest.args
index efd2c923ad..124b3cb0fd 100644
--- a/tests/qemuxmlconfdata/virtio-options-net-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-net-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-net-packed.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-net-packed.x86_64-latest.args
index 38f5c91de9..eed86230b6 100644
--- a/tests/qemuxmlconfdata/virtio-options-net-packed.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-net-packed.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-rng-ats.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-rng-ats.x86_64-latest.args
index f6b71bca40..1d1e34f108 100644
--- a/tests/qemuxmlconfdata/virtio-options-rng-ats.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-rng-ats.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-rng-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-rng-iommu.x86_64-latest.args
index d594c67210..e10d9ac5d0 100644
--- a/tests/qemuxmlconfdata/virtio-options-rng-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-rng-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-rng-packed.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-rng-packed.x86_64-latest.args
index 5aa1fb79b1..ce37dc70b2 100644
--- a/tests/qemuxmlconfdata/virtio-options-rng-packed.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-rng-packed.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.args
index 7d9f9832c0..cc655f90e6 100644
--- a/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.args
index eb335a43be..d4776e3137 100644
--- a/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.args
index aa4f382525..5c1b4b27f9 100644
--- a/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args
index 28a8fd0f03..53ab789f65 100644
--- a/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-latest.args
index 83d1fa30be..f12485d4e7 100644
--- a/tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-rng-default.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-rng-default.x86_64-latest.args
index 8f0ca84d04..1376b63d4c 100644
--- a/tests/qemuxmlconfdata/virtio-rng-default.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-rng-default.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args
index ca4685b733..afe4cf14d2 100644
--- a/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-rng-egd.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-rng-egd.x86_64-latest.args
index a570b2a865..deaffd889b 100644
--- a/tests/qemuxmlconfdata/virtio-rng-egd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-rng-egd.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-rng-multiple.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-rng-multiple.x86_64-latest.args
index 1b884c93d2..ac26a662d9 100644
--- a/tests/qemuxmlconfdata/virtio-rng-multiple.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-rng-multiple.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-rng-random.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-rng-random.x86_64-latest.args
index 76463ca9d5..9f78d1b4c5 100644
--- a/tests/qemuxmlconfdata/virtio-rng-random.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-rng-random.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args
index 68ba7377e2..52ab060ced 100644
--- a/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/vmcoreinfo.x86_64-latest.args b/tests/qemuxmlconfdata/vmcoreinfo.x86_64-latest.args
index ec60e9764c..9ec102e880 100644
--- a/tests/qemuxmlconfdata/vmcoreinfo.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vmcoreinfo.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/watchdog-device.x86_64-latest.args b/tests/qemuxmlconfdata/watchdog-device.x86_64-latest.args
index 9854a4f64f..e601eff006 100644
--- a/tests/qemuxmlconfdata/watchdog-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/watchdog-device.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/watchdog-dump.x86_64-latest.args b/tests/qemuxmlconfdata/watchdog-dump.x86_64-latest.args
index f010299994..5187edef3f 100644
--- a/tests/qemuxmlconfdata/watchdog-dump.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/watchdog-dump.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/watchdog-injectnmi.x86_64-latest.args b/tests/qemuxmlconfdata/watchdog-injectnmi.x86_64-latest.args
index 56329a57c9..5c50bdabc0 100644
--- a/tests/qemuxmlconfdata/watchdog-injectnmi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/watchdog-injectnmi.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/watchdog-q35-multiple.x86_64-latest.args b/tests/qemuxmlconfdata/watchdog-q35-multiple.x86_64-latest.args
index fe45a52e60..d950114580 100644
--- a/tests/qemuxmlconfdata/watchdog-q35-multiple.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/watchdog-q35-multiple.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/watchdog.x86_64-latest.args b/tests/qemuxmlconfdata/watchdog.x86_64-latest.args
index d53cb5b4eb..35ac7aae0e 100644
--- a/tests/qemuxmlconfdata/watchdog.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/watchdog.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/x86-kvm-32-on-64.x86_64-latest.args b/tests/qemuxmlconfdata/x86-kvm-32-on-64.x86_64-latest.args
index 5cbcc96cea..4997c3ee90 100644
--- a/tests/qemuxmlconfdata/x86-kvm-32-on-64.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86-kvm-32-on-64.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-kvm/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.args
index 86670453d6..e5b528d684 100644
--- a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.args
index 5a723d870a..c12cc8c1f7 100644
--- a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-features.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-features.x86_64-latest.args
index 8166955cfa..e04029c038 100644
--- a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-features.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-features.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.args
index d998826d94..6dc83ca634 100644
--- a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.args
index be243e911f..cb9503ec28 100644
--- a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.abi-update.args b/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.abi-update.args
index 06a0622f98..6a44de73ca 100644
--- a/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.abi-update.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.args
index 06a0622f98..6a44de73ca 100644
--- a/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args
index 1815c86f40..875e4e8604 100644
--- a/tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.args
index 3cae322027..90adddfd56 100644
--- a/tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.abi-update.args b/tests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.abi-update.args
index 9147e03d05..521efc8c59 100644
--- a/tests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.abi-update.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.args
index 9147e03d05..521efc8c59 100644
--- a/tests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.abi-update.args b/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.abi-update.args
index 79e4fe78ee..9e700d46ea 100644
--- a/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.abi-update.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.args
index 79e4fe78ee..9e700d46ea 100644
--- a/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args
index 360d4628a0..6511366ec4 100644
--- a/tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.args
index 96f98a12a2..49ef77b66e 100644
--- a/tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.abi-update.args b/tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.abi-update.args
index 3003a120ca..12399aed03 100644
--- a/tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.abi-update.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
diff --git a/tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.args
index 3003a120ca..12399aed03 100644
--- a/tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
+-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
-- 
2.54.0

    