[PATCH 13/30] qemumonitorjsontest: Stabilize FD names in '-chardev'

21 May 2026

From: Peter Krempa <pkrempa@redhat.com>

Use 'testCompareXMLToArgvStabilizeOne' to censor FD values in '-chardev'
commands for stable test outputs without the need for fake FDs.

For monitor sockets this also creates a hint '@mon-fd@' to be used as
substitution to prevent any further churn on basically every .args file.
The substitution is done by temporarily using another fake FD (1764)
instead of 1729 so that it's unique.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 ...arch64-cpu-passthrough.aarch64-latest.args |  2 +-
 ...ault-cpu-kvm-virt-10.0.aarch64-latest.args |  2 +-
 ...fault-cpu-kvm-virt-4.2.aarch64-10.0.0.args |  2 +-
 ...ault-cpu-tcg-virt-10.0.aarch64-latest.args |  2 +-
 ...fault-cpu-tcg-virt-4.2.aarch64-10.0.0.args |  2 +-
 ...aarch64-features-pauth.aarch64-latest.args |  2 +-
 .../aarch64-features-ras.aarch64-latest.args  |  2 +-
 .../aarch64-features-sve.aarch64-latest.args  |  2 +-
 ...rch64-gic-default-both.aarch64-latest.args |  2 +-
 ...aarch64-gic-default-v2.aarch64-latest.args |  2 +-
 ...aarch64-gic-default-v3.aarch64-latest.args |  2 +-
 .../aarch64-gic-default.aarch64-latest.args   |  2 +-
 .../aarch64-gic-host.aarch64-latest.args      |  2 +-
 .../aarch64-gic-none-both.aarch64-latest.args |  2 +-
 .../aarch64-gic-none-tcg.aarch64-latest.args  |  2 +-
 .../aarch64-gic-none-v2.aarch64-latest.args   |  2 +-
 .../aarch64-gic-none-v3.aarch64-latest.args   |  2 +-
 .../aarch64-gic-none.aarch64-latest.args      |  2 +-
 .../aarch64-gic-v2.aarch64-latest.args        |  2 +-
 .../aarch64-gic-v3.aarch64-latest.args        |  2 +-
 .../aarch64-kvm-32-on-64.aarch64-latest.args  |  2 +-
 ...usb-minimal.aarch64-latest.abi-update.args |  2 +-
 .../aarch64-nousb-minimal.aarch64-latest.args |  2 +-
 .../aarch64-pci-serial.aarch64-latest.args    |  2 +-
 ...iew-minimal.aarch64-latest.abi-update.args |  2 +-
 ...rch64-realview-minimal.aarch64-latest.args |  2 +-
 ...arch64-traditional-pci.aarch64-latest.args |  2 +-
 ...aarch64-usb-controller.aarch64-latest.args |  2 +-
 .../aarch64-video-default.aarch64-latest.args |  2 +-
 ...4-video-virtio-gpu-pci.aarch64-latest.args |  2 +-
 ...ault-models.aarch64-latest.abi-update.args |  2 +-
 ...64-virt-default-models.aarch64-latest.args |  2 +-
 ...rch64-virt-default-nic.aarch64-latest.args |  2 +-
 .../aarch64-virt-graphics.aarch64-latest.args |  4 ++--
 ...h64-virt-headless-mmio.aarch64-latest.args |  4 ++--
 .../aarch64-virt-headless.aarch64-latest.args |  4 ++--
 ...irt-minimal.aarch64-latest.abi-update.args |  2 +-
 .../aarch64-virt-minimal.aarch64-latest.args  |  2 +-
 .../aarch64-virt-virtio.aarch64-latest.args   |  2 +-
 ...64-virt-virtualization.aarch64-latest.args |  2 +-
 ...o-pci-manual-addresses.aarch64-latest.args |  2 +-
 .../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 +-
 .../arm-vexpressa9-basic.aarch64-latest.args  |  2 +-
 .../arm-vexpressa9-nodevs.aarch64-latest.args |  2 +-
 .../arm-vexpressa9-virtio.aarch64-latest.args |  2 +-
 ...lepb-minimal.armv7l-latest.abi-update.args |  2 +-
 ...v7l-versatilepb-minimal.armv7l-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 +-
 ...udio-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 +-
 ...udio-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-ccw-deflate.s390x-latest.args     |  2 +-
 .../balloon-device-auto.x86_64-latest.args    |  2 +-
 ...loon-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 +-
 .../balloon-mmio-deflate.aarch64-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 +-
 ...nu-disable-with-timeout.x86_64-latest.args |  2 +-
 .../boot-menu-disable.x86_64-latest.args      |  2 +-
 ...enu-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 +-
 ...l-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  |  4 ++--
 ...hannel-unix-source-path.x86_64-latest.args | 22 +++++++++----------
 .../channel-virtio-auto.x86_64-latest.args    |  2 +-
 .../channel-virtio-autoadd.x86_64-latest.args |  2 +-
 ...annel-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    | 10 ++++-----
 .../channel-virtio.x86_64-latest.args         |  2 +-
 .../chardev-backends-json.x86_64-9.1.0.args   |  4 ++--
 .../chardev-backends-json.x86_64-latest.args  |  4 ++--
 .../chardev-backends.x86_64-9.1.0.args        |  4 ++--
 .../chardev-backends.x86_64-latest.args       |  4 ++--
 .../chardev-label.x86_64-latest.args          |  2 +-
 .../chardev-reconnect.x86_64-9.1.0.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-7.2.0.args          |  2 +-
 .../clock-hpet-off.x86_64-latest.args         |  2 +-
 ...caltime-basis-localtime.x86_64-latest.args |  2 +-
 .../clock-localtime.x86_64-latest.args        |  2 +-
 .../clock-realtime.x86_64-latest.args         |  2 +-
 .../clock-timer-armvtimer.aarch64-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-sclp.s390x-latest.args            |  2 +-
 .../console-virtio-ccw.s390x-latest.args      |  2 +-
 .../console-virtio-many.x86_64-latest.args    |  2 +-
 ...rial-autoassign-address.x86_64-latest.args |  2 +-
 .../console-virtio-unix.x86_64-latest.args    |  4 ++--
 .../console-virtio.x86_64-latest.args         |  2 +-
 .../controller-order.x86_64-latest.args       |  2 +-
 .../controller-scsi-auto.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 +-
 ...-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 +-
 ...u-check-default-partial.x86_64-latest.args |  2 +-
 ...-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-fallback.x86_64-8.0.0.args            |  2 +-
 .../cpu-host-kvmclock.x86_64-latest.args      |  2 +-
 .../cpu-host-model-cmt.x86_64-latest.args     |  2 +-
 ...host-model-fallback-kvm.x86_64-10.0.0.args |  2 +-
 ...host-model-fallback-kvm.x86_64-10.1.0.args |  2 +-
 ...host-model-fallback-kvm.x86_64-10.2.0.args |  2 +-
 ...host-model-fallback-kvm.x86_64-11.0.0.args |  2 +-
 ...-host-model-fallback-kvm.x86_64-7.2.0.args |  2 +-
 ...-host-model-fallback-kvm.x86_64-8.0.0.args |  2 +-
 ...-host-model-fallback-kvm.x86_64-8.1.0.args |  2 +-
 ...-host-model-fallback-kvm.x86_64-8.2.0.args |  2 +-
 ...-host-model-fallback-kvm.x86_64-9.0.0.args |  2 +-
 ...-host-model-fallback-kvm.x86_64-9.1.0.args |  2 +-
 ...-host-model-fallback-kvm.x86_64-9.2.0.args |  2 +-
 ...host-model-fallback-kvm.x86_64-latest.args |  2 +-
 ...host-model-fallback-tcg.x86_64-10.0.0.args |  2 +-
 ...host-model-fallback-tcg.x86_64-10.1.0.args |  2 +-
 ...host-model-fallback-tcg.x86_64-10.2.0.args |  2 +-
 ...host-model-fallback-tcg.x86_64-11.0.0.args |  2 +-
 ...-host-model-fallback-tcg.x86_64-7.2.0.args |  2 +-
 ...-host-model-fallback-tcg.x86_64-8.0.0.args |  2 +-
 ...-host-model-fallback-tcg.x86_64-8.1.0.args |  2 +-
 ...-host-model-fallback-tcg.x86_64-8.2.0.args |  2 +-
 ...-host-model-fallback-tcg.x86_64-9.0.0.args |  2 +-
 ...-host-model-fallback-tcg.x86_64-9.1.0.args |  2 +-
 ...-host-model-fallback-tcg.x86_64-9.2.0.args |  2 +-
 ...host-model-fallback-tcg.x86_64-latest.args |  2 +-
 ...cpu-host-model-features.x86_64-latest.args |  2 +-
 .../cpu-host-model-kvm.x86_64-10.0.0.args     |  2 +-
 .../cpu-host-model-kvm.x86_64-10.1.0.args     |  2 +-
 .../cpu-host-model-kvm.x86_64-10.2.0.args     |  2 +-
 .../cpu-host-model-kvm.x86_64-11.0.0.args     |  2 +-
 .../cpu-host-model-kvm.x86_64-7.2.0.args      |  2 +-
 .../cpu-host-model-kvm.x86_64-8.0.0.args      |  2 +-
 .../cpu-host-model-kvm.x86_64-8.1.0.args      |  2 +-
 .../cpu-host-model-kvm.x86_64-8.2.0.args      |  2 +-
 .../cpu-host-model-kvm.x86_64-9.0.0.args      |  2 +-
 .../cpu-host-model-kvm.x86_64-9.1.0.args      |  2 +-
 .../cpu-host-model-kvm.x86_64-9.2.0.args      |  2 +-
 .../cpu-host-model-kvm.x86_64-latest.args     |  2 +-
 ...st-model-nofallback-kvm.x86_64-10.0.0.args |  2 +-
 ...st-model-nofallback-kvm.x86_64-10.1.0.args |  2 +-
 ...st-model-nofallback-kvm.x86_64-10.2.0.args |  2 +-
 ...st-model-nofallback-kvm.x86_64-11.0.0.args |  2 +-
 ...ost-model-nofallback-kvm.x86_64-7.2.0.args |  2 +-
 ...ost-model-nofallback-kvm.x86_64-8.0.0.args |  2 +-
 ...ost-model-nofallback-kvm.x86_64-8.1.0.args |  2 +-
 ...ost-model-nofallback-kvm.x86_64-8.2.0.args |  2 +-
 ...ost-model-nofallback-kvm.x86_64-9.0.0.args |  2 +-
 ...ost-model-nofallback-kvm.x86_64-9.1.0.args |  2 +-
 ...ost-model-nofallback-kvm.x86_64-9.2.0.args |  2 +-
 ...st-model-nofallback-kvm.x86_64-latest.args |  2 +-
 ...st-model-nofallback-tcg.x86_64-10.0.0.args |  2 +-
 ...st-model-nofallback-tcg.x86_64-10.1.0.args |  2 +-
 ...st-model-nofallback-tcg.x86_64-10.2.0.args |  2 +-
 ...st-model-nofallback-tcg.x86_64-11.0.0.args |  2 +-
 ...ost-model-nofallback-tcg.x86_64-7.2.0.args |  2 +-
 ...ost-model-nofallback-tcg.x86_64-8.0.0.args |  2 +-
 ...ost-model-nofallback-tcg.x86_64-8.1.0.args |  2 +-
 ...ost-model-nofallback-tcg.x86_64-8.2.0.args |  2 +-
 ...ost-model-nofallback-tcg.x86_64-9.0.0.args |  2 +-
 ...ost-model-nofallback-tcg.x86_64-9.1.0.args |  2 +-
 ...ost-model-nofallback-tcg.x86_64-9.2.0.args |  2 +-
 ...st-model-nofallback-tcg.x86_64-latest.args |  2 +-
 .../cpu-host-model-tcg.x86_64-10.0.0.args     |  2 +-
 .../cpu-host-model-tcg.x86_64-10.1.0.args     |  2 +-
 .../cpu-host-model-tcg.x86_64-10.2.0.args     |  2 +-
 .../cpu-host-model-tcg.x86_64-11.0.0.args     |  2 +-
 .../cpu-host-model-tcg.x86_64-7.2.0.args      |  2 +-
 .../cpu-host-model-tcg.x86_64-8.0.0.args      |  2 +-
 .../cpu-host-model-tcg.x86_64-8.1.0.args      |  2 +-
 .../cpu-host-model-tcg.x86_64-8.2.0.args      |  2 +-
 .../cpu-host-model-tcg.x86_64-9.0.0.args      |  2 +-
 .../cpu-host-model-tcg.x86_64-9.1.0.args      |  2 +-
 .../cpu-host-model-tcg.x86_64-9.2.0.args      |  2 +-
 .../cpu-host-model-tcg.x86_64-latest.args     |  2 +-
 .../cpu-host-model-vendor.x86_64-latest.args  |  2 +-
 ...st-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 +-
 ...deprecated-features-none.s390x-latest.args |  2 +-
 ...-deprecated-features-off.s390x-latest.args |  2 +-
 ...l-deprecated-features-on.s390x-latest.args |  2 +-
 ...cpu-no-removed-features.x86_64-latest.args |  2 +-
 .../cpu-nofallback.x86_64-8.0.0.args          |  2 +-
 .../cpu-numa-disjoint.x86_64-latest.args      |  2 +-
 .../cpu-numa-disordered.x86_64-latest.args    |  2 +-
 ...pu-numa-memory-oldstyle.x86_64-10.2.0.args |  2 +-
 .../cpu-numa-memshared.x86_64-latest.args     |  2 +-
 ...-numa-no-memory-element.x86_64-latest.args |  2 +-
 .../cpu-numa1.x86_64-latest.args              |  2 +-
 .../cpu-numa2.x86_64-latest.args              |  2 +-
 ...-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 +-
 ...u-phys-bits-passthrough.x86_64-latest.args |  2 +-
 .../cpu-s390-features.s390x-latest.args       |  2 +-
 .../cpu-s390-zEC12.s390x-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-topology5.aarch64-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 +-
 .../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 +-
 ...ult-video-type-aarch64.aarch64-latest.args |  2 +-
 ...o-type-loongarch64.loongarch64-latest.args |  2 +-
 ...default-video-type-ppc64.ppc64-latest.args |  2 +-
 ...ult-video-type-riscv64.riscv64-latest.args |  2 +-
 ...default-video-type-s390x.s390x-latest.args |  2 +-
 ...fault-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 +-
 .../disk-aio.x86_64-latest.args               |  2 +-
 .../disk-arm-virtio-sd.aarch64-latest.args    |  2 +-
 ...-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 +-
 ...m-empty-network-invalid.x86_64-latest.args |  2 +-
 ...sk-cdrom-network-nbdkit.x86_64-latest.args |  2 +-
 .../disk-cdrom-network.x86_64-latest.args     |  2 +-
 .../disk-cdrom-tray.x86_64-latest.args        |  2 +-
 ...om-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-s390x.s390x-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-gluster.x86_64-9.1.0.args    |  2 +-
 ...isk-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 +-
 ...rbd-encryption-layering.x86_64-latest.args |  2 +-
 ...rbd-encryption-luks-any.x86_64-latest.args |  2 +-
 ...-network-rbd-encryption.x86_64-latest.args |  2 +-
 ...sk-network-rbd-no-colon.x86_64-latest.args |  2 +-
 .../disk-network-rbd.x86_64-latest.args       |  2 +-
 ...isk-network-source-auth.x86_64-latest.args |  2 +-
 ...rce-curl-nbdkit-backing.x86_64-latest.args |  2 +-
 ...work-source-curl-nbdkit.x86_64-latest.args |  2 +-
 ...isk-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 +-
 ...sk-network-ssh-password.x86_64-latest.args |  2 +-
 .../disk-network-ssh.x86_64-latest.args       |  2 +-
 ...rk-tlsx509-nbd-hostname.x86_64-latest.args |  2 +-
 ...isk-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 +-
 ...sk-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 +-
 ...sk-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 +-
 ...tuppolicy-optional-drop.x86_64-latest.args |  2 +-
 ...sk-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 +-
 ...est.QEMU_CAPS_DEVICE_USB_BOT-disabled.args |  2 +-
 ...ate.QEMU_CAPS_DEVICE_USB_BOT-disabled.args |  2 +-
 ...k-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-ccw-many.s390x-latest.args    |  2 +-
 .../disk-virtio-ccw.s390x-latest.args         |  2 +-
 .../disk-virtio-queues.x86_64-latest.args     |  2 +-
 .../disk-virtio-s390-zpci.s390x-latest.args   |  2 +-
 ...irtio-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 +-
 ...memory-no-numa-topology.x86_64-latest.args |  2 +-
 ...fd-memory-numa-topology.x86_64-latest.args |  2 +-
 ...d-memory-numa-topology2.x86_64-latest.args |  2 +-
 ...d-memory-numa-topology3.x86_64-latest.args |  2 +-
 ...a-topology4-old-machine.x86_64-10.2.0.args |  2 +-
 ...d-memory-numa-topology4.x86_64-latest.args |  2 +-
 .../fips-enabled.x86_64-latest.args           |  2 +-
 ...are-auto-bios-stateless.x86_64-latest.args |  2 +-
 .../firmware-auto-bios.x86_64-latest.args     |  2 +-
 ...efi-aarch64.aarch64-latest.abi-update.args |  2 +-
 ...mware-auto-efi-aarch64.aarch64-latest.args |  2 +-
 ...-enrolled-keys-aarch64.aarch64-latest.args |  2 +-
 ...-auto-efi-enrolled-keys.x86_64-latest.args |  2 +-
 ...loader-qcow2-nvram-path.x86_64-latest.args |  2 +-
 ...efi-format-loader-qcow2.x86_64-latest.args |  2 +-
 ...-loader-raw.aarch64-latest.abi-update.args |  2 +-
 ...-efi-format-loader-raw.aarch64-latest.args |  2 +-
 ...uto-efi-format-mismatch.x86_64-latest.args |  2 +-
 ...nvram-qcow2-network-nbd.x86_64-latest.args |  2 +-
 ...format-nvram-qcow2-path.x86_64-latest.args |  2 +-
 ...-efi-format-nvram-qcow2.x86_64-latest.args |  2 +-
 ...t-nvram-raw-loader-path.x86_64-latest.args |  2 +-
 ...-raw-nvramtemplate-path.x86_64-latest.args |  2 +-
 ...at-nvram-raw.x86_64-latest.abi-update.args |  2 +-
 ...to-efi-format-nvram-raw.x86_64-latest.args |  2 +-
 ...mat-nvramtemplate-qcow2.x86_64-latest.args |  2 +-
 ...uto-efi-loader-insecure.x86_64-latest.args |  2 +-
 ...re-auto-efi-loader-path.x86_64-latest.args |  2 +-
 ...oader-secure.x86_64-latest.abi-update.args |  2 +-
 ...-auto-efi-loader-secure.x86_64-latest.args |  2 +-
 ...garch64.loongarch64-latest.abi-update.args |  2 +-
 ...to-efi-loongarch64.loongarch64-latest.args |  2 +-
 ...to-efi-no-enrolled-keys.x86_64-latest.args |  2 +-
 ...are-auto-efi-no-secboot.x86_64-latest.args |  2 +-
 ...are-auto-efi-nvram-file.x86_64-latest.args |  2 +-
 ...efi-nvram-network-iscsi.x86_64-latest.args |  2 +-
 ...o-efi-nvram-network-nbd.x86_64-latest.args |  2 +-
 ...are-auto-efi-nvram-path.x86_64-latest.args |  2 +-
 ...auto-efi-nvram-template.x86_64-latest.args |  2 +-
 ...efi-riscv64.riscv64-latest.abi-update.args |  2 +-
 ...ware-auto-efi-rw-pflash.x86_64-latest.args |  2 +-
 .../firmware-auto-efi-rw.x86_64-latest.args   |  2 +-
 ...rmware-auto-efi-secboot.x86_64-latest.args |  2 +-
 ...auto-efi-sev-snp.x86_64-latest+amdsev.args |  2 +-
 ...efi-sev-stateful.x86_64-latest+amdsev.args |  2 +-
 ...are-auto-efi-sev.x86_64-latest+amdsev.args |  2 +-
 ...rmware-auto-efi-smm-off.x86_64-latest.args |  2 +-
 ...ware-auto-efi-stateless.x86_64-latest.args |  2 +-
 ...o-efi-varstore-aarch64.aarch64-latest.args |  2 +-
 ...e-auto-efi-varstore-q35.x86_64-latest.args |  2 +-
 ...are-auto-efi.x86_64-latest.abi-update.args |  2 +-
 .../firmware-auto-efi.x86_64-latest.args      |  2 +-
 ...nual-bios-not-stateless.x86_64-latest.args |  2 +-
 ...e-manual-bios-stateless.x86_64-latest.args |  2 +-
 .../firmware-manual-bios.x86_64-latest.args   |  2 +-
 ...i-aarch64-legacy-paths.aarch64-latest.args |  2 +-
 ...anual-efi-acpi-aarch64.aarch64-latest.args |  2 +-
 ...are-manual-efi-acpi-q35.x86_64-latest.args |  2 +-
 ...are-manual-efi-features.x86_64-latest.args |  2 +-
 ...loader-path-nonstandard.x86_64-latest.args |  2 +-
 ...anual-efi-loader-secure.x86_64-latest.args |  2 +-
 ...olled-keys-legacy-paths.x86_64-latest.args |  2 +-
 ...al-efi-no-enrolled-keys.x86_64-latest.args |  2 +-
 ...no-secboot-legacy-paths.x86_64-latest.args |  2 +-
 ...e-manual-efi-no-secboot.x86_64-latest.args |  2 +-
 ...ual-efi-noacpi-aarch64.aarch64-latest.args |  2 +-
 ...e-manual-efi-nvram-file.x86_64-latest.args |  2 +-
 ...efi-nvram-network-iscsi.x86_64-latest.args |  2 +-
 ...l-efi-nvram-network-nbd.x86_64-latest.args |  2 +-
 ...late-nonstandard-format.x86_64-latest.args |  2 +-
 ...onstandard-legacy-paths.x86_64-latest.args |  2 +-
 ...am-template-nonstandard.x86_64-latest.args |  2 +-
 ...nual-efi-nvram-template.x86_64-latest.args |  2 +-
 ...-manual-efi-rw-implicit.x86_64-latest.args |  2 +-
 ...ual-efi-rw-legacy-paths.x86_64-latest.args |  2 +-
 ...ual-efi-rw-modern-paths.x86_64-latest.args |  2 +-
 .../firmware-manual-efi-rw.x86_64-latest.args |  2 +-
 ...fi-secboot-legacy-paths.x86_64-latest.args |  2 +-
 ...ware-manual-efi-secboot.x86_64-latest.args |  2 +-
 ...nual-efi-sev-snp.x86_64-latest+amdsev.args |  2 +-
 ...re-manual-efi-stateless.x86_64-latest.args |  2 +-
 ...manual-efi-tdx.x86_64-latest+inteltdx.args |  2 +-
 ...l-efi-varstore-aarch64.aarch64-latest.args |  2 +-
 ...manual-efi-varstore-q35.x86_64-latest.args |  2 +-
 .../firmware-manual-efi.x86_64-latest.args    |  2 +-
 ...e-manual-noefi-acpi-q35.x86_64-latest.args |  2 +-
 ...l-noefi-noacpi-aarch64.aarch64-latest.args |  2 +-
 ...manual-noefi-noacpi-q35.x86_64-latest.args |  2 +-
 .../floppy-drive-fat.x86_64-latest.args       |  2 +-
 .../fs9p-ccw.s390x-latest.args                |  2 +-
 tests/qemuxmlconfdata/fs9p.x86_64-latest.args |  2 +-
 .../genid-auto.x86_64-latest.args             |  2 +-
 .../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 +-
 ...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 +-
 ...s-spice-agent-file-xfer.x86_64-latest.args |  2 +-
 ...aphics-spice-agentmouse.x86_64-latest.args |  2 +-
 ...s-spice-auto-socket-cfg.x86_64-latest.args |  2 +-
 ...phics-spice-auto-socket.x86_64-latest.args |  2 +-
 ...phics-spice-compression.x86_64-latest.args |  2 +-
 ...hics-spice-egl-headless.x86_64-latest.args |  2 +-
 ...pice-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 +-
 ...raphics-spice-usb-redir.x86_64-latest.args |  2 +-
 .../graphics-spice.x86_64-latest.args         |  2 +-
 ...ics-vnc-auto-socket-cfg.x86_64-latest.args |  2 +-
 ...raphics-vnc-auto-socket.x86_64-latest.args |  2 +-
 ...aphics-vnc-egl-headless.x86_64-latest.args |  2 +-
 ...hics-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 +-
 ...remove-generated-socket.x86_64-latest.args |  2 +-
 .../graphics-vnc-sasl.x86_64-latest.args      |  2 +-
 ...-vnc-socket-new-cmdline.x86_64-latest.args |  2 +-
 .../graphics-vnc-socket.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 +-
 ...tdev-mdev-display-ramfb.x86_64-latest.args |  2 +-
 ...play-spice-egl-headless.x86_64-latest.args |  2 +-
 ...ev-display-spice-opengl.x86_64-latest.args |  2 +-
 ...isplay-vnc-egl-headless.x86_64-latest.args |  2 +-
 ...ostdev-mdev-display-vnc.x86_64-latest.args |  2 +-
 .../hostdev-mdev-display.x86_64-latest.args   |  2 +-
 ...hostdev-mdev-precreated.x86_64-latest.args |  2 +-
 ...tdev-pci-address-device.x86_64-latest.args |  2 +-
 ...-pci-address-unassigned.x86_64-latest.args |  2 +-
 .../hostdev-pci-address.x86_64-latest.args    |  2 +-
 ...stdev-pci-display-ramfb.x86_64-latest.args |  2 +-
 ...stdev-pci-multifunction.x86_64-latest.args |  2 +-
 ...ev-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 +-
 ...tdev-scsi-vhost-scsi-ccw.s390x-latest.args |  2 +-
 ...dev-scsi-vhost-scsi-pci.x86_64-latest.args |  2 +-
 ...ev-scsi-vhost-scsi-pcie.x86_64-latest.args |  2 +-
 ...ostdev-scsi-virtio-scsi.x86_64-latest.args |  2 +-
 ...tdev-subsys-mdev-vfio-ap.s390x-latest.args |  2 +-
 ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args |  2 +-
 ...dev-subsys-mdev-vfio-ccw.s390x-latest.args |  2 +-
 ...usb-address-device-boot.x86_64-latest.args |  2 +-
 ...tdev-usb-address-device.x86_64-latest.args |  2 +-
 ...ostdev-usb-address-port.x86_64-latest.args |  2 +-
 .../hostdev-usb-address.x86_64-latest.args    |  2 +-
 ...tdev-usb-vendor-product.x86_64-latest.args |  2 +-
 ...ostdev-vfio-multidomain.x86_64-latest.args |  2 +-
 ...o-zpci-autogenerate-fids.s390x-latest.args |  2 +-
 ...o-zpci-autogenerate-uids.s390x-latest.args |  2 +-
 ...v-vfio-zpci-autogenerate.s390x-latest.args |  2 +-
 ...dev-vfio-zpci-boundaries.s390x-latest.args |  2 +-
 ...vfio-zpci-ccw-memballoon.s390x-latest.args |  2 +-
 ...io-zpci-multidomain-many.s390x-latest.args |  2 +-
 .../hostdev-vfio-zpci.s390x-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 +-
 ...ges-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 +-
 ...gepages-numa-default-2M.x86_64-latest.args |  2 +-
 ...pages-numa-default-dimm.x86_64-latest.args |  2 +-
 .../hugepages-numa-default.x86_64-latest.args |  2 +-
 ...pages-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 +-
 ...ch64-virt-headless.aarch64-latest+hvf.args |  4 ++--
 ...x86_64-q35-headless.x86_64-latest+hvf.args |  4 ++--
 .../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 +-
 ...-spinlocks-never-notify.x86_64-latest.args |  2 +-
 .../hyperv-stimer-direct.x86_64-latest.args   |  2 +-
 .../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 +-
 .../input-virtio-ccw.s390x-latest.args        |  2 +-
 .../intel-iommu-aw-bits.x86_64-latest.args    |  2 +-
 ...ntel-iommu-caching-mode.x86_64-latest.args |  2 +-
 ...ntel-iommu-device-iotlb.x86_64-latest.args |  2 +-
 ...l-iommu-dma-translation.x86_64-latest.args |  2 +-
 ...-eim-autoadd.x86_64-latest.abi-update.args |  2 +-
 .../intel-iommu-eim.x86_64-latest.args        |  2 +-
 .../intel-iommu.x86_64-latest.args            |  2 +-
 ...-smmuv3-pci-bus-single.aarch64-latest.args |  2 +-
 .../iommu-smmuv3-pci-bus.aarch64-latest.args  |  2 +-
 .../iommu-smmuv3.aarch64-latest.args          |  2 +-
 .../iommufd-q35-fd.x86_64-latest.args         |  2 +-
 .../iommufd-q35.x86_64-latest.args            |  2 +-
 ...fd-virt-pci-bus-single.aarch64-latest.args |  2 +-
 .../iommufd-virt.aarch64-latest.args          |  2 +-
 .../iommufd.x86_64-latest.args                |  2 +-
 .../iothreads-disk.x86_64-latest.args         |  2 +-
 .../iothreads-ids-partial.x86_64-latest.args  |  2 +-
 ...othreads-ids-pool-sizes.x86_64-latest.args |  2 +-
 .../iothreads-ids.x86_64-latest.args          |  2 +-
 ...othreads-virtio-scsi-ccw.s390x-latest.args |  2 +-
 ...ads-virtio-scsi-mapping.x86_64-latest.args |  2 +-
 ...threads-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 +-
 .../kvmclock.x86_64-latest.args               |  2 +-
 .../launch-security-s390-pv.s390x-latest.args |  2 +-
 ...urity-sev-direct.x86_64-latest+amdsev.args |  2 +-
 ...nch-security-sev-direct.x86_64-latest.args |  2 +-
 ...ng-platform-info.x86_64-latest+amdsev.args |  2 +-
 ...security-sev-snp.x86_64-latest+amdsev.args |  2 +-
 ...launch-security-sev-snp.x86_64-latest.args |  2 +-
 ...nch-security-sev.x86_64-latest+amdsev.args |  2 +-
 ...h-security-tdx.x86_64-latest+inteltdx.args |  2 +-
 .../qemuxmlconfdata/lease.x86_64-latest.args  |  2 +-
 ...-models.loongarch64-latest.abi-update.args |  2 +-
 ...irt-default-models.loongarch64-latest.args |  2 +-
 ...ch64-virt-graphics.loongarch64-latest.args |  4 ++--
 ...ch64-virt-headless.loongarch64-latest.args |  4 ++--
 ...minimal.loongarch64-latest.abi-update.args |  2 +-
 ...rch64-virt-minimal.loongarch64-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 +-
 ...ch-virt-console-native.aarch64-latest.args |  2 +-
 ...ch-virt-console-virtio.aarch64-latest.args |  2 +-
 ...-serial+console-native.aarch64-latest.args |  2 +-
 ...ach-virt-serial-compat.aarch64-latest.args |  2 +-
 ...ach-virt-serial-native.aarch64-latest.args |  2 +-
 .../mach-virt-serial-pci.aarch64-latest.args  |  2 +-
 .../mach-virt-serial-usb.aarch64-latest.args  |  2 +-
 ...chine-aeskeywrap-off-cap.s390x-latest.args |  2 +-
 ...hine-aeskeywrap-off-caps.s390x-latest.args |  2 +-
 ...achine-aeskeywrap-on-cap.s390x-latest.args |  2 +-
 ...chine-aeskeywrap-on-caps.s390x-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 +-
 ...chine-deakeywrap-off-cap.s390x-latest.args |  2 +-
 ...hine-deakeywrap-off-caps.s390x-latest.args |  2 +-
 ...achine-deakeywrap-on-cap.s390x-latest.args |  2 +-
 ...chine-deakeywrap-on-caps.s390x-latest.args |  2 +-
 .../machine-i8042-off.x86_64-latest.args      |  2 +-
 .../machine-i8042-on.x86_64-latest.args       |  2 +-
 ...achine-keywrap-none-caps.s390x-latest.args |  2 +-
 .../machine-keywrap-none.s390x-latest.args    |  2 +-
 .../machine-loadparm-hostdev.s390x-9.1.0.args |  2 +-
 ...machine-loadparm-hostdev.s390x-latest.args |  2 +-
 ...-multiple-disks-nets-s390.s390x-9.1.0.args |  2 +-
 ...multiple-disks-nets-s390.s390x-latest.args |  2 +-
 ...machine-loadparm-net-s390.s390x-9.1.0.args |  2 +-
 ...achine-loadparm-net-s390.s390x-latest.args |  2 +-
 .../machine-loadparm-s390.s390x-9.1.0.args    |  2 +-
 .../machine-loadparm-s390.s390x-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 +-
 ...memory-default-hugepage.x86_64-latest.args |  2 +-
 .../memfd-memory-numa.x86_64-latest.args      |  2 +-
 ...emory-hotplug-dimm-addr.x86_64-latest.args |  2 +-
 .../memory-hotplug-dimm.x86_64-latest.args    |  2 +-
 ...memory-hotplug-multiple.x86_64-latest.args |  2 +-
 ...-hotplug-numa-preferred.x86_64-latest.args |  2 +-
 ...y-hotplug-nvdimm-access.x86_64-latest.args |  2 +-
 ...ry-hotplug-nvdimm-align.x86_64-latest.args |  2 +-
 ...ry-hotplug-nvdimm-label.x86_64-latest.args |  2 +-
 ...-hotplug-nvdimm-overlap.x86_64-latest.args |  2 +-
 ...ory-hotplug-nvdimm-pmem.x86_64-latest.args |  2 +-
 ...-nvdimm-ppc64.ppc64-latest.abi-update.args |  2 +-
 ...ory-hotplug-nvdimm-ppc64.ppc64-latest.args |  2 +-
 ...hotplug-nvdimm-readonly.x86_64-latest.args |  2 +-
 .../memory-hotplug-nvdimm.x86_64-latest.args  |  2 +-
 ...-ppc64-nonuma.ppc64-latest.abi-update.args |  2 +-
 ...ory-hotplug-ppc64-nonuma.ppc64-latest.args |  2 +-
 ...lug-virtio-mem-ccw-s390x.s390x-latest.args |  2 +-
 ...lug-virtio-mem-pci-s390x.s390x-latest.args |  2 +-
 ...mory-hotplug-virtio-mem.x86_64-latest.args |  2 +-
 ...ory-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 +-
 .../memtune.x86_64-latest.args                |  2 +-
 .../metadata-duplicate.x86_64-latest.args     |  2 +-
 .../metadata.x86_64-latest.args               |  2 +-
 .../migrate-numa-unaligned.x86_64-latest.args |  2 +-
 .../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 +-
 .../mlock-on.x86_64-latest.args               |  2 +-
 ...86_64-q35-headless.x86_64-latest+mshv.args |  2 +-
 .../mtp-usb-device.x86_64-latest.args         |  2 +-
 ...ultifunction-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 +-
 .../net-eth.x86_64-latest.args                |  2 +-
 .../net-hostdev-bootorder.x86_64-latest.args  |  2 +-
 ...net-hostdev-multidomain.x86_64-latest.args |  2 +-
 ...ostdev-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 +-
 .../net-mtu.x86_64-latest.args                |  2 +-
 .../net-openvswitch.x86_64-latest.args        |  2 +-
 .../net-server.x86_64-latest.args             |  2 +-
 .../net-udp.x86_64-latest.args                |  2 +-
 .../net-usb.x86_64-latest.args                |  2 +-
 .../net-user-addr.x86_64-latest.args          |  2 +-
 .../net-user-passt.x86_64-7.2.0.args          |  2 +-
 .../net-user-passt.x86_64-latest.args         |  2 +-
 .../net-user.x86_64-latest.args               |  2 +-
 .../net-vdpa-multiqueue.x86_64-latest.args    |  2 +-
 .../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-ccw.s390x-latest.args          |  2 +-
 .../net-virtio-device.x86_64-latest.args      |  2 +-
 ...virtio-disable-offloads.x86_64-latest.args |  2 +-
 .../net-virtio-netdev.x86_64-latest.args      |  2 +-
 ...irtio-network-portgroup.x86_64-latest.args |  2 +-
 .../net-virtio-rss.x86_64-latest.args         |  2 +-
 ...et-virtio-rxtxqueuesize.x86_64-latest.args |  2 +-
 ...-virtio-teaming-hostdev.x86_64-latest.args |  2 +-
 ...-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 +-
 ...auto-memory-vcpu-cpuset.x86_64-latest.args |  2 +-
 ...no-cpuset-and-placement.x86_64-latest.args |  2 +-
 ...d-auto-vcpu-no-numatune.x86_64-latest.args |  2 +-
 ...to-vcpu-static-numatune.x86_64-latest.args |  2 +-
 ...static-memory-auto-vcpu.x86_64-latest.args |  2 +-
 ...static-vcpu-no-numatune.x86_64-latest.args |  2 +-
 .../qemuxmlconfdata/numad.x86_64-latest.args  |  2 +-
 ...ne-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 +-
 ...atune-memnode-no-memory.x86_64-latest.args |  2 +-
 ...emnode-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 +-
 ...vcpus-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 +-
 .../panic-pseries.ppc64-latest.args           |  2 +-
 .../qemuxmlconfdata/panic.x86_64-latest.args  |  2 +-
 ...arallel-parport-chardev.x86_64-latest.args |  2 +-
 .../parallel-tcp-chardev.x86_64-latest.args   |  2 +-
 .../parallel-unix-chardev.x86_64-latest.args  |  4 ++--
 ...pi-root-hotplug-disable.x86_64-latest.args |  2 +-
 ...cpi-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 +-
 .../pci-many.x86_64-latest.args               |  2 +-
 .../pci-rom-disabled.x86_64-latest.args       |  2 +-
 .../pci-rom.x86_64-latest.args                |  2 +-
 .../pci-serial-dev-chardev.x86_64-latest.args |  2 +-
 ...e-expander-bus-aarch64.aarch64-latest.args |  2 +-
 .../pcie-expander-bus.x86_64-latest.args      |  2 +-
 ...root-port-model-generic.x86_64-latest.args |  2 +-
 ...root-port-model-ioh3420.x86_64-latest.args |  2 +-
 ...cie-root-port-nohotplug.x86_64-latest.args |  2 +-
 .../pcie-root-port.x86_64-latest.args         |  2 +-
 .../pcie-root.x86_64-latest.args              |  2 +-
 ...-switch-downstream-port.x86_64-latest.args |  2 +-
 ...ie-switch-upstream-port.x86_64-latest.args |  2 +-
 .../pcihole64-gib.x86_64-latest.args          |  2 +-
 .../pcihole64-q35.x86_64-latest.args          |  2 +-
 .../pcihole64-virt.aarch64-latest.args        |  2 +-
 .../pcihole64.x86_64-latest.args              |  2 +-
 .../pmu-feature-off.x86_64-latest.args        |  2 +-
 .../pmu-feature.x86_64-latest.args            |  2 +-
 tests/qemuxmlconfdata/ppc-dtb.ppc-latest.args |  2 +-
 ...c-mac99-minimal.ppc-latest.abi-update.args |  2 +-
 .../ppc-mac99-minimal.ppc-latest.args         |  2 +-
 ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args |  2 +-
 ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args |  2 +-
 ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args |  2 +-
 ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args |  2 +-
 ...beige-minimal.ppc64-latest.abi-update.args |  2 +-
 .../ppc64-g3beige-minimal.ppc64-latest.args   |  2 +-
 ...mac99-minimal.ppc64-latest.abi-update.args |  2 +-
 .../ppc64-mac99-minimal.ppc64-latest.args     |  2 +-
 ...ernv9-minimal.ppc64-latest.abi-update.args |  2 +-
 .../ppc64-powernv9-minimal.ppc64-latest.args  |  2 +-
 ...efault-models.ppc64-latest.abi-update.args |  2 +-
 ...4-pseries-default-models.ppc64-latest.args |  2 +-
 .../ppc64-pseries-graphics.ppc64-latest.args  |  4 ++--
 .../ppc64-pseries-headless.ppc64-latest.args  |  4 ++--
 ...eries-minimal.ppc64-latest.abi-update.args |  2 +-
 .../ppc64-pseries-minimal.ppc64-latest.args   |  2 +-
 .../ppc64-tpmproxy-single.ppc64-latest.args   |  2 +-
 .../ppc64-tpmproxy-with-tpm.ppc64-latest.args |  2 +-
 .../ppce500-serial.ppc-latest.args            |  2 +-
 .../pseries-basic.ppc64-latest.args           |  2 +-
 .../pseries-console-virtio.ppc64-latest.args  |  2 +-
 ...eries-cpu-compat-power10.ppc64-latest.args |  2 +-
 ...eries-cpu-compat-power11.ppc64-latest.args |  2 +-
 ...series-cpu-compat-power9.ppc64-latest.args |  2 +-
 .../pseries-cpu-compat.ppc64-latest.args      |  2 +-
 .../pseries-cpu-exact.ppc64-latest.args       |  2 +-
 .../pseries-cpu-le.ppc64-latest.args          |  2 +-
 .../pseries-features.ppc64-latest.args        |  2 +-
 .../pseries-hostdevs-1.ppc64-latest.args      |  2 +-
 .../pseries-hostdevs-2.ppc64-latest.args      |  2 +-
 .../pseries-hostdevs-3.ppc64-latest.args      |  2 +-
 .../pseries-many-buses-1.ppc64-latest.args    |  2 +-
 .../pseries-many-buses-2.ppc64-latest.args    |  2 +-
 .../pseries-many-devices.ppc64-latest.args    |  2 +-
 .../pseries-nvram.ppc64-latest.args           |  2 +-
 .../pseries-panic-missing.ppc64-latest.args   |  2 +-
 ...pseries-panic-no-address.ppc64-latest.args |  2 +-
 ...ries-phb-default-missing.ppc64-latest.args |  2 +-
 .../pseries-phb-numa-node.ppc64-latest.args   |  2 +-
 .../pseries-phb-simple.ppc64-latest.args      |  2 +-
 .../pseries-phb-user-alias.ppc64-latest.args  |  2 +-
 .../pseries-serial-native.ppc64-latest.args   |  2 +-
 .../pseries-serial-pci.ppc64-latest.args      |  2 +-
 .../pseries-serial-usb.ppc64-latest.args      |  2 +-
 .../pseries-usb-default.ppc64-latest.args     |  2 +-
 .../pseries-usb-kbd.ppc64-latest.args         |  2 +-
 .../pseries-usb-multi.ppc64-latest.args       |  2 +-
 ...series-vio-user-assigned.ppc64-latest.args |  2 +-
 .../pseries-vio.ppc64-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-aarch64.aarch64-latest.args   |  2 +-
 ...pci-no-address-aarch64.aarch64-latest.args |  2 +-
 .../pvpanic-pci-x86_64.x86_64-latest.args     |  2 +-
 ...35-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 +-
 .../q35-pcie.x86_64-latest.args               |  2 +-
 .../q35-usb2-multi.x86_64-latest.args         |  2 +-
 .../q35-usb2-reorder.x86_64-latest.args       |  2 +-
 .../q35-usb2.x86_64-latest.args               |  2 +-
 .../q35-virt-manager-basic.x86_64-latest.args |  4 ++--
 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 +-
 ...-domain-commandline-ns0.x86_64-latest.args |  2 +-
 ...u-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 +-
 .../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 +-
 .../riscv64-virt-acpi.riscv64-latest.args     |  2 +-
 ...ault-models.riscv64-latest.abi-update.args |  2 +-
 ...64-virt-default-models.riscv64-latest.args |  2 +-
 ...cv64-virt-features-aia.riscv64-latest.args |  2 +-
 .../riscv64-virt-graphics.riscv64-latest.args |  4 ++--
 ...v64-virt-headless-mmio.riscv64-latest.args |  4 ++--
 .../riscv64-virt-headless.riscv64-latest.args |  4 ++--
 ...irt-minimal.riscv64-latest.abi-update.args |  2 +-
 .../riscv64-virt-minimal.riscv64-latest.args  |  2 +-
 ...-async-teardown-disabled.s390x-latest.args |  2 +-
 ...async-teardown-no-attrib.s390x-latest.args |  2 +-
 .../s390-async-teardown.s390x-latest.args     |  2 +-
 ...-cpu-kvm-ccw-virtio-10.0.s390x-latest.args |  2 +-
 ...t-cpu-kvm-ccw-virtio-4.2.s390x-10.0.0.args |  2 +-
 ...-cpu-tcg-ccw-virtio-10.0.s390x-latest.args |  2 +-
 ...t-cpu-tcg-ccw-virtio-4.2.s390x-10.0.0.args |  2 +-
 .../s390-defaultconsole.s390x-latest.args     |  2 +-
 .../s390-panic-missing.s390x-latest.args      |  2 +-
 .../s390-panic-no-address.s390x-latest.args   |  2 +-
 .../s390-panic.s390x-latest.args              |  2 +-
 .../s390-serial-2.s390x-latest.args           |  2 +-
 .../s390-serial-console.s390x-latest.args     |  2 +-
 .../s390-serial.s390x-latest.args             |  2 +-
 .../s390-usb-address.s390x-latest.args        |  2 +-
 .../s390-usb-model.s390x-latest.args          |  2 +-
 .../s390-usb-none.s390x-latest.args           |  2 +-
 .../s390x-ccw-acpi.s390x-latest.args          |  2 +-
 ...efault-models.s390x-latest.abi-update.args |  2 +-
 ...s390x-ccw-default-models.s390x-latest.args |  2 +-
 .../s390x-ccw-graphics.s390x-latest.args      |  4 ++--
 .../s390x-ccw-headless.s390x-latest.args      |  4 ++--
 ...x-ccw-minimal.s390x-latest.abi-update.args |  2 +-
 .../s390x-ccw-minimal.s390x-latest.args       |  2 +-
 ...rder-domain-subelements.x86_64-latest.args |  2 +-
 .../seclabel-dac-none.x86_64-latest.args      |  2 +-
 ...eclabel-device-multiple.x86_64-latest.args |  2 +-
 ...label-dynamic-baselabel.x86_64-latest.args |  2 +-
 ...label-dynamic-labelskip.x86_64-latest.args |  2 +-
 ...el-dynamic-none-relabel.x86_64-latest.args |  2 +-
 .../seclabel-dynamic-none.x86_64-latest.args  |  2 +-
 ...clabel-dynamic-override.x86_64-latest.args |  2 +-
 ...eclabel-dynamic-relabel.x86_64-latest.args |  2 +-
 .../seclabel-dynamic.x86_64-latest.args       |  2 +-
 .../seclabel-none.x86_64-latest.args          |  2 +-
 ...l-selinux-none-override.x86_64-latest.args |  2 +-
 ...clabel-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 +-
 ...rial-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 +-
 ...rial-tcp-telnet-chardev.x86_64-latest.args |  2 +-
 ...p-tlsx509-chardev-notls.x86_64-latest.args |  2 +-
 ...-tlsx509-chardev-verify.x86_64-latest.args |  2 +-
 ...ial-tcp-tlsx509-chardev.x86_64-latest.args |  2 +-
 ...-tlsx509-secret-chardev.x86_64-latest.args |  2 +-
 .../serial-udp-chardev.x86_64-latest.args     |  2 +-
 .../serial-unix-chardev.x86_64-latest.args    |  4 ++--
 .../serial-vc-chardev.x86_64-latest.args      |  2 +-
 .../sgx-epc.x86_64-latest+sgx.args            |  2 +-
 .../shmem-plain-doorbell.x86_64-latest.args   |  2 +-
 .../smartcard-controller.x86_64-latest.args   |  2 +-
 ...t-certificates-database.x86_64-latest.args |  2 +-
 ...tcard-host-certificates.x86_64-latest.args |  2 +-
 .../smartcard-host.x86_64-latest.args         |  2 +-
 ...rd-passthrough-spicevmc.x86_64-latest.args |  2 +-
 ...artcard-passthrough-tcp.x86_64-latest.args |  2 +-
 ...rtcard-passthrough-unix.x86_64-latest.args |  4 ++--
 .../smbios-type-fwcfg.x86_64-latest.args      |  2 +-
 .../qemuxmlconfdata/smbios.x86_64-latest.args |  2 +-
 .../sound-device-virtio.x86_64-latest.args    |  2 +-
 .../sound-device.x86_64-latest.args           |  2 +-
 .../sparc-minimal.sparc-latest.args           |  2 +-
 .../tap-vhost-incorrect.x86_64-latest.args    |  2 +-
 .../tap-vhost.x86_64-latest.args              |  2 +-
 .../throttlefilter.x86_64-latest.args         |  2 +-
 ...pm-emulator-crb-profile.x86_64-latest.args |  2 +-
 .../tpm-emulator-tpm2-enc.x86_64-latest.args  |  2 +-
 ...pm-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 +-
 ...roller-automatic-i440fx.x86_64-latest.args |  2 +-
 ...troller-automatic-isapc.x86_64-latest.args |  2 +-
 ...oller-automatic-microvm.x86_64-latest.args |  2 +-
 ...matic-pseries.ppc64-latest.abi-update.args |  2 +-
 ...roller-automatic-pseries.ppc64-latest.args |  2 +-
 ...ontroller-automatic-q35.x86_64-latest.args |  2 +-
 ...ler-automatic-realview.aarch64-latest.args |  2 +-
 ...ntroller-automatic-s390x.s390x-latest.args |  2 +-
 ...tomatic-unavailable-q35.x86_64-latest.args |  2 +-
 ...r-automatic-versatilepb.armv7l-latest.args |  2 +-
 ...automatic-virt-aarch64.aarch64-latest.args |  2 +-
 ...c-virt-loongarch64.loongarch64-latest.args |  2 +-
 ...automatic-virt-riscv64.riscv64-latest.args |  2 +-
 ...default-fallback-g3beige.ppc64-latest.args |  2 +-
 ...r-default-fallback-mac99.ppc64-latest.args |  2 +-
 ...-default-fallback-mac99ppc.ppc-latest.args |  2 +-
 ...efault-fallback-powernv9.ppc64-latest.args |  2 +-
 ...ault-fallback-realview.aarch64-latest.args |  2 +-
 ...lt-fallback-versatilepb.armv7l-latest.args |  2 +-
 ...-fallback-virt-aarch64.aarch64-latest.args |  2 +-
 ...ntroller-default-g3beige.ppc64-latest.args |  2 +-
 ...ntroller-default-i440fx.x86_64-latest.args |  2 +-
 ...controller-default-mac99.ppc64-latest.args |  2 +-
 ...ontroller-default-mac99ppc.ppc-latest.args |  2 +-
 ...troller-default-powernv9.ppc64-latest.args |  2 +-
 ...fault-pseries.ppc64-latest.abi-update.args |  2 +-
 ...ntroller-default-pseries.ppc64-latest.args |  2 +-
 ...-controller-default-q35.x86_64-latest.args |  2 +-
 ...oller-default-realview.aarch64-latest.args |  2 +-
 ...controller-default-s390x.s390x-latest.args |  2 +-
 ...ler-default-versatilepb.armv7l-latest.args |  2 +-
 ...r-default-virt-aarch64.aarch64-latest.args |  2 +-
 ...t-virt-loongarch64.loongarch64-latest.args |  2 +-
 ...r-default-virt-riscv64.riscv64-latest.args |  2 +-
 ...troller-ich9-autoassign.x86_64-latest.args |  2 +-
 ...ntroller-ich9-companion.x86_64-latest.args |  2 +-
 ...ntroller-ich9-ehci-addr.x86_64-latest.args |  2 +-
 ...ler-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 +-
 ...sb-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 +-
 .../usb-hub.x86_64-latest.args                |  2 +-
 .../usb-long-port-path.x86_64-latest.args     |  2 +-
 .../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 +-
 ...sb-redir-filter-version.x86_64-latest.args |  2 +-
 .../usb-redir-filter.x86_64-latest.args       |  2 +-
 .../usb-redir-unix.x86_64-latest.args         |  4 ++--
 .../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           |  4 ++--
 .../user-aliases2.x86_64-latest.args          |  2 +-
 .../vcpu-placement-static.x86_64-latest.args  |  2 +-
 .../vhost-user-fs-ccw.s390x-latest.args       |  2 +-
 ...vhost-user-fs-fd-memory.x86_64-latest.args |  2 +-
 ...st-user-fs-fd-openfiles.x86_64-latest.args |  2 +-
 ...vhost-user-fs-hugepages.x86_64-latest.args |  2 +-
 .../vhost-user-fs-locking.x86_64-7.2.0.args   |  2 +-
 .../vhost-user-fs-readonly.x86_64-latest.args |  2 +-
 .../vhost-user-fs-sock.x86_64-latest.args     |  2 +-
 ...host-user-gpu-secondary.x86_64-latest.args |  6 ++---
 .../vhost-user-vga.x86_64-latest.args         |  4 ++--
 .../vhost-vsock-auto.x86_64-latest.args       |  2 +-
 .../vhost-vsock-ccw-auto.s390x-latest.args    |  2 +-
 .../vhost-vsock-ccw-iommu.s390x-latest.args   |  2 +-
 .../vhost-vsock-ccw.s390x-latest.args         |  2 +-
 .../vhost-vsock.x86_64-latest.args            |  2 +-
 ...eo-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 +-
 ...-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 +-
 ...o-qxl-sec-device-vgamem.x86_64-latest.args |  2 +-
 ...o-qxl-sec-device-vram64.x86_64-latest.args |  2 +-
 .../video-qxl-sec-device.x86_64-latest.args   |  2 +-
 ...eo-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 +-
 ...ideo-virtio-gpu-ccw-auto.s390x-latest.args |  2 +-
 .../video-virtio-gpu-ccw.s390x-latest.args    |  2 +-
 ...video-virtio-gpu-device.x86_64-latest.args |  2 +-
 ...video-virtio-gpu-sdl-gl.x86_64-latest.args |  2 +-
 ...eo-virtio-gpu-secondary.x86_64-latest.args |  2 +-
 ...deo-virtio-gpu-spice-gl.x86_64-latest.args |  2 +-
 .../video-virtio-gpu-virgl.x86_64-latest.args |  2 +-
 ...video-virtio-vga-gpu-gl.x86_64-latest.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 +-
 ...irtio-input-passthrough.x86_64-latest.args |  2 +-
 .../virtio-input.x86_64-latest.args           |  2 +-
 .../virtio-iommu-aarch64.aarch64-latest.args  |  2 +-
 .../virtio-iommu-x86_64.x86_64-latest.args    |  2 +-
 .../virtio-lun.x86_64-9.0.0.args              |  2 +-
 ...virtio-non-transitional.x86_64-latest.args |  2 +-
 ...-options-controller-ats.x86_64-latest.args |  2 +-
 ...ptions-controller-iommu.x86_64-latest.args |  2 +-
 ...tions-controller-packed.x86_64-latest.args |  2 +-
 ...virtio-options-disk-ats.x86_64-latest.args |  2 +-
 ...rtio-options-disk-iommu.x86_64-latest.args |  2 +-
 ...tio-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 +-
 ...irtio-options-fs-packed.x86_64-latest.args |  2 +-
 ...irtio-options-input-ats.x86_64-latest.args |  2 +-
 ...tio-options-input-iommu.x86_64-latest.args |  2 +-
 ...io-options-input-packed.x86_64-latest.args |  2 +-
 ...-options-memballoon-ats.x86_64-latest.args |  2 +-
 ...loon-freepage-reporting.x86_64-latest.args |  2 +-
 ...ptions-memballoon-iommu.x86_64-latest.args |  2 +-
 ...tions-memballoon-packed.x86_64-latest.args |  2 +-
 .../virtio-options-net-ats.x86_64-latest.args |  2 +-
 ...irtio-options-net-iommu.x86_64-latest.args |  2 +-
 ...rtio-options-net-packed.x86_64-latest.args |  2 +-
 .../virtio-options-rng-ats.x86_64-latest.args |  2 +-
 ...irtio-options-rng-iommu.x86_64-latest.args |  2 +-
 ...rtio-options-rng-packed.x86_64-latest.args |  2 +-
 ...irtio-options-video-ats.x86_64-latest.args |  6 ++---
 ...tio-options-video-iommu.x86_64-latest.args |  6 ++---
 ...io-options-video-packed.x86_64-latest.args |  6 ++---
 .../virtio-options.x86_64-latest.args         |  4 ++--
 .../virtio-rng-builtin.x86_64-latest.args     |  2 +-
 .../virtio-rng-ccw.s390x-latest.args          |  2 +-
 .../virtio-rng-default.x86_64-latest.args     |  2 +-
 .../virtio-rng-egd-unix.x86_64-latest.args    |  4 ++--
 .../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-diag288.s390x-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 +-
 .../watchdog.x86_64-latest.args               |  2 +-
 .../x86-kvm-32-on-64.x86_64-latest.args       |  2 +-
 ...6_64-default-cpu-kvm-pc.x86_64-latest.args |  2 +-
 ..._64-default-cpu-kvm-q35.x86_64-latest.args |  2 +-
 ...efault-cpu-tcg-features.x86_64-latest.args |  2 +-
 ...6_64-default-cpu-tcg-pc.x86_64-latest.args |  2 +-
 ..._64-default-cpu-tcg-q35.x86_64-latest.args |  2 +-
 ...fault-models.x86_64-latest.abi-update.args |  2 +-
 ...86_64-pc-default-models.x86_64-latest.args |  2 +-
 .../x86_64-pc-graphics.x86_64-latest.args     |  4 ++--
 .../x86_64-pc-headless.x86_64-latest.args     |  4 ++--
 ...4-pc-minimal.x86_64-latest.abi-update.args |  2 +-
 .../x86_64-pc-minimal.x86_64-latest.args      |  2 +-
 ...fault-models.x86_64-latest.abi-update.args |  2 +-
 ...6_64-q35-default-models.x86_64-latest.args |  2 +-
 .../x86_64-q35-graphics.x86_64-latest.args    |  4 ++--
 .../x86_64-q35-headless.x86_64-latest.args    |  4 ++--
 ...-q35-minimal.x86_64-latest.abi-update.args |  2 +-
 .../x86_64-q35-minimal.x86_64-latest.args     |  2 +-
 tests/qemuxmlconftest.c                       | 10 ++++++++-
 tests/testutilsqemu.c                         |  5 ++++-
 1175 files changed, 1241 insertions(+), 1230 deletions(-)

diff --git a/tests/qemuxmlconfdata/aarch64-cpu-passthrough.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-cpu-passthrough.aarch64-latest.args
index 35f6b089a4..65dba77871 100644
--- a/tests/qemuxmlconfdata/aarch64-cpu-passthrough.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-cpu-passthrough.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.aarch64-latest.args
index eb2d771554..787390a7a4 100644
--- a/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-10.0.0.args b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-10.0.0.args
index 7e2921a4c5..973d71d1fb 100644
--- a/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-10.0.0.args
+++ b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-10.0.0.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.aarch64-latest.args
index ee5c19140a..76f08e3203 100644
--- a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-10.0.0.args b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-10.0.0.args
index dc8ff2e5d9..d526055b90 100644
--- a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-10.0.0.args
+++ b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-10.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-features-pauth.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-features-pauth.aarch64-latest.args
index 7db66f359b..fd0c111302 100644
--- a/tests/qemuxmlconfdata/aarch64-features-pauth.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-features-pauth.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-features-ras.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-features-ras.aarch64-latest.args
index f903d7152f..91adc8bf19 100644
--- a/tests/qemuxmlconfdata/aarch64-features-ras.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-features-ras.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-features-sve.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-features-sve.aarch64-latest.args
index 99a931dcd2..96e355a29d 100644
--- a/tests/qemuxmlconfdata/aarch64-features-sve.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-features-sve.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-gic-default-both.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-default-both.aarch64-latest.args
index f291d8e1c4..17a90ae740 100644
--- a/tests/qemuxmlconfdata/aarch64-gic-default-both.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-gic-default-both.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-gic-default-v2.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-default-v2.aarch64-latest.args
index fdf3e4f10e..95ff3baeec 100644
--- a/tests/qemuxmlconfdata/aarch64-gic-default-v2.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-gic-default-v2.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-gic-default-v3.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-default-v3.aarch64-latest.args
index f291d8e1c4..17a90ae740 100644
--- a/tests/qemuxmlconfdata/aarch64-gic-default-v3.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-gic-default-v3.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-gic-default.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-default.aarch64-latest.args
index fdf3e4f10e..95ff3baeec 100644
--- a/tests/qemuxmlconfdata/aarch64-gic-default.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-gic-default.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-gic-host.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-host.aarch64-latest.args
index ba9177c4ff..19cd177f1e 100644
--- a/tests/qemuxmlconfdata/aarch64-gic-host.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-gic-host.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-gic-none-both.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-none-both.aarch64-latest.args
index f291d8e1c4..17a90ae740 100644
--- a/tests/qemuxmlconfdata/aarch64-gic-none-both.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-gic-none-both.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.args
index 583eaa0c03..8f5150844d 100644
--- a/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-gic-none-v2.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-none-v2.aarch64-latest.args
index fdf3e4f10e..95ff3baeec 100644
--- a/tests/qemuxmlconfdata/aarch64-gic-none-v2.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-gic-none-v2.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-gic-none-v3.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-none-v3.aarch64-latest.args
index f291d8e1c4..17a90ae740 100644
--- a/tests/qemuxmlconfdata/aarch64-gic-none-v3.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-gic-none-v3.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-gic-none.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-none.aarch64-latest.args
index fdf3e4f10e..95ff3baeec 100644
--- a/tests/qemuxmlconfdata/aarch64-gic-none.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-gic-none.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-gic-v2.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-v2.aarch64-latest.args
index fdf3e4f10e..95ff3baeec 100644
--- a/tests/qemuxmlconfdata/aarch64-gic-v2.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-gic-v2.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-gic-v3.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-gic-v3.aarch64-latest.args
index f291d8e1c4..17a90ae740 100644
--- a/tests/qemuxmlconfdata/aarch64-gic-v3.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-gic-v3.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-kvm-32-on-64.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-kvm-32-on-64.aarch64-latest.args
index 1efc68c506..e0d0e5cab0 100644
--- a/tests/qemuxmlconfdata/aarch64-kvm-32-on-64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-kvm-32-on-64.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.args
index 9a1c6fd276..8b2b3292c1 100644
--- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args
index 9a1c6fd276..8b2b3292c1 100644
--- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args
index 9d3cf39d6a..504f401021 100644
--- a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.abi-update.args
index ccbff79f35..41cd0da428 100644
--- a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.abi-update.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.args
index ccbff79f35..41cd0da428 100644
--- a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.args
index 1f9d5db559..1514bbe8f7 100644
--- a/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.args
index a34499c6fb..1c76089bb6 100644
--- a/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.args
index 26261cae09..3aa7008ec8 100644
--- a/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64-vgpu/.config \
 -uuid f3197c89-6457-44fe-b26d-897090ba6541 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args
index 31f3907acc..9bdd329040 100644
--- a/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64-vgpu/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.args
index 7088fd7c69..37eb559ac3 100644
--- a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-update.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.args
index 7088fd7c69..37eb559ac3 100644
--- a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.args
index 0a8dd3e1fb..0701041c99 100644
--- a/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64-virt-default/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args
index 3c9c0327ef..b987772672 100644
--- a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -uuid 33844184-97c0-4cc0-aa7d-206f5803530b \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -44,7 +44,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:53:45:a5","bus":"pci.1","addr":"0x0"}' \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \
 -device '{"driver":"usb-kbd","id":"input1","bus":"usb.0","port":"2"}' \
diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args
index 70fee9a933..aa5ee67f34 100644
--- a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -36,7 +36,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -device '{"driver":"virtio-net-device","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37"}' \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-device","id":"balloon0"}' \
diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args
index 76858f376d..8d046cb2b8 100644
--- a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -44,7 +44,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","addr":"0x0"}' \
diff --git a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.args
index 9c5534b8d1..6cf80f825b 100644
--- a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.args
index 9c5534b8d1..6cf80f825b 100644
--- a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.args
index daf71112b5..47a612a85d 100644
--- a/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-virt-virtualization.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-virtualization.aarch64-latest.args
index be04ecc641..45c47a7be5 100644
--- a/tests/qemuxmlconfdata/aarch64-virt-virtualization.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-virt-virtualization.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64-virt-default/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.args
index 459f90e542..0be791ec21 100644
--- a/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.args b/tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.args
index 87de002afd..0e69fab7e9 100644
--- a/tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.args
@@ -30,7 +30,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args b/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args
index 2b0b433258..e7ae567768 100644
--- a/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/acpi-table.x86_64-latest.args b/tests/qemuxmlconfdata/acpi-table.x86_64-latest.args
index 78cb1c90ee..69180eb330 100644
--- a/tests/qemuxmlconfdata/acpi-table.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/acpi-table.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args
index 20d7e379e6..041b6695d3 100644
--- a/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.args b/tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.args
index 72d10a732e..ea11dd0fae 100644
--- a/tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/arm-vexpressa9-nodevs.aarch64-latest.args b/tests/qemuxmlconfdata/arm-vexpressa9-nodevs.aarch64-latest.args
index de96ada570..5e3aeb1157 100644
--- a/tests/qemuxmlconfdata/arm-vexpressa9-nodevs.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/arm-vexpressa9-nodevs.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/arm-vexpressa9-virtio.aarch64-latest.args b/tests/qemuxmlconfdata/arm-vexpressa9-virtio.aarch64-latest.args
index 9ead325c95..259ef258fa 100644
--- a/tests/qemuxmlconfdata/arm-vexpressa9-virtio.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/arm-vexpressa9-virtio.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.args b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.args
index 88fe2b62e8..50f5ca6c94 100644
--- a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-update.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.args b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.args
index 88fe2b62e8..50f5ca6c94 100644
--- a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.args
+++ b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/async-teardown.x86_64-latest.args b/tests/qemuxmlconfdata/async-teardown.x86_64-latest.args
index 406617d2f3..481352318c 100644
--- a/tests/qemuxmlconfdata/async-teardown.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/async-teardown.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-alsa-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-alsa-best.x86_64-latest.args
index 6c4d890220..2e01b7f804 100644
--- a/tests/qemuxmlconfdata/audio-alsa-best.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-alsa-best.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-alsa-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-alsa-full.x86_64-latest.args
index 64bf9e72ff..6a14e8c3ed 100644
--- a/tests/qemuxmlconfdata/audio-alsa-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-alsa-full.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-alsa-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-alsa-minimal.x86_64-latest.args
index 2968f01550..bf3559e919 100644
--- a/tests/qemuxmlconfdata/audio-alsa-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-alsa-minimal.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-coreaudio-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-coreaudio-best.x86_64-latest.args
index abb15b5f42..bbff4cdc1f 100644
--- a/tests/qemuxmlconfdata/audio-coreaudio-best.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-coreaudio-best.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-coreaudio-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-coreaudio-full.x86_64-latest.args
index 5d3297951d..81a405d0fb 100644
--- a/tests/qemuxmlconfdata/audio-coreaudio-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-coreaudio-full.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-coreaudio-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-coreaudio-minimal.x86_64-latest.args
index 6ae129ed23..67f04ffde1 100644
--- a/tests/qemuxmlconfdata/audio-coreaudio-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-coreaudio-minimal.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-default-nographics.x86_64-latest.args b/tests/qemuxmlconfdata/audio-default-nographics.x86_64-latest.args
index 2968f01550..bf3559e919 100644
--- a/tests/qemuxmlconfdata/audio-default-nographics.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-default-nographics.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-default-sdl.x86_64-latest.args b/tests/qemuxmlconfdata/audio-default-sdl.x86_64-latest.args
index 07f3bcfce8..005a02aec8 100644
--- a/tests/qemuxmlconfdata/audio-default-sdl.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-default-sdl.x86_64-latest.args
@@ -21,7 +21,7 @@ SDL_AUDIODRIVER=esd \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-default-spice.x86_64-latest.args b/tests/qemuxmlconfdata/audio-default-spice.x86_64-latest.args
index 5aef24f473..cf9cbae6f6 100644
--- a/tests/qemuxmlconfdata/audio-default-spice.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-default-spice.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-default-vnc.x86_64-latest.args b/tests/qemuxmlconfdata/audio-default-vnc.x86_64-latest.args
index 2c43d097e5..288cc08655 100644
--- a/tests/qemuxmlconfdata/audio-default-vnc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-default-vnc.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-file-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-file-best.x86_64-latest.args
index 2ac8073b4d..25f1d02971 100644
--- a/tests/qemuxmlconfdata/audio-file-best.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-file-best.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-file-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-file-full.x86_64-latest.args
index b51662bb63..4c1f5ecab8 100644
--- a/tests/qemuxmlconfdata/audio-file-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-file-full.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-file-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-file-minimal.x86_64-latest.args
index 499cf08c52..6ace7f8b0a 100644
--- a/tests/qemuxmlconfdata/audio-file-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-file-minimal.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-jack-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-jack-full.x86_64-latest.args
index a68e5fa7f7..0beed3b7fc 100644
--- a/tests/qemuxmlconfdata/audio-jack-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-jack-full.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-jack-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-jack-minimal.x86_64-latest.args
index 5b5f887f6e..d00cb57391 100644
--- a/tests/qemuxmlconfdata/audio-jack-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-jack-minimal.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-many-backends.x86_64-latest.args b/tests/qemuxmlconfdata/audio-many-backends.x86_64-latest.args
index bedbbac483..2d0c1301fe 100644
--- a/tests/qemuxmlconfdata/audio-many-backends.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-many-backends.x86_64-latest.args
@@ -21,7 +21,7 @@ PIPEWIRE_RUNTIME_DIR=/run/user/1000 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-none-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-none-best.x86_64-latest.args
index deaad5cbd8..ec31a2e37e 100644
--- a/tests/qemuxmlconfdata/audio-none-best.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-none-best.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-none-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-none-full.x86_64-latest.args
index c0f069cb15..f378102bc3 100644
--- a/tests/qemuxmlconfdata/audio-none-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-none-full.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-none-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-none-minimal.x86_64-latest.args
index 9e0524bbd8..e527f1a552 100644
--- a/tests/qemuxmlconfdata/audio-none-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-none-minimal.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-oss-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-oss-best.x86_64-latest.args
index 6ab36ccd1f..40359165d4 100644
--- a/tests/qemuxmlconfdata/audio-oss-best.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-oss-best.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-oss-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-oss-full.x86_64-latest.args
index eb2b12400c..928c2ffd6e 100644
--- a/tests/qemuxmlconfdata/audio-oss-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-oss-full.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-oss-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-oss-minimal.x86_64-latest.args
index 9f1fa67875..832dd9fdcd 100644
--- a/tests/qemuxmlconfdata/audio-oss-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-oss-minimal.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-pipewire-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-pipewire-best.x86_64-latest.args
index f4a2ac2f57..cff31a2f38 100644
--- a/tests/qemuxmlconfdata/audio-pipewire-best.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-pipewire-best.x86_64-latest.args
@@ -22,7 +22,7 @@ PIPEWIRE_RUNTIME_DIR=/run/user/1000 \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-pipewire-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-pipewire-full.x86_64-latest.args
index fb6d4d7f00..7999952c85 100644
--- a/tests/qemuxmlconfdata/audio-pipewire-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-pipewire-full.x86_64-latest.args
@@ -22,7 +22,7 @@ PIPEWIRE_RUNTIME_DIR=/run/user/1000 \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-pipewire-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-pipewire-minimal.x86_64-latest.args
index f88def88df..327383b1be 100644
--- a/tests/qemuxmlconfdata/audio-pipewire-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-pipewire-minimal.x86_64-latest.args
@@ -22,7 +22,7 @@ PIPEWIRE_RUNTIME_DIR=/run/user/1000 \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-pulseaudio-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-pulseaudio-best.x86_64-latest.args
index 7d58af65d4..969e18ba3d 100644
--- a/tests/qemuxmlconfdata/audio-pulseaudio-best.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-pulseaudio-best.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-pulseaudio-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-pulseaudio-full.x86_64-latest.args
index 818d071aa6..403a593a7b 100644
--- a/tests/qemuxmlconfdata/audio-pulseaudio-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-pulseaudio-full.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-pulseaudio-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-pulseaudio-minimal.x86_64-latest.args
index 6e70e93ee8..8612c04541 100644
--- a/tests/qemuxmlconfdata/audio-pulseaudio-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-pulseaudio-minimal.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-sdl-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-sdl-best.x86_64-latest.args
index be566e7a14..f41654ada4 100644
--- a/tests/qemuxmlconfdata/audio-sdl-best.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-sdl-best.x86_64-latest.args
@@ -22,7 +22,7 @@ SDL_AUDIODRIVER=pulseaudio \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-sdl-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-sdl-full.x86_64-latest.args
index 8c18ece7f9..35f479e9a9 100644
--- a/tests/qemuxmlconfdata/audio-sdl-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-sdl-full.x86_64-latest.args
@@ -22,7 +22,7 @@ SDL_AUDIODRIVER=pulseaudio \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-sdl-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-sdl-minimal.x86_64-latest.args
index 55fc86f9f4..b088f51b24 100644
--- a/tests/qemuxmlconfdata/audio-sdl-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-sdl-minimal.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-spice-best.x86_64-latest.args b/tests/qemuxmlconfdata/audio-spice-best.x86_64-latest.args
index 20c47c9111..889e246ff1 100644
--- a/tests/qemuxmlconfdata/audio-spice-best.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-spice-best.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-spice-full.x86_64-latest.args b/tests/qemuxmlconfdata/audio-spice-full.x86_64-latest.args
index 73382c6a74..e7da40575c 100644
--- a/tests/qemuxmlconfdata/audio-spice-full.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-spice-full.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/audio-spice-minimal.x86_64-latest.args b/tests/qemuxmlconfdata/audio-spice-minimal.x86_64-latest.args
index 5aef24f473..cf9cbae6f6 100644
--- a/tests/qemuxmlconfdata/audio-spice-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/audio-spice-minimal.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/autoindex.x86_64-latest.args b/tests/qemuxmlconfdata/autoindex.x86_64-latest.args
index af45ce005a..97427c3683 100644
--- a/tests/qemuxmlconfdata/autoindex.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/autoindex.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/balloon-ccw-deflate.s390x-latest.args b/tests/qemuxmlconfdata/balloon-ccw-deflate.s390x-latest.args
index 8a993c1d64..1a4d6ddef0 100644
--- a/tests/qemuxmlconfdata/balloon-ccw-deflate.s390x-latest.args
+++ b/tests/qemuxmlconfdata/balloon-ccw-deflate.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/balloon-device-auto.x86_64-latest.args b/tests/qemuxmlconfdata/balloon-device-auto.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/balloon-device-auto.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/balloon-device-auto.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 023a29f22e..b7129922f5 100644
--- a/tests/qemuxmlconfdata/balloon-device-deflate-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/balloon-device-deflate-off.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/balloon-device-deflate.x86_64-latest.args b/tests/qemuxmlconfdata/balloon-device-deflate.x86_64-latest.args
index 32de9a4a85..524f48ed18 100644
--- a/tests/qemuxmlconfdata/balloon-device-deflate.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/balloon-device-deflate.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/balloon-device-period.x86_64-latest.args b/tests/qemuxmlconfdata/balloon-device-period.x86_64-latest.args
index 0763a63f3c..2c7a068980 100644
--- a/tests/qemuxmlconfdata/balloon-device-period.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/balloon-device-period.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/balloon-device.x86_64-latest.args b/tests/qemuxmlconfdata/balloon-device.x86_64-latest.args
index 0763a63f3c..2c7a068980 100644
--- a/tests/qemuxmlconfdata/balloon-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/balloon-device.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.args b/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.args
index 89089c9d6b..527f6cc445 100644
--- a/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/blkdeviotune-group-num.x86_64-latest.args b/tests/qemuxmlconfdata/blkdeviotune-group-num.x86_64-latest.args
index 38d38734f5..d550d0254e 100644
--- a/tests/qemuxmlconfdata/blkdeviotune-group-num.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/blkdeviotune-group-num.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/blkdeviotune-max-length.x86_64-latest.args b/tests/qemuxmlconfdata/blkdeviotune-max-length.x86_64-latest.args
index 38d38734f5..d550d0254e 100644
--- a/tests/qemuxmlconfdata/blkdeviotune-max-length.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/blkdeviotune-max-length.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/blkdeviotune-max.x86_64-latest.args b/tests/qemuxmlconfdata/blkdeviotune-max.x86_64-latest.args
index 38d38734f5..d550d0254e 100644
--- a/tests/qemuxmlconfdata/blkdeviotune-max.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/blkdeviotune-max.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/blkdeviotune.x86_64-latest.args b/tests/qemuxmlconfdata/blkdeviotune.x86_64-latest.args
index 7a2f740309..d08e842de5 100644
--- a/tests/qemuxmlconfdata/blkdeviotune.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/blkdeviotune.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/blkiotune-device.x86_64-latest.args b/tests/qemuxmlconfdata/blkiotune-device.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/blkiotune-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/blkiotune-device.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/blkiotune.x86_64-latest.args b/tests/qemuxmlconfdata/blkiotune.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/blkiotune.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/blkiotune.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/boot-cdrom.x86_64-latest.args b/tests/qemuxmlconfdata/boot-cdrom.x86_64-latest.args
index 9e0524bbd8..e527f1a552 100644
--- a/tests/qemuxmlconfdata/boot-cdrom.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-cdrom.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/boot-complex.x86_64-latest.args b/tests/qemuxmlconfdata/boot-complex.x86_64-latest.args
index 447897a657..560256f817 100644
--- a/tests/qemuxmlconfdata/boot-complex.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-complex.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/boot-floppy-q35.x86_64-latest.args b/tests/qemuxmlconfdata/boot-floppy-q35.x86_64-latest.args
index 3c7c21c22f..139df16e0c 100644
--- a/tests/qemuxmlconfdata/boot-floppy-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-floppy-q35.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/boot-floppy.x86_64-latest.args b/tests/qemuxmlconfdata/boot-floppy.x86_64-latest.args
index 7233a55760..bb2c61d848 100644
--- a/tests/qemuxmlconfdata/boot-floppy.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-floppy.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 75241ab120..1c395e692b 100644
--- a/tests/qemuxmlconfdata/boot-menu-disable-drive.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-menu-disable-drive.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 75241ab120..1c395e692b 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/boot-menu-disable.x86_64-latest.args b/tests/qemuxmlconfdata/boot-menu-disable.x86_64-latest.args
index 75241ab120..1c395e692b 100644
--- a/tests/qemuxmlconfdata/boot-menu-disable.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-menu-disable.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 fddb55c66c..dbbb870316 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/boot-menu-enable.x86_64-latest.args b/tests/qemuxmlconfdata/boot-menu-enable.x86_64-latest.args
index c84c68f76e..0bd2b840d5 100644
--- a/tests/qemuxmlconfdata/boot-menu-enable.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-menu-enable.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/boot-multi.x86_64-latest.args b/tests/qemuxmlconfdata/boot-multi.x86_64-latest.args
index c84c68f76e..0bd2b840d5 100644
--- a/tests/qemuxmlconfdata/boot-multi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-multi.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/boot-network.x86_64-latest.args b/tests/qemuxmlconfdata/boot-network.x86_64-latest.args
index 4c83ca3ee4..437ea6705b 100644
--- a/tests/qemuxmlconfdata/boot-network.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-network.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/boot-order.x86_64-latest.args b/tests/qemuxmlconfdata/boot-order.x86_64-latest.args
index 0dfff1924f..4dd2a967ee 100644
--- a/tests/qemuxmlconfdata/boot-order.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/boot-order.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/channel-guestfwd.x86_64-latest.args b/tests/qemuxmlconfdata/channel-guestfwd.x86_64-latest.args
index 03533b358b..5ae6012019 100644
--- a/tests/qemuxmlconfdata/channel-guestfwd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-guestfwd.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 cd81e6989d..0b5d84a6d2 100644
--- a/tests/qemuxmlconfdata/channel-qemu-vdagent-features.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-qemu-vdagent-features.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/channel-qemu-vdagent.x86_64-latest.args b/tests/qemuxmlconfdata/channel-qemu-vdagent.x86_64-latest.args
index 3edcb4c9f8..7934e9e496 100644
--- a/tests/qemuxmlconfdata/channel-qemu-vdagent.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-qemu-vdagent.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/channel-spicevmc.x86_64-latest.args b/tests/qemuxmlconfdata/channel-spicevmc.x86_64-latest.args
index 78ace7047a..0057c8ea39 100644
--- a/tests/qemuxmlconfdata/channel-spicevmc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-spicevmc.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args b/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args
index cec97c4e66..5c631f35ea 100644
--- a/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args
@@ -21,13 +21,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -netdev '{"type":"user","guestfwd":[{"str":"tcp:10.0.2.1:4600-chardev:charchannel0"}],"id":"channel0"}' \
 -chardev socket,id=charchannel1,path=/tmp/guestfwd-connect.socket \
 -netdev '{"type":"user","guestfwd":[{"str":"tcp:10.0.2.1:4601-chardev:charchannel1"}],"id":"channel1"}' \
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 845236d286..c6247fbad1 100644
--- a/tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.args
@@ -21,32 +21,32 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
 -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x2"}' \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
--chardev socket,id=charchannel1,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel1,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel1","id":"channel1","name":"org.qemu.guest_agent.1"}' \
--chardev socket,id=charchannel2,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel2,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chardev":"charchannel2","id":"channel2","name":"org.qemu.guest_agent.2"}' \
--chardev socket,id=charchannel3,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel3,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chardev":"charchannel3","id":"channel3","name":"org.qemu.guest_agent.3"}' \
--chardev socket,id=charchannel4,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel4,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":5,"chardev":"charchannel4","id":"channel4","name":"org.qemu.guest_agent.4"}' \
--chardev socket,id=charchannel5,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel5,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":6,"chardev":"charchannel5","id":"channel5","name":"org.qemu.guest_agent.5"}' \
--chardev socket,id=charchannel6,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel6,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":7,"chardev":"charchannel6","id":"channel6","name":"org.qemu.guest_agent.6"}' \
--chardev socket,id=charchannel7,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel7,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":8,"chardev":"charchannel7","id":"channel7","name":"org.qemu.guest_agent.7"}' \
--chardev socket,id=charchannel8,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel8,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":9,"chardev":"charchannel8","id":"channel8","name":"org.qemu.guest_agent.8"}' \
--chardev socket,id=charchannel9,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel9,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":10,"chardev":"charchannel9","id":"channel9","name":"org.qemu.guest_agent.9"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
diff --git a/tests/qemuxmlconfdata/channel-virtio-auto.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-auto.x86_64-latest.args
index 1b223fe845..522c135e1e 100644
--- a/tests/qemuxmlconfdata/channel-virtio-auto.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-virtio-auto.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/channel-virtio-autoadd.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-autoadd.x86_64-latest.args
index 2e6b1d9dbc..30f65ade74 100644
--- a/tests/qemuxmlconfdata/channel-virtio-autoadd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-virtio-autoadd.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/channel-virtio-autoassign.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-autoassign.x86_64-latest.args
index ad1a195275..1d01bb5791 100644
--- a/tests/qemuxmlconfdata/channel-virtio-autoassign.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-virtio-autoassign.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/channel-virtio-default.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-default.x86_64-latest.args
index d952e629f2..4fb74a595d 100644
--- a/tests/qemuxmlconfdata/channel-virtio-default.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-virtio-default.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/channel-virtio-state.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-state.x86_64-latest.args
index e3dd3add7d..c655cb04a8 100644
--- a/tests/qemuxmlconfdata/channel-virtio-state.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-virtio-state.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args
index 2f8c4b6a55..70d4e0cfc5 100644
--- a/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -31,13 +31,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0","addr":"0xa"}' \
 -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \
 -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-storage","id":"ide0-0-0","bootindex":1}' \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
--chardev socket,id=charchannel1,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel1,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel1","id":"channel1"}' \
--chardev socket,id=charchannel2,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel2,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chardev":"charchannel2","id":"channel2","name":"ble"}' \
--chardev socket,id=charchannel3,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel3,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chardev":"charchannel3","id":"channel3","name":"fdsa"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
diff --git a/tests/qemuxmlconfdata/channel-virtio.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio.x86_64-latest.args
index c402b515dd..8e4aa1c5cc 100644
--- a/tests/qemuxmlconfdata/channel-virtio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-virtio.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args
index a363549b81..ea08a0b651 100644
--- a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args
+++ b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev '{"id":"charmonitor","backend":{"type":"socket","data":{"addr":{"type":"fd","data":{"str":"1729"}},"server":true,"wait":false}}}' \
+-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 \
 -rtc base=utc \
 -no-shutdown \
@@ -46,7 +46,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":6,"chardev":"charchannel5","id":"channel5","name":"chardev-pipe"}' \
 -chardev '{"id":"charchannel6","backend":{"type":"serial","data":{"device":"/path/to/device"}}}' \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":7,"chardev":"charchannel6","id":"channel6","name":"chardev-dev"}' \
--chardev '{"id":"charchannel7","backend":{"type":"socket","data":{"addr":{"type":"fd","data":{"str":"1729"}},"server":true,"wait":false}}}' \
+-chardev '{"id":"charchannel7","backend":{"type":"socket","data":{"addr":{"type":"fd","data":{"str":"XXXXXXX"}},"server":true,"wait":false}}}' \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":8,"chardev":"charchannel7","id":"channel7","name":"chardev-unix-listen"}' \
 -chardev '{"id":"charchannel8","backend":{"type":"socket","data":{"addr":{"type":"unix","data":{"path":"/path/to/unix-listen"}},"server":false,"reconnect":2}}}' \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":9,"chardev":"charchannel8","id":"channel8","name":"chardev-unix-connect"}' \
diff --git a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args
index 43a56f7c22..b52e836f1f 100644
--- a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev '{"id":"charmonitor","backend":{"type":"socket","data":{"addr":{"type":"fd","data":{"str":"1729"}},"server":true,"wait":false}}}' \
+-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 \
 -rtc base=utc \
 -no-shutdown \
@@ -46,7 +46,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":6,"chardev":"charchannel5","id":"channel5","name":"chardev-pipe"}' \
 -chardev '{"id":"charchannel6","backend":{"type":"serial","data":{"device":"/path/to/device"}}}' \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":7,"chardev":"charchannel6","id":"channel6","name":"chardev-dev"}' \
--chardev '{"id":"charchannel7","backend":{"type":"socket","data":{"addr":{"type":"fd","data":{"str":"1729"}},"server":true,"wait":false}}}' \
+-chardev '{"id":"charchannel7","backend":{"type":"socket","data":{"addr":{"type":"fd","data":{"str":"XXXXXXX"}},"server":true,"wait":false}}}' \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":8,"chardev":"charchannel7","id":"channel7","name":"chardev-unix-listen"}' \
 -chardev '{"id":"charchannel8","backend":{"type":"socket","data":{"addr":{"type":"unix","data":{"path":"/path/to/unix-listen"}},"server":false,"reconnect-ms":2000}}}' \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":9,"chardev":"charchannel8","id":"channel8","name":"chardev-unix-connect"}' \
diff --git a/tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args b/tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args
index 4d8511a95f..578fbc5d96 100644
--- a/tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args
+++ b/tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -46,7 +46,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":6,"chardev":"charchannel5","id":"channel5","name":"chardev-pipe"}' \
 -chardev serial,id=charchannel6,path=/path/to/device \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":7,"chardev":"charchannel6","id":"channel6","name":"chardev-dev"}' \
--chardev socket,id=charchannel7,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel7,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":8,"chardev":"charchannel7","id":"channel7","name":"chardev-unix-listen"}' \
 -chardev socket,id=charchannel8,path=/path/to/unix-listen,reconnect=2 \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":9,"chardev":"charchannel8","id":"channel8","name":"chardev-unix-connect"}' \
diff --git a/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args b/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args
index bd5af10bb7..61ec4fac66 100644
--- a/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -46,7 +46,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":6,"chardev":"charchannel5","id":"channel5","name":"chardev-pipe"}' \
 -chardev serial,id=charchannel6,path=/path/to/device \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":7,"chardev":"charchannel6","id":"channel6","name":"chardev-dev"}' \
--chardev socket,id=charchannel7,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel7,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":8,"chardev":"charchannel7","id":"channel7","name":"chardev-unix-listen"}' \
 -chardev socket,id=charchannel8,path=/path/to/unix-listen,reconnect-ms=2000 \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":9,"chardev":"charchannel8","id":"channel8","name":"chardev-unix-connect"}' \
diff --git a/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args b/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args
index b3c79cfd18..2c721abf3b 100644
--- a/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-machine/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/chardev-reconnect.x86_64-9.1.0.args b/tests/qemuxmlconfdata/chardev-reconnect.x86_64-9.1.0.args
index 93a0fbbe74..fb8c2b5a5a 100644
--- a/tests/qemuxmlconfdata/chardev-reconnect.x86_64-9.1.0.args
+++ b/tests/qemuxmlconfdata/chardev-reconnect.x86_64-9.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/chardev-reconnect.x86_64-latest.args b/tests/qemuxmlconfdata/chardev-reconnect.x86_64-latest.args
index 7ff6a67bc4..e71229f173 100644
--- a/tests/qemuxmlconfdata/chardev-reconnect.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/chardev-reconnect.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/clock-absolute.x86_64-latest.args b/tests/qemuxmlconfdata/clock-absolute.x86_64-latest.args
index f46415b903..3b1b19b590 100644
--- a/tests/qemuxmlconfdata/clock-absolute.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-absolute.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=9999-12-31T23:59:59 \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/clock-catchup.x86_64-latest.args b/tests/qemuxmlconfdata/clock-catchup.x86_64-latest.args
index c1191ba50a..519991d238 100644
--- a/tests/qemuxmlconfdata/clock-catchup.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-catchup.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,driftfix=slew \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/clock-france.x86_64-latest.args b/tests/qemuxmlconfdata/clock-france.x86_64-latest.args
index d8a5cf89b2..3b56c13745 100644
--- a/tests/qemuxmlconfdata/clock-france.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-france.x86_64-latest.args
@@ -22,7 +22,7 @@ TZ=Europe/Paris \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=localtime \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/clock-hpet-off.x86_64-7.2.0.args b/tests/qemuxmlconfdata/clock-hpet-off.x86_64-7.2.0.args
index 47bff8d51c..d7658a989a 100644
--- a/tests/qemuxmlconfdata/clock-hpet-off.x86_64-7.2.0.args
+++ b/tests/qemuxmlconfdata/clock-hpet-off.x86_64-7.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
diff --git a/tests/qemuxmlconfdata/clock-hpet-off.x86_64-latest.args b/tests/qemuxmlconfdata/clock-hpet-off.x86_64-latest.args
index 8b9b2cf1c3..1a277c5212 100644
--- a/tests/qemuxmlconfdata/clock-hpet-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-hpet-off.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
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 617b31aea6..30372e7c13 100644
--- a/tests/qemuxmlconfdata/clock-localtime-basis-localtime.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-localtime-basis-localtime.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=2009-02-14T00:01:30 \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/clock-localtime.x86_64-latest.args b/tests/qemuxmlconfdata/clock-localtime.x86_64-latest.args
index eb66aadb79..f6dd582eff 100644
--- a/tests/qemuxmlconfdata/clock-localtime.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-localtime.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=localtime \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/clock-realtime.x86_64-latest.args b/tests/qemuxmlconfdata/clock-realtime.x86_64-latest.args
index d95b17493b..002c1b5b9e 100644
--- a/tests/qemuxmlconfdata/clock-realtime.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-realtime.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,clock=rt \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/clock-timer-armvtimer.aarch64-latest.args b/tests/qemuxmlconfdata/clock-timer-armvtimer.aarch64-latest.args
index 940a83a03d..53030f00b0 100644
--- a/tests/qemuxmlconfdata/clock-timer-armvtimer.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/clock-timer-armvtimer.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 c85a433da0..ac6a75cb5c 100644
--- a/tests/qemuxmlconfdata/clock-timer-hyperv-rtc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-timer-hyperv-rtc.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/clock-utc.x86_64-latest.args b/tests/qemuxmlconfdata/clock-utc.x86_64-latest.args
index 9493ded1c7..d59f1717d9 100644
--- a/tests/qemuxmlconfdata/clock-utc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-utc.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/clock-variable.x86_64-latest.args b/tests/qemuxmlconfdata/clock-variable.x86_64-latest.args
index 338db8d409..473a778b55 100644
--- a/tests/qemuxmlconfdata/clock-variable.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/clock-variable.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=2009-02-15T09:49:06 \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/console-compat-auto.x86_64-latest.args b/tests/qemuxmlconfdata/console-compat-auto.x86_64-latest.args
index 8b128669d1..b49d6ed233 100644
--- a/tests/qemuxmlconfdata/console-compat-auto.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/console-compat-auto.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/console-compat-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/console-compat-chardev.x86_64-latest.args
index 8b128669d1..b49d6ed233 100644
--- a/tests/qemuxmlconfdata/console-compat-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/console-compat-chardev.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/console-compat-crash.x86_64-latest.args b/tests/qemuxmlconfdata/console-compat-crash.x86_64-latest.args
index 3738d252a4..01fbbc8729 100644
--- a/tests/qemuxmlconfdata/console-compat-crash.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/console-compat-crash.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-D/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/console-compat.x86_64-latest.args b/tests/qemuxmlconfdata/console-compat.x86_64-latest.args
index 1ea5610b58..5aa8e55ab8 100644
--- a/tests/qemuxmlconfdata/console-compat.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/console-compat.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/console-compat2.x86_64-latest.args b/tests/qemuxmlconfdata/console-compat2.x86_64-latest.args
index 6e59ee81f2..20361c86ed 100644
--- a/tests/qemuxmlconfdata/console-compat2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/console-compat2.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/console-sclp.s390x-latest.args b/tests/qemuxmlconfdata/console-sclp.s390x-latest.args
index 09c0df6954..a4ec642377 100644
--- a/tests/qemuxmlconfdata/console-sclp.s390x-latest.args
+++ b/tests/qemuxmlconfdata/console-sclp.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.args b/tests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.args
index 547243529a..ce86f9043b 100644
--- a/tests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.args
+++ b/tests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/console-virtio-many.x86_64-latest.args b/tests/qemuxmlconfdata/console-virtio-many.x86_64-latest.args
index d0536011ec..48842c863b 100644
--- a/tests/qemuxmlconfdata/console-virtio-many.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/console-virtio-many.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 8070b3e2af..0c88619892 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args b/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args
index cd91e93e8d..9925ad4230 100644
--- a/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args
@@ -21,14 +21,14 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
 -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x2"}' \
--chardev socket,id=charconsole0,fd=1729,server=on,wait=off \
+-chardev socket,id=charconsole0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}' \
 -chardev socket,id=charconsole1,path=/tmp/connect.socket \
 -device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}' \
diff --git a/tests/qemuxmlconfdata/console-virtio.x86_64-latest.args b/tests/qemuxmlconfdata/console-virtio.x86_64-latest.args
index 9bde4b53b1..0d77888a65 100644
--- a/tests/qemuxmlconfdata/console-virtio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/console-virtio.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/controller-order.x86_64-latest.args b/tests/qemuxmlconfdata/controller-order.x86_64-latest.args
index a052f4fb8f..87cae5c6bf 100644
--- a/tests/qemuxmlconfdata/controller-order.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/controller-order.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr/.config \
 -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/controller-scsi-auto.x86_64-latest.args b/tests/qemuxmlconfdata/controller-scsi-auto.x86_64-latest.args
index 9283d9ab19..210189306f 100644
--- a/tests/qemuxmlconfdata/controller-scsi-auto.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/controller-scsi-auto.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args
index cdfa9dd447..3ad0b16b7b 100644
--- a/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-rhel7/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/controller-virtio-scsi.x86_64-latest.args b/tests/qemuxmlconfdata/controller-virtio-scsi.x86_64-latest.args
index e7f7c2819b..93b14f58aa 100644
--- a/tests/qemuxmlconfdata/controller-virtio-scsi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/controller-virtio-scsi.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-Haswell-noTSX.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-Haswell-noTSX.x86_64-latest.args
index 41e7045dad..26f22eb8e9 100644
--- a/tests/qemuxmlconfdata/cpu-Haswell-noTSX.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-Haswell-noTSX.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.args
index bfbb2d8700..48e1f4a085 100644
--- a/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.args
index 84e9e86127..788e038354 100644
--- a/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.args
index 4c2cdf0484..b221c5a612 100644
--- a/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 dc4a503dba..c1b4e7561e 100644
--- a/tests/qemuxmlconfdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-cache-disable.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-cache-disable.x86_64-latest.args
index f4b2fc51d6..958bf65bfc 100644
--- a/tests/qemuxmlconfdata/cpu-cache-disable.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-cache-disable.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-cache-disable3.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-cache-disable3.x86_64-latest.args
index 1e962589c9..1d2da8ae95 100644
--- a/tests/qemuxmlconfdata/cpu-cache-disable3.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-cache-disable3.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 15ca76b6ab..bcd8fdc5b7 100644
--- a/tests/qemuxmlconfdata/cpu-cache-emulate-l3.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-cache-emulate-l3.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-cache-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-cache-passthrough.x86_64-latest.args
index 90261c5e5a..b09a5aa8b6 100644
--- a/tests/qemuxmlconfdata/cpu-cache-passthrough.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-cache-passthrough.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 2f81053374..a0b72ec7c2 100644
--- a/tests/qemuxmlconfdata/cpu-check-default-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-check-default-none.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 3de38f2a61..e08ed48c1e 100644
--- a/tests/qemuxmlconfdata/cpu-check-default-none2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-check-default-none2.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 fe553fd31b..08048c9f29 100644
--- a/tests/qemuxmlconfdata/cpu-check-default-partial.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-check-default-partial.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 a0cbbdd040..c65d9fe085 100644
--- a/tests/qemuxmlconfdata/cpu-check-default-partial2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-check-default-partial2.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-check-none.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-check-none.x86_64-latest.args
index a0cbbdd040..c65d9fe085 100644
--- a/tests/qemuxmlconfdata/cpu-check-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-check-none.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-empty.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-empty.x86_64-latest.args
index 46bc2fe37a..ad33e4bec9 100644
--- a/tests/qemuxmlconfdata/cpu-empty.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-empty.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-cpu-empty/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-eoi-disabled.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-eoi-disabled.x86_64-latest.args
index 34d81afdf7..e56f11d838 100644
--- a/tests/qemuxmlconfdata/cpu-eoi-disabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-eoi-disabled.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-eoi-enabled.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-eoi-enabled.x86_64-latest.args
index 5a9313be11..fca96ce4e4 100644
--- a/tests/qemuxmlconfdata/cpu-eoi-enabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-eoi-enabled.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-exact1.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-exact1.x86_64-latest.args
index bdc50b229f..5de6937548 100644
--- a/tests/qemuxmlconfdata/cpu-exact1.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-exact1.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-exact2-nofallback.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-exact2-nofallback.x86_64-latest.args
index 7464609aba..51bf31b41a 100644
--- a/tests/qemuxmlconfdata/cpu-exact2-nofallback.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-exact2-nofallback.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-exact2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-exact2.x86_64-latest.args
index 7464609aba..51bf31b41a 100644
--- a/tests/qemuxmlconfdata/cpu-exact2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-exact2.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.args
index b0ce1dfcbd..94e4add6f6 100644
--- a/tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-kvmclock.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-kvmclock.x86_64-latest.args
index 4201ea331c..51ccf7a7e2 100644
--- a/tests/qemuxmlconfdata/cpu-host-kvmclock.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-kvmclock.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 d6b57d40a3..1aaa804464 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-cmt.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-cmt.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.0.0.args
index 08f37274b2..03030406a6 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.1.0.args
index e4044a0c64..4d3567df5f 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.2.0.args
index 309dc80244..f48ad3bba8 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-11.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-11.0.0.args
index 9b336f1bfb..6156109c24 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-11.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-11.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.args
index 5d69199876..abaa5c4e64 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.args
index e7b424819e..bac3b0b155 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args
index 58ad565dba..8dd87918ff 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.2.0.args
index fa1b674fa5..476d68f43d 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.0.0.args
index fc9985f901..ad9ef97cb9 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.1.0.args
index 1db86cb31e..72e4ec78d6 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.2.0.args
index 4dcd9332cb..d55c0ae2b2 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 9b336f1bfb..6156109c24 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.0.0.args
index 96c0676ff3..eeb5f996bd 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.1.0.args
index 0b67c7f158..c6129599bf 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.2.0.args
index 4daf8c40c4..c9fca6aaaa 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-11.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-11.0.0.args
index 443de62f69..355bfc698f 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-11.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-11.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args
index 20b3865d00..0253ae37cf 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args
index 7e1a3a8be8..b8ce0b0fb1 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args
index 2c81adbb23..886f2970c4 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.2.0.args
index 558ad39d14..84be19d211 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.0.0.args
index 512c5c311d..2f1902a2c6 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.1.0.args
index bd3ee8e16c..283b8453d4 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.2.0.args
index 5f8f093a0e..8e3f108342 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 443de62f69..355bfc698f 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 d6e95be750..3f0ba42245 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.0.0.args
index 7dd5723b98..96553ea43f 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.1.0.args
index 987baa9b30..e1f4e8627b 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.2.0.args
index 34e873b4c8..01967b5d33 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-11.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-11.0.0.args
index 1a77a95efd..03a50ad684 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-11.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-11.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.2.0.args
index 7e90b309a9..75c2c28af2 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.0.0.args
index fc02c9a7e0..92d835ef3b 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.1.0.args
index 8360dc02ef..bc3c56159f 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.2.0.args
index b00138933c..ddd33305d1 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.0.0.args
index 3b42130bd2..3b8d4fa52a 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.1.0.args
index c451426cdd..4ae97ecf86 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.2.0.args
index 1da6e508ff..5502035956 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 1a77a95efd..03a50ad684 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.0.0.args
index 08f37274b2..03030406a6 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.1.0.args
index e4044a0c64..4d3567df5f 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.2.0.args
index 309dc80244..f48ad3bba8 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-11.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-11.0.0.args
index 9b336f1bfb..6156109c24 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-11.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-11.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.args
index 5d69199876..abaa5c4e64 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.args
index e7b424819e..bac3b0b155 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args
index 58ad565dba..8dd87918ff 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.2.0.args
index fa1b674fa5..476d68f43d 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.0.0.args
index fc9985f901..ad9ef97cb9 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.1.0.args
index 1db86cb31e..72e4ec78d6 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.2.0.args
index 4dcd9332cb..d55c0ae2b2 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 9b336f1bfb..6156109c24 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.0.0.args
index 96c0676ff3..eeb5f996bd 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.1.0.args
index 0b67c7f158..c6129599bf 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.2.0.args
index 4daf8c40c4..c9fca6aaaa 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-11.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-11.0.0.args
index 443de62f69..355bfc698f 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-11.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-11.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args
index 20b3865d00..0253ae37cf 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args
index 7e1a3a8be8..b8ce0b0fb1 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args
index 2c81adbb23..886f2970c4 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.2.0.args
index 558ad39d14..84be19d211 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.0.0.args
index 512c5c311d..2f1902a2c6 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.1.0.args
index bd3ee8e16c..283b8453d4 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.2.0.args
index 5f8f093a0e..8e3f108342 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 443de62f69..355bfc698f 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.0.0.args
index 16b4723949..bbd3a7bb71 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.1.0.args
index d12cb96786..69a3c7cb42 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.2.0.args
index 627ee603f4..8ac7f31e9c 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-11.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-11.0.0.args
index 688a217c3c..27234506b3 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-11.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-11.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args
index 87eab5218e..7a70e9e8b7 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args
index 7ca5d33b42..30a685983a 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args
index 9763f7370b..d23e83746a 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.2.0.args
index 2da4052d73..375db1efea 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.0.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.0.0.args
index fb06433ce6..59bfc7cedd 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.1.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.1.0.args
index daefe46b24..a1dad82651 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.2.0.args b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.2.0.args
index 46cbd8e46c..18d610c998 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 688a217c3c..27234506b3 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 ef7d442d5b..c556f6c1a9 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-vendor.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-vendor.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 efd481e58c..356de55fc8 100644
--- a/tests/qemuxmlconfdata/cpu-host-passthrough-features.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-passthrough-features.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-host-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-host-passthrough.x86_64-latest.args
index 2f81053374..a0b72ec7c2 100644
--- a/tests/qemuxmlconfdata/cpu-host-passthrough.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-passthrough.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-hotplug-startup.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-hotplug-startup.x86_64-latest.args
index af1b464104..715639ce12 100644
--- a/tests/qemuxmlconfdata/cpu-hotplug-startup.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-hotplug-startup.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-kvmclock.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-kvmclock.x86_64-latest.args
index bde2ee047d..20deb4dff4 100644
--- a/tests/qemuxmlconfdata/cpu-kvmclock.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-kvmclock.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-minimum1.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-minimum1.x86_64-latest.args
index fe553fd31b..08048c9f29 100644
--- a/tests/qemuxmlconfdata/cpu-minimum1.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-minimum1.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-minimum2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-minimum2.x86_64-latest.args
index ddd0c64080..eff6930c84 100644
--- a/tests/qemuxmlconfdata/cpu-minimum2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-minimum2.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-model-deprecated-features-none.s390x-latest.args b/tests/qemuxmlconfdata/cpu-model-deprecated-features-none.s390x-latest.args
index 2305f6b194..4a7be00fa0 100644
--- a/tests/qemuxmlconfdata/cpu-model-deprecated-features-none.s390x-latest.args
+++ b/tests/qemuxmlconfdata/cpu-model-deprecated-features-none.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-latest.args b/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-latest.args
index 2305f6b194..4a7be00fa0 100644
--- a/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-latest.args
+++ b/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-latest.args b/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-latest.args
index e0d433e77e..1f1f7c7ec0 100644
--- a/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-latest.args
+++ b/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 a0cbbdd040..c65d9fe085 100644
--- a/tests/qemuxmlconfdata/cpu-no-removed-features.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-no-removed-features.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.args b/tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.args
index b0ce1dfcbd..94e4add6f6 100644
--- a/tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-numa-disjoint.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-numa-disjoint.x86_64-latest.args
index 22fca082a8..448c1113a6 100644
--- a/tests/qemuxmlconfdata/cpu-numa-disjoint.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-numa-disjoint.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-numa-disordered.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-numa-disordered.x86_64-latest.args
index bc4a6ad5f3..7bbb3422d7 100644
--- a/tests/qemuxmlconfdata/cpu-numa-disordered.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-numa-disordered.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-numa-memory-oldstyle.x86_64-10.2.0.args b/tests/qemuxmlconfdata/cpu-numa-memory-oldstyle.x86_64-10.2.0.args
index 5c936add9a..90a1930ac0 100644
--- a/tests/qemuxmlconfdata/cpu-numa-memory-oldstyle.x86_64-10.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-numa-memory-oldstyle.x86_64-10.2.0.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-numa-memshared.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-numa-memshared.x86_64-latest.args
index 1e486b1bbc..97831d818e 100644
--- a/tests/qemuxmlconfdata/cpu-numa-memshared.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-numa-memshared.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 59372c4ab9..647531140c 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
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-numa1.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-numa1.x86_64-latest.args
index 59372c4ab9..647531140c 100644
--- a/tests/qemuxmlconfdata/cpu-numa1.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-numa1.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-numa2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-numa2.x86_64-latest.args
index 59372c4ab9..647531140c 100644
--- a/tests/qemuxmlconfdata/cpu-numa2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-numa2.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 801b75b317..a73bb20e47 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 3bf7649161..99251d2905 100644
--- a/tests/qemuxmlconfdata/cpu-phys-bits-emulate.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-phys-bits-emulate.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 3808af7399..6f995a484a 100644
--- a/tests/qemuxmlconfdata/cpu-phys-bits-emulate2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-phys-bits-emulate2.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 16f96b1c63..9a0187d6b6 100644
--- a/tests/qemuxmlconfdata/cpu-phys-bits-limit.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-phys-bits-limit.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 9dea8a3b1b..189b7af3d5 100644
--- a/tests/qemuxmlconfdata/cpu-phys-bits-passthrough.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-phys-bits-passthrough.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-s390-features.s390x-latest.args b/tests/qemuxmlconfdata/cpu-s390-features.s390x-latest.args
index 6a95997ff5..3f93ec2a8e 100644
--- a/tests/qemuxmlconfdata/cpu-s390-features.s390x-latest.args
+++ b/tests/qemuxmlconfdata/cpu-s390-features.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-s390-zEC12.s390x-latest.args b/tests/qemuxmlconfdata/cpu-s390-zEC12.s390x-latest.args
index c47ad9e17c..e7f04a17c4 100644
--- a/tests/qemuxmlconfdata/cpu-s390-zEC12.s390x-latest.args
+++ b/tests/qemuxmlconfdata/cpu-s390-zEC12.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.args
index 7e870db393..18f38c172d 100644
--- a/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-topology1.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-topology1.x86_64-latest.args
index af1b464104..715639ce12 100644
--- a/tests/qemuxmlconfdata/cpu-topology1.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-topology1.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-topology2.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-topology2.x86_64-latest.args
index 8560eb6126..71b04e4d30 100644
--- a/tests/qemuxmlconfdata/cpu-topology2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-topology2.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-topology3.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-topology3.x86_64-latest.args
index 3878c558b8..a5ec1cce16 100644
--- a/tests/qemuxmlconfdata/cpu-topology3.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-topology3.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-topology4.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-topology4.x86_64-latest.args
index 8720038c0d..360da3bcf0 100644
--- a/tests/qemuxmlconfdata/cpu-topology4.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-topology4.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.args b/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.args
index 123657577d..e53c31a5d8 100644
--- a/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args
index d425866c67..fab0aaabba 100644
--- a/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.args b/tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.args
index e926d309f5..eb4c3e0cbf 100644
--- a/tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 724c036155..3916fa2e62 100644
--- a/tests/qemuxmlconfdata/cputune-cpuset-big-id.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cputune-cpuset-big-id.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cputune-numatune.x86_64-latest.args b/tests/qemuxmlconfdata/cputune-numatune.x86_64-latest.args
index a0e4815d6a..5bf2b435b3 100644
--- a/tests/qemuxmlconfdata/cputune-numatune.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cputune-numatune.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-dummy2/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cputune-zero-shares.x86_64-latest.args b/tests/qemuxmlconfdata/cputune-zero-shares.x86_64-latest.args
index 724c036155..3916fa2e62 100644
--- a/tests/qemuxmlconfdata/cputune-zero-shares.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cputune-zero-shares.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/cputune.x86_64-latest.args b/tests/qemuxmlconfdata/cputune.x86_64-latest.args
index 68abff6420..ebd62e6bc6 100644
--- a/tests/qemuxmlconfdata/cputune.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cputune.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/crypto-builtin.x86_64-latest.args b/tests/qemuxmlconfdata/crypto-builtin.x86_64-latest.args
index c9a98d3001..8e127b800a 100644
--- a/tests/qemuxmlconfdata/crypto-builtin.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/crypto-builtin.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 fc060fefb3..5b5d44004c 100644
--- a/tests/qemuxmlconfdata/default-kvm-host-arch.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/default-kvm-host-arch.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-kvm/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 6d1154f9e5..6ac2549a5a 100644
--- a/tests/qemuxmlconfdata/default-qemu-host-arch.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/default-qemu-host-arch.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-qemu-host/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/default-video-type-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/default-video-type-aarch64.aarch64-latest.args
index d67890b771..dae5d408d5 100644
--- a/tests/qemuxmlconfdata/default-video-type-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/default-video-type-aarch64.aarch64-latest.args
@@ -19,7 +19,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-default-video-type-a/.config \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/default-video-type-loongarch64.loongarch64-latest.args b/tests/qemuxmlconfdata/default-video-type-loongarch64.loongarch64-latest.args
index 0a76cca6ce..bdfaa51d2e 100644
--- a/tests/qemuxmlconfdata/default-video-type-loongarch64.loongarch64-latest.args
+++ b/tests/qemuxmlconfdata/default-video-type-loongarch64.loongarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-default-video-type-l/.config \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/default-video-type-ppc64.ppc64-latest.args b/tests/qemuxmlconfdata/default-video-type-ppc64.ppc64-latest.args
index bb0b5a31b1..a668c3ed41 100644
--- a/tests/qemuxmlconfdata/default-video-type-ppc64.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/default-video-type-ppc64.ppc64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-default-video-type-p/.config \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/default-video-type-riscv64.riscv64-latest.args b/tests/qemuxmlconfdata/default-video-type-riscv64.riscv64-latest.args
index 3552fa576d..ed74557c07 100644
--- a/tests/qemuxmlconfdata/default-video-type-riscv64.riscv64-latest.args
+++ b/tests/qemuxmlconfdata/default-video-type-riscv64.riscv64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-default-video-type-r/.config \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args b/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args
index f8b4538815..6a1fee3987 100644
--- a/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args
+++ b/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-default-video-type-s/.config \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 247927f7bb..a17838b713 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
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-default-video-type-x/.config \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args b/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args
index 394793be2c..493b6a55c3 100644
--- a/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-active-commit.x86_64-latest.args b/tests/qemuxmlconfdata/disk-active-commit.x86_64-latest.args
index 9bc93b69b2..f06a3cbbbb 100644
--- a/tests/qemuxmlconfdata/disk-active-commit.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-active-commit.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 b4f1c25b65..dae20730db 100644
--- a/tests/qemuxmlconfdata/disk-aio-io_uring.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-aio-io_uring.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-aio.x86_64-latest.args b/tests/qemuxmlconfdata/disk-aio.x86_64-latest.args
index ed398f9fca..901ebfa699 100644
--- a/tests/qemuxmlconfdata/disk-aio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-aio.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-arm-virtio-sd.aarch64-latest.args b/tests/qemuxmlconfdata/disk-arm-virtio-sd.aarch64-latest.args
index 3328189b44..25cd471cec 100644
--- a/tests/qemuxmlconfdata/disk-arm-virtio-sd.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/disk-arm-virtio-sd.aarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 a5c71cc146..68d38f9925 100644
--- a/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 0e477c6e40..925962a636 100644
--- a/tests/qemuxmlconfdata/disk-blockio-no-discard.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-blockio-no-discard.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-blockio.x86_64-latest.args b/tests/qemuxmlconfdata/disk-blockio.x86_64-latest.args
index 997bd13e56..b0f7a2beb4 100644
--- a/tests/qemuxmlconfdata/disk-blockio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-blockio.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-boot-cdrom.x86_64-latest.args b/tests/qemuxmlconfdata/disk-boot-cdrom.x86_64-latest.args
index 1d36f4f9ee..0dc92cdd11 100644
--- a/tests/qemuxmlconfdata/disk-boot-cdrom.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-boot-cdrom.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-boot-disk.x86_64-latest.args b/tests/qemuxmlconfdata/disk-boot-disk.x86_64-latest.args
index ce8d057ca0..07c9a74c0a 100644
--- a/tests/qemuxmlconfdata/disk-boot-disk.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-boot-disk.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-cache.x86_64-latest.args b/tests/qemuxmlconfdata/disk-cache.x86_64-latest.args
index 27be644177..ac7675a7c8 100644
--- a/tests/qemuxmlconfdata/disk-cache.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-cache.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 034dead422..2cc58c28de 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 7cb4915e65..2ad5c3d4a4 100644
--- a/tests/qemuxmlconfdata/disk-cdrom-network-nbdkit.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-cdrom-network-nbdkit.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-cdrom-network.x86_64-latest.args b/tests/qemuxmlconfdata/disk-cdrom-network.x86_64-latest.args
index 00a82b0178..abb6b4f0ad 100644
--- a/tests/qemuxmlconfdata/disk-cdrom-network.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-cdrom-network.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-cdrom-tray.x86_64-latest.args b/tests/qemuxmlconfdata/disk-cdrom-tray.x86_64-latest.args
index 9619d41e79..96f260e293 100644
--- a/tests/qemuxmlconfdata/disk-cdrom-tray.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-cdrom-tray.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 44bf27e9a4..47625ca629 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-cdrom.x86_64-latest.args b/tests/qemuxmlconfdata/disk-cdrom.x86_64-latest.args
index 9e3fe36d91..f61e3d29b5 100644
--- a/tests/qemuxmlconfdata/disk-cdrom.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-cdrom.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 4bdaf22de8..c9d9ca0ea7 100644
--- a/tests/qemuxmlconfdata/disk-copy_on_read.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-copy_on_read.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-detect-zeroes.x86_64-latest.args b/tests/qemuxmlconfdata/disk-detect-zeroes.x86_64-latest.args
index 6284c082b1..355875bc38 100644
--- a/tests/qemuxmlconfdata/disk-detect-zeroes.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-detect-zeroes.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-discard.x86_64-latest.args b/tests/qemuxmlconfdata/disk-discard.x86_64-latest.args
index 43e516f097..5f68a1be81 100644
--- a/tests/qemuxmlconfdata/disk-discard.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-discard.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 25b8211cf3..32d7f8f54b 100644
--- a/tests/qemuxmlconfdata/disk-discard_no_unref.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-discard_no_unref.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-error-policy-s390x.s390x-latest.args b/tests/qemuxmlconfdata/disk-error-policy-s390x.s390x-latest.args
index 4ca56d2265..c19ef5e069 100644
--- a/tests/qemuxmlconfdata/disk-error-policy-s390x.s390x-latest.args
+++ b/tests/qemuxmlconfdata/disk-error-policy-s390x.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-error-policy.x86_64-latest.args b/tests/qemuxmlconfdata/disk-error-policy.x86_64-latest.args
index e1018fb2d6..764978323c 100644
--- a/tests/qemuxmlconfdata/disk-error-policy.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-error-policy.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-floppy-q35.x86_64-latest.args b/tests/qemuxmlconfdata/disk-floppy-q35.x86_64-latest.args
index 14679f3737..b83d649192 100644
--- a/tests/qemuxmlconfdata/disk-floppy-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-floppy-q35.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-floppy-tray.x86_64-latest.args b/tests/qemuxmlconfdata/disk-floppy-tray.x86_64-latest.args
index d9f8689e1a..0c7fd9d28b 100644
--- a/tests/qemuxmlconfdata/disk-floppy-tray.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-floppy-tray.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-floppy.x86_64-latest.args b/tests/qemuxmlconfdata/disk-floppy.x86_64-latest.args
index 3a6bbe8689..a41769966c 100644
--- a/tests/qemuxmlconfdata/disk-floppy.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-floppy.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-fmt-qcow.x86_64-latest.args b/tests/qemuxmlconfdata/disk-fmt-qcow.x86_64-latest.args
index 78f30ea750..69dff80b6c 100644
--- a/tests/qemuxmlconfdata/disk-fmt-qcow.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-fmt-qcow.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-geometry.x86_64-latest.args b/tests/qemuxmlconfdata/disk-geometry.x86_64-latest.args
index 139df58254..883a62da63 100644
--- a/tests/qemuxmlconfdata/disk-geometry.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-geometry.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-ide-split.x86_64-latest.args b/tests/qemuxmlconfdata/disk-ide-split.x86_64-latest.args
index 58d782729f..220ca34fca 100644
--- a/tests/qemuxmlconfdata/disk-ide-split.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-ide-split.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-ide-wwn.x86_64-latest.args b/tests/qemuxmlconfdata/disk-ide-wwn.x86_64-latest.args
index d1013cf7ae..4395901816 100644
--- a/tests/qemuxmlconfdata/disk-ide-wwn.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-ide-wwn.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-ioeventfd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-ioeventfd.x86_64-latest.args
index c508cf41ab..e63bad3599 100644
--- a/tests/qemuxmlconfdata/disk-ioeventfd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-ioeventfd.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-metadata-cache.x86_64-latest.args b/tests/qemuxmlconfdata/disk-metadata-cache.x86_64-latest.args
index 9bb47e59ed..d05f644f36 100644
--- a/tests/qemuxmlconfdata/disk-metadata-cache.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-metadata-cache.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-mirror-old.x86_64-latest.args b/tests/qemuxmlconfdata/disk-mirror-old.x86_64-latest.args
index bf1d6983a4..01a96a3791 100644
--- a/tests/qemuxmlconfdata/disk-mirror-old.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-mirror-old.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-mirror.x86_64-latest.args b/tests/qemuxmlconfdata/disk-mirror.x86_64-latest.args
index e504a21594..e21c97dd67 100644
--- a/tests/qemuxmlconfdata/disk-mirror.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-mirror.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.args b/tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.args
index 7cf4c4404b..fdd0c82ea8 100644
--- a/tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.args
+++ b/tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 8cb7feec1e..aa026ac94a 100644
--- a/tests/qemuxmlconfdata/disk-network-http-nbdkit.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-http-nbdkit.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-network-http.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-http.x86_64-latest.args
index 854a1154ac..d139425d49 100644
--- a/tests/qemuxmlconfdata/disk-network-http.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-http.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-network-iscsi.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-iscsi.x86_64-latest.args
index 1423b02223..5af5658c2b 100644
--- a/tests/qemuxmlconfdata/disk-network-iscsi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-iscsi.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-network-nbd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-nbd.x86_64-latest.args
index c47595e861..54d5d40f94 100644
--- a/tests/qemuxmlconfdata/disk-network-nbd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-nbd.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args
index 62f56b146f..50bc8c20a1 100644
--- a/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 de6bcb3db2..264fd5121d 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 af178782b9..4e1c4155f3 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 4b6afbb85d..778a049b56 100644
--- a/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 ca081c7fc1..19703afac5 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-network-rbd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd.x86_64-latest.args
index a15263c884..21a771b040 100644
--- a/tests/qemuxmlconfdata/disk-network-rbd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-rbd.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 8ba9fbf79f..e1f4f97624 100644
--- a/tests/qemuxmlconfdata/disk-network-source-auth.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-source-auth.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 25ec2513c2..1383cf2716 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 031f1c45f9..8cf9d627c7 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 55574bc153..9e935d327c 100644
--- a/tests/qemuxmlconfdata/disk-network-source-curl.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-source-curl.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 87d446cbab..11c1df578d 100644
--- a/tests/qemuxmlconfdata/disk-network-ssh-key.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-ssh-key.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 00a7b523b0..71aa2f4275 100644
--- a/tests/qemuxmlconfdata/disk-network-ssh-nbdkit.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-ssh-nbdkit.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 00a7b523b0..71aa2f4275 100644
--- a/tests/qemuxmlconfdata/disk-network-ssh-password.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-ssh-password.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-network-ssh.x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-ssh.x86_64-latest.args
index ba5f59643f..3df53d3305 100644
--- a/tests/qemuxmlconfdata/disk-network-ssh.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-ssh.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 77d38c3020..ed3fb618f6 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 fb68ac54fb..18e65ca27a 100644
--- a/tests/qemuxmlconfdata/disk-network-tlsx509-nbd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-no-boot.x86_64-latest.args b/tests/qemuxmlconfdata/disk-no-boot.x86_64-latest.args
index 7f007f6c4d..a151fdfd6d 100644
--- a/tests/qemuxmlconfdata/disk-no-boot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-no-boot.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-nvme.x86_64-latest.args b/tests/qemuxmlconfdata/disk-nvme.x86_64-latest.args
index 4bb7d67dc9..6a8c22797d 100644
--- a/tests/qemuxmlconfdata/disk-nvme.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-nvme.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-order.x86_64-latest.args b/tests/qemuxmlconfdata/disk-order.x86_64-latest.args
index bf1d6983a4..01a96a3791 100644
--- a/tests/qemuxmlconfdata/disk-order.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-order.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 74f2d1a090..5227dcf635 100644
--- a/tests/qemuxmlconfdata/disk-qcow2-datafile-store.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-qcow2-datafile-store.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-readonly-disk.x86_64-latest.args b/tests/qemuxmlconfdata/disk-readonly-disk.x86_64-latest.args
index 41d9f53b3b..7745709790 100644
--- a/tests/qemuxmlconfdata/disk-readonly-disk.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-readonly-disk.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-rotation.x86_64-latest.args b/tests/qemuxmlconfdata/disk-rotation.x86_64-latest.args
index f66c6ad412..5d80fdb158 100644
--- a/tests/qemuxmlconfdata/disk-rotation.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-rotation.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-sata-device.x86_64-latest.args b/tests/qemuxmlconfdata/disk-sata-device.x86_64-latest.args
index bd02898f37..5417bb7854 100644
--- a/tests/qemuxmlconfdata/disk-sata-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-sata-device.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-sata-product.x86_64-latest.args b/tests/qemuxmlconfdata/disk-sata-product.x86_64-latest.args
index a171f5c447..408a91c867 100644
--- a/tests/qemuxmlconfdata/disk-sata-product.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-sata-product.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 f8399e3032..865e8b0222 100644
--- a/tests/qemuxmlconfdata/disk-scsi-device-auto.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-scsi-device-auto.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 9ca00368e9..79830d65bd 100644
--- a/tests/qemuxmlconfdata/disk-scsi-disk-split.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-scsi-disk-split.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 4234a7e677..11a436b083 100644
--- a/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 b9897f748c..37de215637 100644
--- a/tests/qemuxmlconfdata/disk-scsi-disk-wwn.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-scsi-disk-wwn.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 eacf10b64f..271526eb81 100644
--- a/tests/qemuxmlconfdata/disk-scsi-lun-passthrough.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-scsi-lun-passthrough.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-scsi.x86_64-latest.args b/tests/qemuxmlconfdata/disk-scsi.x86_64-latest.args
index ae0a1ffe0c..03d369fc0d 100644
--- a/tests/qemuxmlconfdata/disk-scsi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-scsi.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-serial.x86_64-latest.args b/tests/qemuxmlconfdata/disk-serial.x86_64-latest.args
index 626900f130..e0f9595595 100644
--- a/tests/qemuxmlconfdata/disk-serial.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-serial.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-shared.x86_64-latest.args b/tests/qemuxmlconfdata/disk-shared.x86_64-latest.args
index c990126d13..3057ef5790 100644
--- a/tests/qemuxmlconfdata/disk-shared.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-shared.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-slices.x86_64-latest.args b/tests/qemuxmlconfdata/disk-slices.x86_64-latest.args
index 658391c477..2ad705f034 100644
--- a/tests/qemuxmlconfdata/disk-slices.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-slices.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-snapshot.x86_64-latest.args b/tests/qemuxmlconfdata/disk-snapshot.x86_64-latest.args
index 69e7ebb14e..794a6add26 100644
--- a/tests/qemuxmlconfdata/disk-snapshot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-snapshot.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args b/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args
index 148fe74233..54f7839868 100644
--- a/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 2f41b255b4..041cd4c9fc 100644
--- a/tests/qemuxmlconfdata/disk-source-pool-mode.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-source-pool-mode.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-source-pool.x86_64-latest.args b/tests/qemuxmlconfdata/disk-source-pool.x86_64-latest.args
index b4fc6841db..209d0a738a 100644
--- a/tests/qemuxmlconfdata/disk-source-pool.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-source-pool.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 13ddbc1a5d..78e7c9df68 100644
--- a/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.args b/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.args
index 3dd3dee99d..b95cf55623 100644
--- a/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args b/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args
index 9551f1f290..66603bed0c 100644
--- a/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-bar/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-transient.x86_64-latest.args b/tests/qemuxmlconfdata/disk-transient.x86_64-latest.args
index 101435a991..61d733925e 100644
--- a/tests/qemuxmlconfdata/disk-transient.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-transient.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 b2dd9c3264..18c401e1be 100644
--- a/tests/qemuxmlconfdata/disk-usb-device-model.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-usb-device-model.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 079dfe5d99..e9871e9483 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 079dfe5d99..e9871e9483 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 d8208d29b6..df81ca60ed 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.args b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.args
index 079dfe5d99..e9871e9483 100644
--- a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args b/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args
index 9cc4cba471..56bfe4a7c2 100644
--- a/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-vhostuser.x86_64-latest.args b/tests/qemuxmlconfdata/disk-vhostuser.x86_64-latest.args
index 3b09a1a992..9380146ee3 100644
--- a/tests/qemuxmlconfdata/disk-vhostuser.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-vhostuser.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args b/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args
index f52fcd2eb0..cd48c61c7d 100644
--- a/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.args b/tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.args
index 6c32bd7af6..0c5c43d03c 100644
--- a/tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.args
+++ b/tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.args b/tests/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.args
index 546637a943..1bd9802734 100644
--- a/tests/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.args
+++ b/tests/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-virtio-queues.x86_64-latest.args b/tests/qemuxmlconfdata/disk-virtio-queues.x86_64-latest.args
index fa074e0211..f34e1ea6ca 100644
--- a/tests/qemuxmlconfdata/disk-virtio-queues.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-virtio-queues.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.args b/tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.args
index ee4f86ce61..e26d996104 100644
--- a/tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.args
+++ b/tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 f1d7a450ee..516aadbfc6 100644
--- a/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/disk-virtio.x86_64-latest.args b/tests/qemuxmlconfdata/disk-virtio.x86_64-latest.args
index ae88d8d6e3..d1148f774b 100644
--- a/tests/qemuxmlconfdata/disk-virtio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/disk-virtio.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/downscript.x86_64-latest.args b/tests/qemuxmlconfdata/downscript.x86_64-latest.args
index e9da65afe5..af29ca9aa1 100644
--- a/tests/qemuxmlconfdata/downscript.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/downscript.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/encrypted-disk-usage.x86_64-latest.args b/tests/qemuxmlconfdata/encrypted-disk-usage.x86_64-latest.args
index b53f3741d9..13b837a3af 100644
--- a/tests/qemuxmlconfdata/encrypted-disk-usage.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/encrypted-disk-usage.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/encrypted-disk.x86_64-latest.args b/tests/qemuxmlconfdata/encrypted-disk.x86_64-latest.args
index 460e5508cd..6990c63023 100644
--- a/tests/qemuxmlconfdata/encrypted-disk.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/encrypted-disk.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/eoi-disabled.x86_64-latest.args b/tests/qemuxmlconfdata/eoi-disabled.x86_64-latest.args
index 8550c8a85d..ec72cc8a2a 100644
--- a/tests/qemuxmlconfdata/eoi-disabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/eoi-disabled.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/eoi-enabled.x86_64-latest.args b/tests/qemuxmlconfdata/eoi-enabled.x86_64-latest.args
index f39c4e01b3..170e6f1fd5 100644
--- a/tests/qemuxmlconfdata/eoi-enabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/eoi-enabled.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/event_idx.x86_64-latest.args b/tests/qemuxmlconfdata/event_idx.x86_64-latest.args
index 88161667e0..6aa7c4cf14 100644
--- a/tests/qemuxmlconfdata/event_idx.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/event_idx.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 1bd75a85a6..df66c5bf16 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 17ef506431..479a213c2b 100644
--- a/tests/qemuxmlconfdata/fd-memory-numa-topology.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/fd-memory-numa-topology.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 b247231b85..92705fa234 100644
--- a/tests/qemuxmlconfdata/fd-memory-numa-topology2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/fd-memory-numa-topology2.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 9e94209499..2fad64ad1a 100644
--- a/tests/qemuxmlconfdata/fd-memory-numa-topology3.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/fd-memory-numa-topology3.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology4-old-machine.x86_64-10.2.0.args b/tests/qemuxmlconfdata/fd-memory-numa-topology4-old-machine.x86_64-10.2.0.args
index 3cc67fb138..2324303fd2 100644
--- a/tests/qemuxmlconfdata/fd-memory-numa-topology4-old-machine.x86_64-10.2.0.args
+++ b/tests/qemuxmlconfdata/fd-memory-numa-topology4-old-machine.x86_64-10.2.0.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pc/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 6c9425268c..9f147bbb64 100644
--- a/tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pc/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/fips-enabled.x86_64-latest.args b/tests/qemuxmlconfdata/fips-enabled.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/fips-enabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/fips-enabled.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 a6a52e2b52..6265f0b718 100644
--- a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args
index a6a52e2b52..6265f0b718 100644
--- a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.args
index 11a5ffba74..54b61aafb7 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-update.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args
index d31fb472dc..4404db16d4 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-aarch64.aarch64-latest.args
index 10f1a5a6a4..c3a07af44c 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-aarch64.aarch64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 e7c9110c95..a17764ccd7 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
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 25b93c8a2e..a80a9b3c78 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
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 468ad4326c..a824939895 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
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args
index d4fe601f75..93c979214f 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args
index d31fb472dc..4404db16d4 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 468d7ee048..b0d0a03b0e 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
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 046aeb77cd..f08d30b52f 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
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 25b93c8a2e..a80a9b3c78 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
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 468ad4326c..a824939895 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
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 14027c21db..16a34040bd 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
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 14027c21db..16a34040bd 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
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 e7c9110c95..a17764ccd7 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
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 e7c9110c95..a17764ccd7 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
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 468ad4326c..a824939895 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
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 cbafadec2c..05ad82842e 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
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 cbafadec2c..05ad82842e 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
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 468ad4326c..a824939895 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
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 e7c9110c95..a17764ccd7 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
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch64-latest.abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch64-latest.abi-update.args
index d31cb2dae8..f48ae817eb 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch64-latest.abi-update.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch64-latest.args
index d31cb2dae8..f48ae817eb 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 e7c9110c95..a17764ccd7 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
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 cbafadec2c..05ad82842e 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
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 0cb780853a..376e47487f 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
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 026155edff..9c43a1a793 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
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 2999e321d7..b465ca5ccc 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
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 6fb2c7ffc4..e4d9d1f643 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
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 e7c9110c95..a17764ccd7 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
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64-latest.abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64-latest.abi-update.args
index f467f71d72..497f5e616c 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64-latest.abi-update.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 d06de24db8..779ba70768 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
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 d06de24db8..779ba70768 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 e7c9110c95..a17764ccd7 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.x86_64-latest+amdsev.args b/tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.x86_64-latest+amdsev.args
index 99350f600c..608ccff0c5 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.x86_64-latest+amdsev.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.x86_64-latest+amdsev.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-sev-stateful.x86_64-latest+amdsev.args b/tests/qemuxmlconfdata/firmware-auto-efi-sev-stateful.x86_64-latest+amdsev.args
index 550ac52b8a..c8e110f88e 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-sev-stateful.x86_64-latest+amdsev.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-sev-stateful.x86_64-latest+amdsev.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-sev.x86_64-latest+amdsev.args b/tests/qemuxmlconfdata/firmware-auto-efi-sev.x86_64-latest+amdsev.args
index 550ac52b8a..c8e110f88e 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-sev.x86_64-latest+amdsev.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-sev.x86_64-latest+amdsev.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 42a47fe29e..b1196a599c 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
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 0c0caf2468..81ddc73d48 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-varstore-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-varstore-aarch64.aarch64-latest.args
index 10f1a5a6a4..c3a07af44c 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi-varstore-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi-varstore-aarch64.aarch64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 392ea77c28..2d75ef55f1 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
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 468ad4326c..a824939895 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
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args
index e7c9110c95..a17764ccd7 100644
--- a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 969c7ad68c..ee19f80c46 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
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 969c7ad68c..ee19f80c46 100644
--- a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args
index 969c7ad68c..ee19f80c46 100644
--- a/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args
index 8d52231c69..250109005a 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args
index 26a4fdcd0d..7744793b81 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 fd560fa9fe..50ab59acec 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
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 d8a1abd7ff..ac6cf076d4 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 a77d7fe7fd..9e900b9711 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
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 07f220db04..3f805244b6 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
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 1bbba7e99f..308010ee5d 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
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 07f220db04..3f805244b6 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
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 2113a46e80..a2a6ca920e 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
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 fd560fa9fe..50ab59acec 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
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args
index dba1be6c8a..106fa2f2ac 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 0cb780853a..376e47487f 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
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 026155edff..9c43a1a793 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
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 2999e321d7..b465ca5ccc 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
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 fa0626a8f3..8784526f93 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
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 18ca736065..20d8cd5c37 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
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 cbafadec2c..05ad82842e 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
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 d8a1abd7ff..ac6cf076d4 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
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 962ce5525b..749d116748 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
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 f724cca477..45ecfc8aa4 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
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 4e4b7d563d..474babca98 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
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 962ce5525b..749d116748 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 1bbba7e99f..308010ee5d 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
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 07f220db04..3f805244b6 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-sev-snp.x86_64-latest+amdsev.args b/tests/qemuxmlconfdata/firmware-manual-efi-sev-snp.x86_64-latest+amdsev.args
index 99350f600c..608ccff0c5 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-sev-snp.x86_64-latest+amdsev.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-sev-snp.x86_64-latest+amdsev.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 ff30beeb35..ede3bb02ea 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-tdx.x86_64-latest+inteltdx.args b/tests/qemuxmlconfdata/firmware-manual-efi-tdx.x86_64-latest+inteltdx.args
index 33a73bfc10..42f3526514 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-tdx.x86_64-latest+inteltdx.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-tdx.x86_64-latest+inteltdx.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-varstore-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-varstore-aarch64.aarch64-latest.args
index 894bab7ffe..41248042f1 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi-varstore-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi-varstore-aarch64.aarch64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 6c04c8c39f..1643d13961 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
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args
index 0cb780853a..376e47487f 100644
--- a/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 72fa81a9b3..ee2b3d58cb 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args
index 8784023d86..f268722856 100644
--- a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 203e91e3c0..825fc41042 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/floppy-drive-fat.x86_64-latest.args b/tests/qemuxmlconfdata/floppy-drive-fat.x86_64-latest.args
index e63ddfeb16..0b7018608b 100644
--- a/tests/qemuxmlconfdata/floppy-drive-fat.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/floppy-drive-fat.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args b/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args
index 6771547e80..7872296c05 100644
--- a/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args
+++ b/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/fs9p.x86_64-latest.args b/tests/qemuxmlconfdata/fs9p.x86_64-latest.args
index d1505cce80..86274046e8 100644
--- a/tests/qemuxmlconfdata/fs9p.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/fs9p.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/genid-auto.x86_64-latest.args b/tests/qemuxmlconfdata/genid-auto.x86_64-latest.args
index e3aa0d5b10..1bbdbeedd3 100644
--- a/tests/qemuxmlconfdata/genid-auto.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/genid-auto.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/genid.x86_64-latest.args b/tests/qemuxmlconfdata/genid.x86_64-latest.args
index c1fb2cee78..99c5f1000d 100644
--- a/tests/qemuxmlconfdata/genid.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/genid.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-dbus-address.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-dbus-address.x86_64-latest.args
index bcba7f8f64..3132dcd63d 100644
--- a/tests/qemuxmlconfdata/graphics-dbus-address.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-dbus-address.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-dbus-audio.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-dbus-audio.x86_64-latest.args
index 19d1ac7a0a..fd7b84d79a 100644
--- a/tests/qemuxmlconfdata/graphics-dbus-audio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-dbus-audio.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-dbus-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-dbus-chardev.x86_64-latest.args
index 7ab1eb7787..45aec4f08f 100644
--- a/tests/qemuxmlconfdata/graphics-dbus-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-dbus-chardev.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-dbus-p2p.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-dbus-p2p.x86_64-latest.args
index 9fda433320..7b86736fab 100644
--- a/tests/qemuxmlconfdata/graphics-dbus-p2p.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-dbus-p2p.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-dbus-usbredir.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-dbus-usbredir.x86_64-latest.args
index ceec8dbc89..7cde6c7055 100644
--- a/tests/qemuxmlconfdata/graphics-dbus-usbredir.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-dbus-usbredir.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-dbus.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-dbus.x86_64-latest.args
index 33fb8b0e12..8b10b8ea17 100644
--- a/tests/qemuxmlconfdata/graphics-dbus.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-dbus.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 97996f30fc..1a3ffd795a 100644
--- a/tests/qemuxmlconfdata/graphics-egl-headless-rendernode.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-egl-headless-rendernode.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-egl-headless.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-egl-headless.x86_64-latest.args
index 97996f30fc..1a3ffd795a 100644
--- a/tests/qemuxmlconfdata/graphics-egl-headless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-egl-headless.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-listen-network.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-listen-network.x86_64-latest.args
index 62c2cc2a2c..d0fecb663b 100644
--- a/tests/qemuxmlconfdata/graphics-listen-network.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-listen-network.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-rdp.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-rdp.x86_64-latest.args
index 292f283493..2a5916c456 100644
--- a/tests/qemuxmlconfdata/graphics-rdp.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-rdp.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-sdl-fullscreen.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-sdl-fullscreen.x86_64-latest.args
index 9a103b069a..66510ce199 100644
--- a/tests/qemuxmlconfdata/graphics-sdl-fullscreen.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-sdl-fullscreen.x86_64-latest.args
@@ -22,7 +22,7 @@ DISPLAY=:0.1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-sdl.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-sdl.x86_64-latest.args
index 82366b1297..e072a36568 100644
--- a/tests/qemuxmlconfdata/graphics-sdl.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-sdl.x86_64-latest.args
@@ -22,7 +22,7 @@ DISPLAY=:0.1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 3ffe09e6f6..e15eefd2ca 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
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-spice-agentmouse.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-agentmouse.x86_64-latest.args
index c044c77105..9ad6b43c65 100644
--- a/tests/qemuxmlconfdata/graphics-spice-agentmouse.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-agentmouse.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 03fa8e868a..1c67f3e2e2 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
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 03fa8e868a..1c67f3e2e2 100644
--- a/tests/qemuxmlconfdata/graphics-spice-auto-socket.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-auto-socket.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-spice-compression.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-compression.x86_64-latest.args
index 39eee130c1..f8b497d23b 100644
--- a/tests/qemuxmlconfdata/graphics-spice-compression.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-compression.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 e905aad710..686e847d2d 100644
--- a/tests/qemuxmlconfdata/graphics-spice-egl-headless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-egl-headless.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 6fe49ca5ca..d360e288c0 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
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 512f17c5eb..0e2c03af8e 100644
--- a/tests/qemuxmlconfdata/graphics-spice-no-args.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-no-args.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 0f3a9a3def..62e0fba4bc 100644
--- a/tests/qemuxmlconfdata/graphics-spice-qxl-vga.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-qxl-vga.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args
index 4c0d998a47..dbecc45ba6 100644
--- a/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args
@@ -21,7 +21,7 @@ SASL_CONF_PATH=/etc/sasl2 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-spice-socket.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-socket.x86_64-latest.args
index 9c30cf6089..52fc703d66 100644
--- a/tests/qemuxmlconfdata/graphics-spice-socket.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-socket.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args
index 30010a5a0c..1ff9a0f46d 100644
--- a/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-f14/.config \
 -uuid 553effab-b5e1-2d80-dfe3-da4344826c43 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 b5f695063c..995c8bf4dd 100644
--- a/tests/qemuxmlconfdata/graphics-spice-usb-redir.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice-usb-redir.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-spice.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice.x86_64-latest.args
index 55df7945d0..a6064162a7 100644
--- a/tests/qemuxmlconfdata/graphics-spice.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-spice.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 51d550e8c9..509a8e4643 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
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 db2f7b5930..8a1bfaeed5 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-auto-socket.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-auto-socket.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 bd1b4af92b..9578f68a69 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-egl-headless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-egl-headless.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 4a7a409925..b07f4abd64 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
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-none.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-none.x86_64-latest.args
index 19372db9bc..7f9f2ea726 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-none.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-policy.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-policy.x86_64-latest.args
index f53fefe2b3..cbf23b6b5b 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-policy.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-policy.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-power.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-power.x86_64-latest.args
index 5a81f148d6..722ce9599f 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-power.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-power.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 854e3b9637..c694022e3f 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
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args
index 4570a7fa19..236e91d47c 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args
@@ -21,7 +21,7 @@ SASL_CONF_PATH=/etc/sasl2 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 dec43c1596..b1739c3d66 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
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-socket.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-socket.x86_64-latest.args
index ef36ca7291..4f2f89cd06 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-socket.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-socket.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 32d7be1d3b..a0b092e955 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args
@@ -21,7 +21,7 @@ SASL_CONF_PATH=/etc/sasl2 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args
index 2e2e1ef6c3..49b5e87ed8 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args
@@ -21,7 +21,7 @@ SASL_CONF_PATH=/etc/sasl2 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-vnc-websocket.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-websocket.x86_64-latest.args
index 7728d69da2..b647510666 100644
--- a/tests/qemuxmlconfdata/graphics-vnc-websocket.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc-websocket.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/graphics-vnc.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-vnc.x86_64-latest.args
index 4a7a409925..b07f4abd64 100644
--- a/tests/qemuxmlconfdata/graphics-vnc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/graphics-vnc.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 d881c56af0..65e2528c56 100644
--- a/tests/qemuxmlconfdata/hostdev-mdev-display-ramfb.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-mdev-display-ramfb.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 cd74de7b73..a748007cd9 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
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 1b8b48b742..69a30d0a80 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
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 be678cb85b..c8cc164c3b 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
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 b3e9d12f4e..9bf72f072b 100644
--- a/tests/qemuxmlconfdata/hostdev-mdev-display-vnc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-mdev-display-vnc.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-mdev-display.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-mdev-display.x86_64-latest.args
index b3e9d12f4e..9bf72f072b 100644
--- a/tests/qemuxmlconfdata/hostdev-mdev-display.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-mdev-display.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-mdev-precreated.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-mdev-precreated.x86_64-latest.args
index 18e59f7520..63d9645561 100644
--- a/tests/qemuxmlconfdata/hostdev-mdev-precreated.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-mdev-precreated.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 2a00147ae4..db9c331048 100644
--- a/tests/qemuxmlconfdata/hostdev-pci-address-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-pci-address-device.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 1247ff547b..75b9de2a0e 100644
--- a/tests/qemuxmlconfdata/hostdev-pci-address-unassigned.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-pci-address-unassigned.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-pci-address.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-pci-address.x86_64-latest.args
index f84904db82..ed49378c98 100644
--- a/tests/qemuxmlconfdata/hostdev-pci-address.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-pci-address.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 a681504c3d..936cdf678b 100644
--- a/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-pci-multifunction.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-pci-multifunction.x86_64-latest.args
index f3bcec0983..92b049640a 100644
--- a/tests/qemuxmlconfdata/hostdev-pci-multifunction.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-pci-multifunction.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-delete/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 31bba71977..30490d95f8 100644
--- a/tests/qemuxmlconfdata/hostdev-scsi-autogen-address.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-scsi-autogen-address.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 4e787674a3..2dc0ffca24 100644
--- a/tests/qemuxmlconfdata/hostdev-scsi-large-unit.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-scsi-large-unit.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-scsi-lsi.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-lsi.x86_64-latest.args
index 8f03d96ef4..59db6a485d 100644
--- a/tests/qemuxmlconfdata/hostdev-scsi-lsi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-scsi-lsi.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-scsi-shareable.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-shareable.x86_64-latest.args
index 4e787674a3..2dc0ffca24 100644
--- a/tests/qemuxmlconfdata/hostdev-scsi-shareable.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-scsi-shareable.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args
index bce866221a..3986009d26 100644
--- a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 abd57fceba..260859c48d 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 f2b39694ee..b7aa90d25f 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 d7a3c658d8..736b7e7dc0 100644
--- a/tests/qemuxmlconfdata/hostdev-scsi-virtio-scsi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-scsi-virtio-scsi.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args
index 880265bb03..920ef86c55 100644
--- a/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args
index aeb07a9bcb..91f9478a3c 100644
--- a/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args
index 01b182d44e..0daa5664fe 100644
--- a/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 776eb24135..81f0287c38 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 5bae7acdc5..d226e95c12 100644
--- a/tests/qemuxmlconfdata/hostdev-usb-address-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-usb-address-device.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 8996f05223..c4b96f015e 100644
--- a/tests/qemuxmlconfdata/hostdev-usb-address-port.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-usb-address-port.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-usb-address.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-usb-address.x86_64-latest.args
index fff0a672d7..497dc5b1da 100644
--- a/tests/qemuxmlconfdata/hostdev-usb-address.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-usb-address.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 62338db872..8f393c3db9 100644
--- a/tests/qemuxmlconfdata/hostdev-usb-vendor-product.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-usb-vendor-product.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-vfio-multidomain.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-multidomain.x86_64-latest.args
index fa3fd3aa99..35c2ace727 100644
--- a/tests/qemuxmlconfdata/hostdev-vfio-multidomain.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-vfio-multidomain.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.args
index d0355d04b8..8e964cd8dc 100644
--- a/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.args
index 6754899fe4..90c02a9ea2 100644
--- a/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate.s390x-latest.args
index 2c142c1e5a..dec3b00def 100644
--- a/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate.s390x-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-vfio-zpci-boundaries.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-boundaries.s390x-latest.args
index 3bf6534c36..4df47ca28c 100644
--- a/tests/qemuxmlconfdata/hostdev-vfio-zpci-boundaries.s390x-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-vfio-zpci-boundaries.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args
index e8a95ec89e..ca0c1c2f0e 100644
--- a/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-KVMGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.args
index 43b861b65c..16264d6f43 100644
--- a/tests/qemuxmlconfdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-vfio-zpci.s390x-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci.s390x-latest.args
index 852fe0206a..d05e78b0ea 100644
--- a/tests/qemuxmlconfdata/hostdev-vfio-zpci.s390x-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-vfio-zpci.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hostdev-vfio.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-vfio.x86_64-latest.args
index 658fc2559e..379853248d 100644
--- a/tests/qemuxmlconfdata/hostdev-vfio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hostdev-vfio.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hotplug-base.x86_64-latest.args b/tests/qemuxmlconfdata/hotplug-base.x86_64-latest.args
index ecbf02ac3a..e93f2c8726 100644
--- a/tests/qemuxmlconfdata/hotplug-base.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hotplug-base.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-hotplug/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hugepages-default-2M.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-default-2M.x86_64-latest.args
index dd95b296ba..eb10fc39f5 100644
--- a/tests/qemuxmlconfdata/hugepages-default-2M.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-default-2M.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-SomeDummyHugepagesGu/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 11b4b700ae..decdca9516 100644
--- a/tests/qemuxmlconfdata/hugepages-default-system-size.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-default-system-size.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-SomeDummyHugepagesGu/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hugepages-default.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-default.x86_64-latest.args
index 310cd1f79a..39447a1e03 100644
--- a/tests/qemuxmlconfdata/hugepages-default.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-default.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hugepages-memaccess.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-memaccess.x86_64-latest.args
index 9aedba0539..3cb19a22d7 100644
--- a/tests/qemuxmlconfdata/hugepages-memaccess.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-memaccess.x86_64-latest.args
@@ -32,7 +32,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hugepages-memaccess2.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-memaccess2.x86_64-latest.args
index 2dd0bdc228..d7a8595fa9 100644
--- a/tests/qemuxmlconfdata/hugepages-memaccess2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-memaccess2.x86_64-latest.args
@@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-latest.args
index 9c5d1671ea..51e197b728 100644
--- a/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fedora/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hugepages-nodeset.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-nodeset.x86_64-latest.args
index dd95b296ba..eb10fc39f5 100644
--- a/tests/qemuxmlconfdata/hugepages-nodeset.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-nodeset.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-SomeDummyHugepagesGu/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 320910db61..a504fec129 100644
--- a/tests/qemuxmlconfdata/hugepages-numa-default-2M.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-numa-default-2M.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-SomeDummyHugepagesGu/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 5d2849ce75..128640b6af 100644
--- a/tests/qemuxmlconfdata/hugepages-numa-default-dimm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-numa-default-dimm.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fedora/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hugepages-numa-default.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-numa-default.x86_64-latest.args
index 677122eba2..ad08f817d8 100644
--- a/tests/qemuxmlconfdata/hugepages-numa-default.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-numa-default.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fedora/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 a86697048c..801269b9f1 100644
--- a/tests/qemuxmlconfdata/hugepages-numa-nodeset-part.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-numa-nodeset-part.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-SomeDummyHugepagesGu/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hugepages-numa-nodeset.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-numa-nodeset.x86_64-latest.args
index 23198ba24e..fdb67cf130 100644
--- a/tests/qemuxmlconfdata/hugepages-numa-nodeset.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-numa-nodeset.x86_64-latest.args
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-nvdimm.x86_64-latest.args
index f30db0ad09..6c8be34341 100644
--- a/tests/qemuxmlconfdata/hugepages-nvdimm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-nvdimm.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hugepages-shared.x86_64-latest.args b/tests/qemuxmlconfdata/hugepages-shared.x86_64-latest.args
index 27c76dcdd3..e272117c04 100644
--- a/tests/qemuxmlconfdata/hugepages-shared.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hugepages-shared.x86_64-latest.args
@@ -32,7 +32,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+hvf.args b/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+hvf.args
index fc3db040af..c428a00e64 100644
--- a/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+hvf.args
+++ b/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+hvf.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,driftfix=slew \
 -no-shutdown \
@@ -42,7 +42,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:9a:e6:c6","bus":"pci.1","addr":"0x0"}' \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.4","addr":"0x0"}' \
diff --git a/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest+hvf.args b/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest+hvf.args
index 03fa63585f..6cd5b380bd 100644
--- a/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest+hvf.args
+++ b/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest+hvf.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
@@ -47,7 +47,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:9a:e6:c6","bus":"pci.1","addr":"0x0"}' \
 -chardev pty,id=charserial0 \
 -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -global ICH9-LPC.noreboot=off \
diff --git a/tests/qemuxmlconfdata/hwuuid.x86_64-latest.args b/tests/qemuxmlconfdata/hwuuid.x86_64-latest.args
index fa3eb6b163..cf64daffea 100644
--- a/tests/qemuxmlconfdata/hwuuid.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hwuuid.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hyperv-host-model.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv-host-model.x86_64-latest.args
index d1f2326da1..1253948a18 100644
--- a/tests/qemuxmlconfdata/hyperv-host-model.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hyperv-host-model.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hyperv-off.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv-off.x86_64-latest.args
index 81b67778be..87d89be1ee 100644
--- a/tests/qemuxmlconfdata/hyperv-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hyperv-off.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hyperv-panic.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv-panic.x86_64-latest.args
index 11b165ea47..ead6f2efc5 100644
--- a/tests/qemuxmlconfdata/hyperv-panic.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hyperv-panic.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hyperv-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv-passthrough.x86_64-latest.args
index c2c29f7a52..2dc01446ca 100644
--- a/tests/qemuxmlconfdata/hyperv-passthrough.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hyperv-passthrough.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 bb66adc6a4..95919fb3f1 100644
--- a/tests/qemuxmlconfdata/hyperv-spinlocks-never-notify.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hyperv-spinlocks-never-notify.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hyperv-stimer-direct.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv-stimer-direct.x86_64-latest.args
index 0a6d84fbd2..cd733ab1cd 100644
--- a/tests/qemuxmlconfdata/hyperv-stimer-direct.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hyperv-stimer-direct.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/hyperv.x86_64-latest.args b/tests/qemuxmlconfdata/hyperv.x86_64-latest.args
index ea4b77de74..19f17f96e3 100644
--- a/tests/qemuxmlconfdata/hyperv.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/hyperv.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/input-linux.x86_64-latest.args b/tests/qemuxmlconfdata/input-linux.x86_64-latest.args
index 2794b49968..322bdd20b1 100644
--- a/tests/qemuxmlconfdata/input-linux.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/input-linux.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/input-usbmouse-addr.x86_64-latest.args b/tests/qemuxmlconfdata/input-usbmouse-addr.x86_64-latest.args
index 6da9a65429..860b80ee0c 100644
--- a/tests/qemuxmlconfdata/input-usbmouse-addr.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/input-usbmouse-addr.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/input-usbmouse.x86_64-latest.args b/tests/qemuxmlconfdata/input-usbmouse.x86_64-latest.args
index aca72a88a0..df4019eb87 100644
--- a/tests/qemuxmlconfdata/input-usbmouse.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/input-usbmouse.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/input-usbtablet.x86_64-latest.args b/tests/qemuxmlconfdata/input-usbtablet.x86_64-latest.args
index 16b4a8babb..027c13c94e 100644
--- a/tests/qemuxmlconfdata/input-usbtablet.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/input-usbtablet.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/input-virtio-ccw.s390x-latest.args b/tests/qemuxmlconfdata/input-virtio-ccw.s390x-latest.args
index fc32804695..9fa997766c 100644
--- a/tests/qemuxmlconfdata/input-virtio-ccw.s390x-latest.args
+++ b/tests/qemuxmlconfdata/input-virtio-ccw.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 9216ee6b9a..cec07e1aa6 100644
--- a/tests/qemuxmlconfdata/intel-iommu-aw-bits.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/intel-iommu-aw-bits.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 b3a1dcfd7b..55140a086a 100644
--- a/tests/qemuxmlconfdata/intel-iommu-caching-mode.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/intel-iommu-caching-mode.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 920b703243..772e737a15 100644
--- a/tests/qemuxmlconfdata/intel-iommu-device-iotlb.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/intel-iommu-device-iotlb.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 cc7f819f5c..873674e9a9 100644
--- a/tests/qemuxmlconfdata/intel-iommu-dma-translation.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/intel-iommu-dma-translation.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 07fa1191b7..0162941b6e 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/intel-iommu-eim.x86_64-latest.args b/tests/qemuxmlconfdata/intel-iommu-eim.x86_64-latest.args
index 07fa1191b7..0162941b6e 100644
--- a/tests/qemuxmlconfdata/intel-iommu-eim.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/intel-iommu-eim.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/intel-iommu.x86_64-latest.args b/tests/qemuxmlconfdata/intel-iommu.x86_64-latest.args
index 983d74383c..cb63b25689 100644
--- a/tests/qemuxmlconfdata/intel-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/intel-iommu.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.aarch64-latest.args b/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.aarch64-latest.args
index 6fac84965e..0c5b1967a4 100644
--- a/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.aarch64-latest.args b/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.aarch64-latest.args
index 9acd66aab3..6dbbb445e7 100644
--- a/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.args b/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.args
index 20ccd2f5c3..3708ca8553 100644
--- a/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args b/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args
index 7df3d173f3..e95eab8d07 100644
--- a/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args
index f886c488e1..e90f3a20e1 100644
--- a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args
index 543e976c58..ac408b6b32 100644
--- a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args b/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args
index e1a4c4bb9a..d472bd6144 100644
--- a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args b/tests/qemuxmlconfdata/iommufd.x86_64-latest.args
index b9aefda39d..8e93539c9e 100644
--- a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iommufd.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/iothreads-disk.x86_64-latest.args b/tests/qemuxmlconfdata/iothreads-disk.x86_64-latest.args
index b355e76db9..35f843f5aa 100644
--- a/tests/qemuxmlconfdata/iothreads-disk.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iothreads-disk.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/iothreads-ids-partial.x86_64-latest.args b/tests/qemuxmlconfdata/iothreads-ids-partial.x86_64-latest.args
index 403001e7df..308db90028 100644
--- a/tests/qemuxmlconfdata/iothreads-ids-partial.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iothreads-ids-partial.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 cec62acdd8..4cfce9b9da 100644
--- a/tests/qemuxmlconfdata/iothreads-ids-pool-sizes.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iothreads-ids-pool-sizes.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/iothreads-ids.x86_64-latest.args b/tests/qemuxmlconfdata/iothreads-ids.x86_64-latest.args
index 0e847fe655..4d56d4c2c0 100644
--- a/tests/qemuxmlconfdata/iothreads-ids.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iothreads-ids.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.args b/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.args
index 953edb5445..0f9195543d 100644
--- a/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.args
+++ b/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 c4491cd995..ee98a94823 100644
--- a/tests/qemuxmlconfdata/iothreads-virtio-scsi-mapping.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iothreads-virtio-scsi-mapping.x86_64-latest.args
@@ -25,7 +25,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 e52ef3ba53..aff65f577a 100644
--- a/tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/kvm-features-off.x86_64-latest.args b/tests/qemuxmlconfdata/kvm-features-off.x86_64-latest.args
index 31a2022306..70b1fb83e1 100644
--- a/tests/qemuxmlconfdata/kvm-features-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/kvm-features-off.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/kvm-features.x86_64-latest.args b/tests/qemuxmlconfdata/kvm-features.x86_64-latest.args
index 955db67eb4..8221fdb16f 100644
--- a/tests/qemuxmlconfdata/kvm-features.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/kvm-features.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/kvm-pit-delay.x86_64-latest.args b/tests/qemuxmlconfdata/kvm-pit-delay.x86_64-latest.args
index 8d4981b6cf..e076cc25e9 100644
--- a/tests/qemuxmlconfdata/kvm-pit-delay.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/kvm-pit-delay.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -global kvm-pit.lost_tick_policy=delay \
diff --git a/tests/qemuxmlconfdata/kvm-pit-discard.x86_64-latest.args b/tests/qemuxmlconfdata/kvm-pit-discard.x86_64-latest.args
index 469ccac8ee..b92331e051 100644
--- a/tests/qemuxmlconfdata/kvm-pit-discard.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/kvm-pit-discard.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -global kvm-pit.lost_tick_policy=discard \
diff --git a/tests/qemuxmlconfdata/kvmclock+eoi-disabled.x86_64-latest.args b/tests/qemuxmlconfdata/kvmclock+eoi-disabled.x86_64-latest.args
index 99b62a8c41..15bdc3babb 100644
--- a/tests/qemuxmlconfdata/kvmclock+eoi-disabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/kvmclock+eoi-disabled.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/kvmclock.x86_64-latest.args b/tests/qemuxmlconfdata/kvmclock.x86_64-latest.args
index f24504b43e..6e46d1b7f8 100644
--- a/tests/qemuxmlconfdata/kvmclock.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/kvmclock.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args b/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args
index 9786e0a574..0074a4e2cb 100644
--- a/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args
+++ b/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest+amdsev.args b/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest+amdsev.args
index 56fa8e0b21..3271bfcb50 100644
--- a/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest+amdsev.args
+++ b/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest+amdsev.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 56fa8e0b21..3271bfcb50 100644
--- a/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/launch-security-sev-missing-platform-info.x86_64-latest+amdsev.args b/tests/qemuxmlconfdata/launch-security-sev-missing-platform-info.x86_64-latest+amdsev.args
index 6e076cec63..3343139118 100644
--- a/tests/qemuxmlconfdata/launch-security-sev-missing-platform-info.x86_64-latest+amdsev.args
+++ b/tests/qemuxmlconfdata/launch-security-sev-missing-platform-info.x86_64-latest+amdsev.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest+amdsev.args b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest+amdsev.args
index d849eb88e0..324c318e90 100644
--- a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest+amdsev.args
+++ b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest+amdsev.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 d849eb88e0..324c318e90 100644
--- a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/launch-security-sev.x86_64-latest+amdsev.args b/tests/qemuxmlconfdata/launch-security-sev.x86_64-latest+amdsev.args
index b62961f974..53a835d1c4 100644
--- a/tests/qemuxmlconfdata/launch-security-sev.x86_64-latest+amdsev.args
+++ b/tests/qemuxmlconfdata/launch-security-sev.x86_64-latest+amdsev.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/launch-security-tdx.x86_64-latest+inteltdx.args b/tests/qemuxmlconfdata/launch-security-tdx.x86_64-latest+inteltdx.args
index 366d553c93..317f290493 100644
--- a/tests/qemuxmlconfdata/launch-security-tdx.x86_64-latest+inteltdx.args
+++ b/tests/qemuxmlconfdata/launch-security-tdx.x86_64-latest+inteltdx.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/lease.x86_64-latest.args b/tests/qemuxmlconfdata/lease.x86_64-latest.args
index 1b172867c2..7523db7d72 100644
--- a/tests/qemuxmlconfdata/lease.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/lease.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/loongarch64-virt-default-models.loongarch64-latest.abi-update.args b/tests/qemuxmlconfdata/loongarch64-virt-default-models.loongarch64-latest.abi-update.args
index 0b7e265f9c..5d59c046c3 100644
--- a/tests/qemuxmlconfdata/loongarch64-virt-default-models.loongarch64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/loongarch64-virt-default-models.loongarch64-latest.abi-update.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/loongarch64-virt-default-models.loongarch64-latest.args b/tests/qemuxmlconfdata/loongarch64-virt-default-models.loongarch64-latest.args
index 0b7e265f9c..5d59c046c3 100644
--- a/tests/qemuxmlconfdata/loongarch64-virt-default-models.loongarch64-latest.args
+++ b/tests/qemuxmlconfdata/loongarch64-virt-default-models.loongarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/loongarch64-virt-graphics.loongarch64-latest.args b/tests/qemuxmlconfdata/loongarch64-virt-graphics.loongarch64-latest.args
index 4977e5b05f..5105a1d1d3 100644
--- a/tests/qemuxmlconfdata/loongarch64-virt-graphics.loongarch64-latest.args
+++ b/tests/qemuxmlconfdata/loongarch64-virt-graphics.loongarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -uuid 96bc2754-8842-4714-a45f-3f69e7a9a852 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -42,7 +42,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \
 -device '{"driver":"usb-kbd","id":"input1","bus":"usb.0","port":"2"}' \
diff --git a/tests/qemuxmlconfdata/loongarch64-virt-headless.loongarch64-latest.args b/tests/qemuxmlconfdata/loongarch64-virt-headless.loongarch64-latest.args
index e124668dbf..3265b7f561 100644
--- a/tests/qemuxmlconfdata/loongarch64-virt-headless.loongarch64-latest.args
+++ b/tests/qemuxmlconfdata/loongarch64-virt-headless.loongarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -42,7 +42,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","addr":"0x0"}' \
diff --git a/tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-latest.abi-update.args b/tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-latest.abi-update.args
index fe682d9a72..552d350a0b 100644
--- a/tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-latest.abi-update.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-latest.args b/tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-latest.args
index fe682d9a72..552d350a0b 100644
--- a/tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-latest.args
+++ b/tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 0d68d835f2..1f3056dd96 100644
--- a/tests/qemuxmlconfdata/luks-disks-source-qcow2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/luks-disks-source-qcow2.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args b/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args
index 6eedd9a33f..ac19a60ac8 100644
--- a/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args b/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args
index a8dc1b4f53..8fe957cb26 100644
--- a/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.args
index 23d561de2e..359153a472 100644
--- a/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.args
index 172daca909..3a9303fb01 100644
--- a/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.args
index 23d561de2e..359153a472 100644
--- a/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.args
index 23d561de2e..359153a472 100644
--- a/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.args
index 23d561de2e..359153a472 100644
--- a/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.args
index 57b7899bc9..a471fc4a02 100644
--- a/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.args b/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.args
index 566407f341..f240af6880 100644
--- a/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.args b/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.args
index 3c17b8cb3b..546a783c53 100644
--- a/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.args
+++ b/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest.args b/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest.args
index 3c17b8cb3b..546a783c53 100644
--- a/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest.args
+++ b/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.args b/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.args
index 583885e470..67e52ffa29 100644
--- a/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.args
+++ b/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.args b/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.args
index 583885e470..67e52ffa29 100644
--- a/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.args
+++ b/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-aliases1.x86_64-latest.args b/tests/qemuxmlconfdata/machine-aliases1.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/machine-aliases1.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/machine-aliases1.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-aliases2.x86_64-latest.args b/tests/qemuxmlconfdata/machine-aliases2.x86_64-latest.args
index 91bb98f2e6..bb3015c76d 100644
--- a/tests/qemuxmlconfdata/machine-aliases2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/machine-aliases2.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-core-off.x86_64-latest.args b/tests/qemuxmlconfdata/machine-core-off.x86_64-latest.args
index 9493ded1c7..d59f1717d9 100644
--- a/tests/qemuxmlconfdata/machine-core-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/machine-core-off.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-core-on.x86_64-latest.args b/tests/qemuxmlconfdata/machine-core-on.x86_64-latest.args
index 22aefe66ec..50936d34f8 100644
--- a/tests/qemuxmlconfdata/machine-core-on.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/machine-core-on.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.args b/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.args
index 6270b7e43a..107a32aa53 100644
--- a/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.args
+++ b/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest.args b/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest.args
index 6270b7e43a..107a32aa53 100644
--- a/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest.args
+++ b/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.args b/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.args
index c0104970b5..f24ddce225 100644
--- a/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.args
+++ b/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.args b/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.args
index c0104970b5..f24ddce225 100644
--- a/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.args
+++ b/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-i8042-off.x86_64-latest.args b/tests/qemuxmlconfdata/machine-i8042-off.x86_64-latest.args
index e340d164fc..fcdbf0a6e1 100644
--- a/tests/qemuxmlconfdata/machine-i8042-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/machine-i8042-off.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-i8042-on.x86_64-latest.args b/tests/qemuxmlconfdata/machine-i8042-on.x86_64-latest.args
index cda5002fec..57c593aa3a 100644
--- a/tests/qemuxmlconfdata/machine-i8042-on.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/machine-i8042-on.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.args b/tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.args
index 10594504bc..0a7c36b843 100644
--- a/tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.args
+++ b/tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.args b/tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.args
index 10594504bc..0a7c36b843 100644
--- a/tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.args
+++ b/tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-9.1.0.args b/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-9.1.0.args
index 0a025e6335..55e010b3a5 100644
--- a/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-9.1.0.args
+++ b/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-9.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-latest.args b/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-latest.args
index 39f77c14e7..6859ce93e5 100644
--- a/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-latest.args
+++ b/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x-9.1.0.args b/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x-9.1.0.args
index 02c0612440..6a8d3a406b 100644
--- a/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x-9.1.0.args
+++ b/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x-9.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.args b/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.args
index 34f148e430..1e8825ec35 100644
--- a/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.args
+++ b/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-9.1.0.args b/tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-9.1.0.args
index 4d34784f46..800ab47743 100644
--- a/tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-9.1.0.args
+++ b/tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-9.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-latest.args b/tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-latest.args
index a5241c38f3..2cd3354734 100644
--- a/tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-latest.args
+++ b/tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-9.1.0.args b/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-9.1.0.args
index cbb5e9df34..4644a9fe74 100644
--- a/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-9.1.0.args
+++ b/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-9.1.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.args b/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.args
index 2b46f1b83f..d70378e274 100644
--- a/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.args
+++ b/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-smm-off.x86_64-latest.args b/tests/qemuxmlconfdata/machine-smm-off.x86_64-latest.args
index 3a8c486df6..386e4e9a74 100644
--- a/tests/qemuxmlconfdata/machine-smm-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/machine-smm-off.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-smm-on.x86_64-latest.args b/tests/qemuxmlconfdata/machine-smm-on.x86_64-latest.args
index e873488433..fe9e1b6228 100644
--- a/tests/qemuxmlconfdata/machine-smm-on.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/machine-smm-on.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/machine-vmport-opt.x86_64-latest.args b/tests/qemuxmlconfdata/machine-vmport-opt.x86_64-latest.args
index 105e64618a..9c7cf202ea 100644
--- a/tests/qemuxmlconfdata/machine-vmport-opt.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/machine-vmport-opt.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 ad4620175e..c6aed849c4 100644
--- a/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args
index 861d9fb18c..a5a4bab6c1 100644
--- a/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 7b9b60f309..82844926c5 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-dimm-addr.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-dimm-addr.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-dimm.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-dimm.x86_64-latest.args
index de835537d2..7f5c6b2888 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-dimm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-dimm.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-multiple.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-multiple.x86_64-latest.args
index 9eb2d37d96..353b9294f2 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-multiple.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-multiple.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 8c20b3ba5d..75a0813a19 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-numa-preferred.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-numa-preferred.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 693dea866c..71616e7aa7 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-access.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-access.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 a8ed07ec9a..6e8a6442ac 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 364a2aa6ee..bd27981a78 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 e74d2d7013..093d8f2a8f 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-overlap.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-overlap.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 47291c1a09..254636bf35 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.abi-update.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.abi-update.args
index c2c1623d9f..b52e4821bc 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.abi-update.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args
index c2c1623d9f..b52e4821bc 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 35f6653519..5bfa663004 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm.x86_64-latest.args
index 97ee265fa2..9b7837d73f 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.args b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.args
index 18ae15aa0b..83f05ccc9d 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.args
index 6c84ef3b01..ec901a1c34 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390x-latest.args b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390x-latest.args
index a6bbef5ce7..85b3a5bf2f 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390x-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390x-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390x-latest.args b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390x-latest.args
index 9704d7d5e9..6425942992 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390x-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390x-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 03fc5a1efe..20de4e2797 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 097bcda7e5..1196724c2b 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/memory-hotplug.x86_64-latest.args b/tests/qemuxmlconfdata/memory-hotplug.x86_64-latest.args
index e15f6aca47..31c62ec38c 100644
--- a/tests/qemuxmlconfdata/memory-hotplug.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/memorybacking-set.x86_64-latest.args b/tests/qemuxmlconfdata/memorybacking-set.x86_64-latest.args
index 9c0fb4bdb6..f021fa996c 100644
--- a/tests/qemuxmlconfdata/memorybacking-set.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memorybacking-set.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-SomeDummyGuest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/memorybacking-unset.x86_64-latest.args b/tests/qemuxmlconfdata/memorybacking-unset.x86_64-latest.args
index 5e6d15e37b..f7d6278654 100644
--- a/tests/qemuxmlconfdata/memorybacking-unset.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memorybacking-unset.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-SomeDummyGuest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/memtune-unlimited.x86_64-latest.args b/tests/qemuxmlconfdata/memtune-unlimited.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/memtune-unlimited.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memtune-unlimited.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/memtune.x86_64-latest.args b/tests/qemuxmlconfdata/memtune.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/memtune.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/memtune.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/metadata-duplicate.x86_64-latest.args b/tests/qemuxmlconfdata/metadata-duplicate.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/metadata-duplicate.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/metadata-duplicate.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/metadata.x86_64-latest.args b/tests/qemuxmlconfdata/metadata.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/metadata.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/metadata.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/migrate-numa-unaligned.x86_64-latest.args b/tests/qemuxmlconfdata/migrate-numa-unaligned.x86_64-latest.args
index 434753d96d..0b975dc51c 100644
--- a/tests/qemuxmlconfdata/migrate-numa-unaligned.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/migrate-numa-unaligned.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/migrate.x86_64-latest.args b/tests/qemuxmlconfdata/migrate.x86_64-latest.args
index 83ab8fbdf4..456a6dc79e 100644
--- a/tests/qemuxmlconfdata/migrate.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/migrate.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/misc-disable-s3.x86_64-latest.args b/tests/qemuxmlconfdata/misc-disable-s3.x86_64-latest.args
index 0420f7779b..48015d5546 100644
--- a/tests/qemuxmlconfdata/misc-disable-s3.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/misc-disable-s3.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/misc-disable-suspends.x86_64-latest.args b/tests/qemuxmlconfdata/misc-disable-suspends.x86_64-latest.args
index 32f953a49d..68743f6b78 100644
--- a/tests/qemuxmlconfdata/misc-disable-suspends.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/misc-disable-suspends.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/misc-enable-s4.x86_64-latest.args b/tests/qemuxmlconfdata/misc-enable-s4.x86_64-latest.args
index c83f8106e1..c0f17e959e 100644
--- a/tests/qemuxmlconfdata/misc-enable-s4.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/misc-enable-s4.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/misc-no-reboot.x86_64-latest.args b/tests/qemuxmlconfdata/misc-no-reboot.x86_64-latest.args
index 9493ded1c7..d59f1717d9 100644
--- a/tests/qemuxmlconfdata/misc-no-reboot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/misc-no-reboot.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/misc-uuid.x86_64-latest.args b/tests/qemuxmlconfdata/misc-uuid.x86_64-latest.args
index c4e09c0af2..2d052351fa 100644
--- a/tests/qemuxmlconfdata/misc-uuid.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/misc-uuid.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/mlock-off.x86_64-latest.args b/tests/qemuxmlconfdata/mlock-off.x86_64-latest.args
index e4be4266bb..a08dae37e7 100644
--- a/tests/qemuxmlconfdata/mlock-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/mlock-off.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/mlock-on.x86_64-latest.args b/tests/qemuxmlconfdata/mlock-on.x86_64-latest.args
index 8b48a05883..7e703e9106 100644
--- a/tests/qemuxmlconfdata/mlock-on.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/mlock-on.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/mshv-x86_64-q35-headless.x86_64-latest+mshv.args b/tests/qemuxmlconfdata/mshv-x86_64-q35-headless.x86_64-latest+mshv.args
index e72d109a52..28e3e3fc26 100644
--- a/tests/qemuxmlconfdata/mshv-x86_64-q35-headless.x86_64-latest+mshv.args
+++ b/tests/qemuxmlconfdata/mshv-x86_64-q35-headless.x86_64-latest+mshv.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-qemu_mshv/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
diff --git a/tests/qemuxmlconfdata/mtp-usb-device.x86_64-latest.args b/tests/qemuxmlconfdata/mtp-usb-device.x86_64-latest.args
index 71020e6e5e..8af45b4c6d 100644
--- a/tests/qemuxmlconfdata/mtp-usb-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/mtp-usb-device.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/multifunction-pci-device.x86_64-latest.args b/tests/qemuxmlconfdata/multifunction-pci-device.x86_64-latest.args
index cb74747589..0f641f9293 100644
--- a/tests/qemuxmlconfdata/multifunction-pci-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/multifunction-pci-device.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/name-escape.x86_64-latest.args b/tests/qemuxmlconfdata/name-escape.x86_64-latest.args
index 6a7032d99a..5d0db75717 100644
--- a/tests/qemuxmlconfdata/name-escape.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/name-escape.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo=1,bar=2/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args b/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args
index 107b65b7c8..44bf06ee28 100644
--- a/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-f14-60/.config \
 -uuid 38644c45-5227-a936-3b38-bc4f72c355bb \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args b/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args
index 2cd65e8c85..a3731cab99 100644
--- a/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-f14-60/.config \
 -uuid 38644c45-5227-a936-3b38-bc4f72c355bb \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-client.x86_64-latest.args b/tests/qemuxmlconfdata/net-client.x86_64-latest.args
index 4ddfd46e3b..e390929043 100644
--- a/tests/qemuxmlconfdata/net-client.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-client.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args b/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args
index c09d21576d..ac93af6891 100644
--- a/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args
index 8105eaa55a..d5a8b6a107 100644
--- a/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args
index 8105eaa55a..d5a8b6a107 100644
--- a/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args
index 73cd790c4b..09313dcbd6 100644
--- a/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 ac96eb5928..5190a79647 100644
--- a/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-eth.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth.x86_64-latest.args
index 8105eaa55a..d5a8b6a107 100644
--- a/tests/qemuxmlconfdata/net-eth.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-eth.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-hostdev-bootorder.x86_64-latest.args b/tests/qemuxmlconfdata/net-hostdev-bootorder.x86_64-latest.args
index 26c61e29e2..5772fea1c2 100644
--- a/tests/qemuxmlconfdata/net-hostdev-bootorder.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-hostdev-bootorder.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-hostdev-multidomain.x86_64-latest.args b/tests/qemuxmlconfdata/net-hostdev-multidomain.x86_64-latest.args
index 2e94db50a1..839011e0e9 100644
--- a/tests/qemuxmlconfdata/net-hostdev-multidomain.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-hostdev-multidomain.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 c0e17fb91c..8bbaf6d279 100644
--- a/tests/qemuxmlconfdata/net-hostdev-vfio-multidomain.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-hostdev-vfio-multidomain.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-hostdev-vfio.x86_64-latest.args b/tests/qemuxmlconfdata/net-hostdev-vfio.x86_64-latest.args
index 051afb53ac..1ea3597a13 100644
--- a/tests/qemuxmlconfdata/net-hostdev-vfio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-hostdev-vfio.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-hostdev.x86_64-latest.args b/tests/qemuxmlconfdata/net-hostdev.x86_64-latest.args
index 8ee253826e..a5302f08b4 100644
--- a/tests/qemuxmlconfdata/net-hostdev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-hostdev.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args b/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args
index 186128635d..ae4ac627e4 100644
--- a/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-linkstate.x86_64-latest.args b/tests/qemuxmlconfdata/net-linkstate.x86_64-latest.args
index ba1608bf2e..8f52311d2a 100644
--- a/tests/qemuxmlconfdata/net-linkstate.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-linkstate.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-many-models.x86_64-latest.args b/tests/qemuxmlconfdata/net-many-models.x86_64-latest.args
index c6ecde421a..55d271319d 100644
--- a/tests/qemuxmlconfdata/net-many-models.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-many-models.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-mcast.x86_64-latest.args b/tests/qemuxmlconfdata/net-mcast.x86_64-latest.args
index 9caba36642..8fe56a04ef 100644
--- a/tests/qemuxmlconfdata/net-mcast.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-mcast.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args b/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args
index b07fd5779b..0f5a84c3ba 100644
--- a/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args b/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args
index 65e89e47d5..c8f189d6e8 100644
--- a/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args b/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args
index da792aeffd..6d134dcf80 100644
--- a/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-server.x86_64-latest.args b/tests/qemuxmlconfdata/net-server.x86_64-latest.args
index ea3213d508..5818f4f050 100644
--- a/tests/qemuxmlconfdata/net-server.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-server.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-udp.x86_64-latest.args b/tests/qemuxmlconfdata/net-udp.x86_64-latest.args
index abd141af85..5b66fee2da 100644
--- a/tests/qemuxmlconfdata/net-udp.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-udp.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-usb.x86_64-latest.args b/tests/qemuxmlconfdata/net-usb.x86_64-latest.args
index 714ab9aafe..092bf99e22 100644
--- a/tests/qemuxmlconfdata/net-usb.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-usb.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-user-addr.x86_64-latest.args b/tests/qemuxmlconfdata/net-user-addr.x86_64-latest.args
index 4383a8c115..d51441df84 100644
--- a/tests/qemuxmlconfdata/net-user-addr.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-user-addr.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-user-passt.x86_64-7.2.0.args b/tests/qemuxmlconfdata/net-user-passt.x86_64-7.2.0.args
index d9a81ad2a5..1308f7dceb 100644
--- a/tests/qemuxmlconfdata/net-user-passt.x86_64-7.2.0.args
+++ b/tests/qemuxmlconfdata/net-user-passt.x86_64-7.2.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-user-passt.x86_64-latest.args b/tests/qemuxmlconfdata/net-user-passt.x86_64-latest.args
index 48d2596594..ff93aa4df6 100644
--- a/tests/qemuxmlconfdata/net-user-passt.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-user-passt.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-user.x86_64-latest.args b/tests/qemuxmlconfdata/net-user.x86_64-latest.args
index 919b5e3fc7..19dd3e6879 100644
--- a/tests/qemuxmlconfdata/net-user.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-user.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args b/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args
index 313627eab0..ccf76cb422 100644
--- a/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args b/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args
index 118dd5dcb8..2bf22174e4 100644
--- a/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args b/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args
index 4ea3d4eebd..5d5f0f2d08 100644
--- a/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args
index afbbe188cf..bc606a6b05 100644
--- a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.args b/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.args
index f5925c77fe..5bbe1989d0 100644
--- a/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-virtio-ccw.s390x-latest.args b/tests/qemuxmlconfdata/net-virtio-ccw.s390x-latest.args
index 891d755501..e5e6a8b9f9 100644
--- a/tests/qemuxmlconfdata/net-virtio-ccw.s390x-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-ccw.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-virtio-device.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-device.x86_64-latest.args
index 2730412dc7..f5c837a104 100644
--- a/tests/qemuxmlconfdata/net-virtio-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-device.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 07640fe3ba..1d625a1338 100644
--- a/tests/qemuxmlconfdata/net-virtio-disable-offloads.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-disable-offloads.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-virtio-netdev.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-netdev.x86_64-latest.args
index 544a3303cf..e17069aedd 100644
--- a/tests/qemuxmlconfdata/net-virtio-netdev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-netdev.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 f66cb6295d..a604512bf5 100644
--- a/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-virtio-rss.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-rss.x86_64-latest.args
index 4de0393a8a..46853fe77f 100644
--- a/tests/qemuxmlconfdata/net-virtio-rss.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-rss.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-virtio-rxtxqueuesize.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-rxtxqueuesize.x86_64-latest.args
index 7fd596159a..7268d180e9 100644
--- a/tests/qemuxmlconfdata/net-virtio-rxtxqueuesize.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-rxtxqueuesize.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 a5cce0e27c..4c18f4a53f 100644
--- a/tests/qemuxmlconfdata/net-virtio-teaming-hostdev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-teaming-hostdev.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 f03ab5522d..d639218629 100644
--- a/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-virtio-teaming.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-teaming.x86_64-latest.args
index 090bf2979d..1f8876d7a8 100644
--- a/tests/qemuxmlconfdata/net-virtio-teaming.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-teaming.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args
index f1da987dbd..fae2efe381 100644
--- a/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/net-virtio.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio.x86_64-latest.args
index 3dc44b7c27..56f97699d2 100644
--- a/tests/qemuxmlconfdata/net-virtio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/net-virtio.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/nosharepages.x86_64-latest.args b/tests/qemuxmlconfdata/nosharepages.x86_64-latest.args
index 8ad57bfcbc..0d91649703 100644
--- a/tests/qemuxmlconfdata/nosharepages.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/nosharepages.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 33b7eb9c16..48122a005c 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 33b7eb9c16..48122a005c 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 1b53765d3c..0b720d7f3e 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 c4994ddca8..cfcb747db1 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 33b7eb9c16..48122a005c 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 6a137ee3ca..805bdda302 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/numad.x86_64-latest.args b/tests/qemuxmlconfdata/numad.x86_64-latest.args
index 33b7eb9c16..48122a005c 100644
--- a/tests/qemuxmlconfdata/numad.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numad.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 55f3fb6e36..490aa8b5a6 100644
--- a/tests/qemuxmlconfdata/numatune-auto-nodeset-invalid.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-auto-nodeset-invalid.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/numatune-auto-prefer.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-auto-prefer.x86_64-latest.args
index d67d0dbe15..efeb509e22 100644
--- a/tests/qemuxmlconfdata/numatune-auto-prefer.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-auto-prefer.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/numatune-distances.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-distances.x86_64-latest.args
index 8eb4883ed1..cb10375116 100644
--- a/tests/qemuxmlconfdata/numatune-distances.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-distances.x86_64-latest.args
@@ -68,7 +68,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/numatune-hmat-none.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-hmat-none.x86_64-latest.args
index 0f0791a501..afe6c8df24 100644
--- a/tests/qemuxmlconfdata/numatune-hmat-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-hmat-none.x86_64-latest.args
@@ -37,7 +37,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/numatune-hmat.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-hmat.x86_64-latest.args
index a80c21d11e..c6f5d7195b 100644
--- a/tests/qemuxmlconfdata/numatune-hmat.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-hmat.x86_64-latest.args
@@ -37,7 +37,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 a500dda611..8ba2a3bb1e 100644
--- a/tests/qemuxmlconfdata/numatune-memnode-no-memory.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-memnode-no-memory.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 fec41d92cf..a7062b5dd0 100644
--- a/tests/qemuxmlconfdata/numatune-memnode-restrictive-mode.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-memnode-restrictive-mode.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/numatune-memnode.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-memnode.x86_64-latest.args
index 45b9585822..25809ac603 100644
--- a/tests/qemuxmlconfdata/numatune-memnode.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-memnode.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/numatune-no-vcpu.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-no-vcpu.x86_64-latest.args
index 0a1a8033aa..26ce3e4054 100644
--- a/tests/qemuxmlconfdata/numatune-no-vcpu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-no-vcpu.x86_64-latest.args
@@ -32,7 +32,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/numatune-system-memory.x86_64-latest.args b/tests/qemuxmlconfdata/numatune-system-memory.x86_64-latest.args
index d4746c4599..06d43dec48 100644
--- a/tests/qemuxmlconfdata/numatune-system-memory.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numatune-system-memory.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args
index 0d4866d277..14f0c2c595 100644
--- a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-dummy/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pages-dimm-discard.x86_64-latest.args b/tests/qemuxmlconfdata/pages-dimm-discard.x86_64-latest.args
index c01acb4740..d28339fc23 100644
--- a/tests/qemuxmlconfdata/pages-dimm-discard.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pages-dimm-discard.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fedora/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pages-discard-hugepages.x86_64-latest.args b/tests/qemuxmlconfdata/pages-discard-hugepages.x86_64-latest.args
index d1b3c45379..1146ca7ee6 100644
--- a/tests/qemuxmlconfdata/pages-discard-hugepages.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pages-discard-hugepages.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-SomeDummyHugepagesGu/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pages-discard.x86_64-latest.args b/tests/qemuxmlconfdata/pages-discard.x86_64-latest.args
index 9bdf10d8d0..4545f5a0fa 100644
--- a/tests/qemuxmlconfdata/pages-discard.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pages-discard.x86_64-latest.args
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/panic-double.x86_64-latest.args b/tests/qemuxmlconfdata/panic-double.x86_64-latest.args
index b76b28e877..e8295a205f 100644
--- a/tests/qemuxmlconfdata/panic-double.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/panic-double.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/panic-no-address.x86_64-latest.args b/tests/qemuxmlconfdata/panic-no-address.x86_64-latest.args
index b2ef8dd6ff..edd542f688 100644
--- a/tests/qemuxmlconfdata/panic-no-address.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/panic-no-address.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/panic-pseries.ppc64-latest.args b/tests/qemuxmlconfdata/panic-pseries.ppc64-latest.args
index a4a0bc994f..388c0180db 100644
--- a/tests/qemuxmlconfdata/panic-pseries.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/panic-pseries.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/panic.x86_64-latest.args b/tests/qemuxmlconfdata/panic.x86_64-latest.args
index 621daa8dab..e64717ba6c 100644
--- a/tests/qemuxmlconfdata/panic.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/panic.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/parallel-parport-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/parallel-parport-chardev.x86_64-latest.args
index 2cf5a66040..cc60c2ba7e 100644
--- a/tests/qemuxmlconfdata/parallel-parport-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/parallel-parport-chardev.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/parallel-tcp-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/parallel-tcp-chardev.x86_64-latest.args
index 4e433553e4..cd8ca587a2 100644
--- a/tests/qemuxmlconfdata/parallel-tcp-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/parallel-tcp-chardev.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args
index d727c44bfc..260e0cc4b5 100644
--- a/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args
@@ -21,13 +21,13 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
--chardev socket,id=charparallel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charparallel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel0"}' \
 -chardev socket,id=charparallel1,path=/tmp/parport1.socket \
 -device '{"driver":"isa-parallel","chardev":"charparallel1","id":"parallel1"}' \
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 61ae4f23d3..959bc9a2fe 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-i440fx/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 9b257cb36d..6418fae461 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-i440fx/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pci-autoadd-addr.x86_64-latest.args b/tests/qemuxmlconfdata/pci-autoadd-addr.x86_64-latest.args
index a13238efd8..05fe35e50f 100644
--- a/tests/qemuxmlconfdata/pci-autoadd-addr.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-autoadd-addr.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pci-autoadd-idx.x86_64-latest.args b/tests/qemuxmlconfdata/pci-autoadd-idx.x86_64-latest.args
index 3c27825431..8733f1f61b 100644
--- a/tests/qemuxmlconfdata/pci-autoadd-idx.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-autoadd-idx.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pci-autofill-addr.x86_64-latest.args b/tests/qemuxmlconfdata/pci-autofill-addr.x86_64-latest.args
index 4f37de212b..aed6f28244 100644
--- a/tests/qemuxmlconfdata/pci-autofill-addr.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-autofill-addr.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 c3e53eb0c0..0cde25cd1d 100644
--- a/tests/qemuxmlconfdata/pci-bridge-many-disks.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-bridge-many-disks.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-lots-of-disks/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pci-bridge.x86_64-latest.args b/tests/qemuxmlconfdata/pci-bridge.x86_64-latest.args
index 6a631f557d..196d8bf362 100644
--- a/tests/qemuxmlconfdata/pci-bridge.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-bridge.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
 -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pci-expander-bus.x86_64-latest.args b/tests/qemuxmlconfdata/pci-expander-bus.x86_64-latest.args
index d3960731be..1a968c7b61 100644
--- a/tests/qemuxmlconfdata/pci-expander-bus.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-expander-bus.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-expander-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pci-many.x86_64-latest.args b/tests/qemuxmlconfdata/pci-many.x86_64-latest.args
index 2bf2d2f9fe..c6ff7a88a3 100644
--- a/tests/qemuxmlconfdata/pci-many.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-many.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-fdr-br/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pci-rom-disabled.x86_64-latest.args b/tests/qemuxmlconfdata/pci-rom-disabled.x86_64-latest.args
index dbc18d1f38..965d27ddb2 100644
--- a/tests/qemuxmlconfdata/pci-rom-disabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-rom-disabled.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pci-rom.x86_64-latest.args b/tests/qemuxmlconfdata/pci-rom.x86_64-latest.args
index a4a1c57319..e2bd79ec0c 100644
--- a/tests/qemuxmlconfdata/pci-rom.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-rom.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 5b535bea03..e25117f2a8 100644
--- a/tests/qemuxmlconfdata/pci-serial-dev-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pci-serial-dev-chardev.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.args
index e7661b4ac9..1cab3b43e6 100644
--- a/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pcie-expander-bus.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-expander-bus.x86_64-latest.args
index 497192f24e..960b200456 100644
--- a/tests/qemuxmlconfdata/pcie-expander-bus.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcie-expander-bus.x86_64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 dac9c0fd24..4f04041b8a 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 e44f95a165..8c74197be6 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 f9c2ad4f6d..12ede653d7 100644
--- a/tests/qemuxmlconfdata/pcie-root-port-nohotplug.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcie-root-port-nohotplug.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pcie-root-port.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-root-port.x86_64-latest.args
index 87689266e1..7fe61b07fc 100644
--- a/tests/qemuxmlconfdata/pcie-root-port.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcie-root-port.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pcie-root.x86_64-latest.args b/tests/qemuxmlconfdata/pcie-root.x86_64-latest.args
index 24bdf4b998..258f19b119 100644
--- a/tests/qemuxmlconfdata/pcie-root.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcie-root.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 7bf7431006..97b7e7d1e8 100644
--- a/tests/qemuxmlconfdata/pcie-switch-downstream-port.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcie-switch-downstream-port.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 be5fe92358..fe3e5efde0 100644
--- a/tests/qemuxmlconfdata/pcie-switch-upstream-port.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcie-switch-upstream-port.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pcihole64-gib.x86_64-latest.args b/tests/qemuxmlconfdata/pcihole64-gib.x86_64-latest.args
index 47533c584c..b10a8abb1b 100644
--- a/tests/qemuxmlconfdata/pcihole64-gib.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcihole64-gib.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pcihole64-q35.x86_64-latest.args b/tests/qemuxmlconfdata/pcihole64-q35.x86_64-latest.args
index ff5d3ca592..2678f3a8e9 100644
--- a/tests/qemuxmlconfdata/pcihole64-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcihole64-q35.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.args b/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.args
index c8655b84b2..046c847403 100644
--- a/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pcihole64.x86_64-latest.args b/tests/qemuxmlconfdata/pcihole64.x86_64-latest.args
index 9f765a7816..7208dff53f 100644
--- a/tests/qemuxmlconfdata/pcihole64.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pcihole64.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pmu-feature-off.x86_64-latest.args b/tests/qemuxmlconfdata/pmu-feature-off.x86_64-latest.args
index b623627542..8224afd641 100644
--- a/tests/qemuxmlconfdata/pmu-feature-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pmu-feature-off.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pmu-feature.x86_64-latest.args b/tests/qemuxmlconfdata/pmu-feature.x86_64-latest.args
index 25e35f9711..06a556b04a 100644
--- a/tests/qemuxmlconfdata/pmu-feature.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pmu-feature.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc-dtb.ppc-latest.args b/tests/qemuxmlconfdata/ppc-dtb.ppc-latest.args
index bdc86620c8..7db041d828 100644
--- a/tests/qemuxmlconfdata/ppc-dtb.ppc-latest.args
+++ b/tests/qemuxmlconfdata/ppc-dtb.ppc-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc-mac99-minimal.ppc-latest.abi-update.args b/tests/qemuxmlconfdata/ppc-mac99-minimal.ppc-latest.abi-update.args
index 9c7c884c83..32952b1a3e 100644
--- a/tests/qemuxmlconfdata/ppc-mac99-minimal.ppc-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/ppc-mac99-minimal.ppc-latest.abi-update.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc-mac99-minimal.ppc-latest.args b/tests/qemuxmlconfdata/ppc-mac99-minimal.ppc-latest.args
index 9c7c884c83..32952b1a3e 100644
--- a/tests/qemuxmlconfdata/ppc-mac99-minimal.ppc-latest.args
+++ b/tests/qemuxmlconfdata/ppc-mac99-minimal.ppc-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args
index 6390322e8c..7f84dbc2e2 100644
--- a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args
index 130c801fa6..ef93f746f0 100644
--- a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args
index e1e7277596..6ff2a86c8e 100644
--- a/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args
index c15cbadf26..f1d742dbe3 100644
--- a/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc64-g3beige-minimal.ppc64-latest.abi-update.args b/tests/qemuxmlconfdata/ppc64-g3beige-minimal.ppc64-latest.abi-update.args
index d32a4b9f2d..0745c49a13 100644
--- a/tests/qemuxmlconfdata/ppc64-g3beige-minimal.ppc64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/ppc64-g3beige-minimal.ppc64-latest.abi-update.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc64-g3beige-minimal.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-g3beige-minimal.ppc64-latest.args
index 581374949c..21212f319d 100644
--- a/tests/qemuxmlconfdata/ppc64-g3beige-minimal.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/ppc64-g3beige-minimal.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc64-mac99-minimal.ppc64-latest.abi-update.args b/tests/qemuxmlconfdata/ppc64-mac99-minimal.ppc64-latest.abi-update.args
index b1fbfb221f..fa0e90e65b 100644
--- a/tests/qemuxmlconfdata/ppc64-mac99-minimal.ppc64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/ppc64-mac99-minimal.ppc64-latest.abi-update.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc64-mac99-minimal.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-mac99-minimal.ppc64-latest.args
index 2223bef896..d458143f08 100644
--- a/tests/qemuxmlconfdata/ppc64-mac99-minimal.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/ppc64-mac99-minimal.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc64-powernv9-minimal.ppc64-latest.abi-update.args b/tests/qemuxmlconfdata/ppc64-powernv9-minimal.ppc64-latest.abi-update.args
index 368b1575cb..c9379de0f7 100644
--- a/tests/qemuxmlconfdata/ppc64-powernv9-minimal.ppc64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/ppc64-powernv9-minimal.ppc64-latest.abi-update.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc64-powernv9-minimal.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-powernv9-minimal.ppc64-latest.args
index 86c7109182..b2a65978e9 100644
--- a/tests/qemuxmlconfdata/ppc64-powernv9-minimal.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/ppc64-powernv9-minimal.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.abi-update.args b/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.abi-update.args
index a5f625beee..61ac8babe3 100644
--- a/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.abi-update.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.args
index ca7a17f35d..c9af9b25cc 100644
--- a/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.args
index b2f3b27a13..47c0fc440e 100644
--- a/tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -uuid b35969f7-e7cf-4d90-a9a0-4dd9000f9824 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -34,7 +34,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:a2:44:92","bus":"pci.0","addr":"0x1"}' \
 -chardev pty,id=charserial0 \
 -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg":805306368}' \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \
 -device '{"driver":"usb-kbd","id":"input1","bus":"usb.0","port":"2"}' \
diff --git a/tests/qemuxmlconfdata/ppc64-pseries-headless.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-pseries-headless.ppc64-latest.args
index c35eaf6d6b..8c71679647 100644
--- a/tests/qemuxmlconfdata/ppc64-pseries-headless.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/ppc64-pseries-headless.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -35,7 +35,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.0","addr":"0x1"}' \
 -chardev pty,id=charserial0 \
 -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg":805306368}' \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x5"}' \
diff --git a/tests/qemuxmlconfdata/ppc64-pseries-minimal.ppc64-latest.abi-update.args b/tests/qemuxmlconfdata/ppc64-pseries-minimal.ppc64-latest.abi-update.args
index a7aa3009ce..0b9665d5db 100644
--- a/tests/qemuxmlconfdata/ppc64-pseries-minimal.ppc64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/ppc64-pseries-minimal.ppc64-latest.abi-update.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc64-pseries-minimal.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-pseries-minimal.ppc64-latest.args
index 72e2189563..08b909d6c4 100644
--- a/tests/qemuxmlconfdata/ppc64-pseries-minimal.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/ppc64-pseries-minimal.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc64-tpmproxy-single.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-tpmproxy-single.ppc64-latest.args
index 42232bdbc0..05c58d5418 100644
--- a/tests/qemuxmlconfdata/ppc64-tpmproxy-single.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/ppc64-tpmproxy-single.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args
index 60512d24cd..7c8a58a3b4 100644
--- a/tests/qemuxmlconfdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/ppce500-serial.ppc-latest.args b/tests/qemuxmlconfdata/ppce500-serial.ppc-latest.args
index 21aa64b323..8d275cfa1c 100644
--- a/tests/qemuxmlconfdata/ppce500-serial.ppc-latest.args
+++ b/tests/qemuxmlconfdata/ppce500-serial.ppc-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-basic.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-basic.ppc64-latest.args
index a4a0bc994f..388c0180db 100644
--- a/tests/qemuxmlconfdata/pseries-basic.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-basic.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-console-virtio.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-console-virtio.ppc64-latest.args
index 062acbc7ed..7bef59651b 100644
--- a/tests/qemuxmlconfdata/pseries-console-virtio.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-console-virtio.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-cpu-compat-power10.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-cpu-compat-power10.ppc64-latest.args
index 7978fcd5eb..4f49ac77b2 100644
--- a/tests/qemuxmlconfdata/pseries-cpu-compat-power10.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-cpu-compat-power10.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-latest.args
index a800f81905..bd582a2b5f 100644
--- a/tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-cpu-compat-power9.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-cpu-compat-power9.ppc64-latest.args
index c78663468d..67ecd537f7 100644
--- a/tests/qemuxmlconfdata/pseries-cpu-compat-power9.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-cpu-compat-power9.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-cpu-compat.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-cpu-compat.ppc64-latest.args
index df4c9a257f..4a93f19bd8 100644
--- a/tests/qemuxmlconfdata/pseries-cpu-compat.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-cpu-compat.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-cpu-exact.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-cpu-exact.ppc64-latest.args
index 4f966d5079..acb3953489 100644
--- a/tests/qemuxmlconfdata/pseries-cpu-exact.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-cpu-exact.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.args
index 7dbdc20359..33840497fc 100644
--- a/tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-features.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-features.ppc64-latest.args
index 721c86ccab..fc43fd6df0 100644
--- a/tests/qemuxmlconfdata/pseries-features.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-features.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-hostdevs-1.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-hostdevs-1.ppc64-latest.args
index 30d97d291c..aea182f981 100644
--- a/tests/qemuxmlconfdata/pseries-hostdevs-1.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-hostdevs-1.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-hostdevs-2.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-hostdevs-2.ppc64-latest.args
index 4674158fd1..bbd0735fcc 100644
--- a/tests/qemuxmlconfdata/pseries-hostdevs-2.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-hostdevs-2.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-hostdevs-3.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-hostdevs-3.ppc64-latest.args
index e85227a951..81db87c8ff 100644
--- a/tests/qemuxmlconfdata/pseries-hostdevs-3.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-hostdevs-3.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-many-buses-1.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-many-buses-1.ppc64-latest.args
index fd4a9da867..958fdbbbee 100644
--- a/tests/qemuxmlconfdata/pseries-many-buses-1.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-many-buses-1.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-many-buses-2.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-many-buses-2.ppc64-latest.args
index 2426df6feb..f8419a21d7 100644
--- a/tests/qemuxmlconfdata/pseries-many-buses-2.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-many-buses-2.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-many-devices.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-many-devices.ppc64-latest.args
index 5e9d96e18c..46bd252834 100644
--- a/tests/qemuxmlconfdata/pseries-many-devices.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-many-devices.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-nvram.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-nvram.ppc64-latest.args
index 9a279fd090..43169b3cc4 100644
--- a/tests/qemuxmlconfdata/pseries-nvram.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-nvram.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-panic-missing.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-panic-missing.ppc64-latest.args
index a4a0bc994f..388c0180db 100644
--- a/tests/qemuxmlconfdata/pseries-panic-missing.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-panic-missing.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-panic-no-address.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-panic-no-address.ppc64-latest.args
index a4a0bc994f..388c0180db 100644
--- a/tests/qemuxmlconfdata/pseries-panic-no-address.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-panic-no-address.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-phb-default-missing.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-phb-default-missing.ppc64-latest.args
index 4e9b590ae2..89fffcaf2d 100644
--- a/tests/qemuxmlconfdata/pseries-phb-default-missing.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-phb-default-missing.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-phb-numa-node.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-phb-numa-node.ppc64-latest.args
index d833537772..7d9a023c74 100644
--- a/tests/qemuxmlconfdata/pseries-phb-numa-node.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-phb-numa-node.ppc64-latest.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-phb-simple.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-phb-simple.ppc64-latest.args
index d22ccd8874..35e3b881b5 100644
--- a/tests/qemuxmlconfdata/pseries-phb-simple.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-phb-simple.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-phb-user-alias.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-phb-user-alias.ppc64-latest.args
index d2bedf6935..b992ffd5ab 100644
--- a/tests/qemuxmlconfdata/pseries-phb-user-alias.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-phb-user-alias.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-serial-native.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-serial-native.ppc64-latest.args
index 0fb62d0e40..627438005b 100644
--- a/tests/qemuxmlconfdata/pseries-serial-native.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-serial-native.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-serial-pci.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-serial-pci.ppc64-latest.args
index 4cab803d7f..34a6d82ce1 100644
--- a/tests/qemuxmlconfdata/pseries-serial-pci.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-serial-pci.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-serial-usb.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-serial-usb.ppc64-latest.args
index 9ec0226e31..3090e2f01a 100644
--- a/tests/qemuxmlconfdata/pseries-serial-usb.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-serial-usb.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-usb-default.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-usb-default.ppc64-latest.args
index a4a0bc994f..388c0180db 100644
--- a/tests/qemuxmlconfdata/pseries-usb-default.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-usb-default.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-usb-kbd.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-usb-kbd.ppc64-latest.args
index 981d24a87a..4838af8ee3 100644
--- a/tests/qemuxmlconfdata/pseries-usb-kbd.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-usb-kbd.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-usb-multi.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-usb-multi.ppc64-latest.args
index 2effe61172..93d7cccef4 100644
--- a/tests/qemuxmlconfdata/pseries-usb-multi.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-usb-multi.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-vio-user-assigned.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-vio-user-assigned.ppc64-latest.args
index 801cd30ab9..9548493a5c 100644
--- a/tests/qemuxmlconfdata/pseries-vio-user-assigned.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-vio-user-assigned.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pseries-vio.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-vio.ppc64-latest.args
index d0a32179a9..e3401b4ff0 100644
--- a/tests/qemuxmlconfdata/pseries-vio.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-vio.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pstore-acpi-erst.x86_64-latest.args b/tests/qemuxmlconfdata/pstore-acpi-erst.x86_64-latest.args
index 2e217f6c83..a07af47b2f 100644
--- a/tests/qemuxmlconfdata/pstore-acpi-erst.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pstore-acpi-erst.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pv-spinlock-disabled.x86_64-latest.args b/tests/qemuxmlconfdata/pv-spinlock-disabled.x86_64-latest.args
index 46d3c94f87..af47bb71f7 100644
--- a/tests/qemuxmlconfdata/pv-spinlock-disabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pv-spinlock-disabled.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pv-spinlock-enabled.x86_64-latest.args b/tests/qemuxmlconfdata/pv-spinlock-enabled.x86_64-latest.args
index 8e0007be7c..0fdb3c7481 100644
--- a/tests/qemuxmlconfdata/pv-spinlock-enabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pv-spinlock-enabled.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.args
index 33313cd52d..11d92109cf 100644
--- a/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.args
index 867192c79e..45da4ae094 100644
--- a/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 b80ab56e25..c650f7c38c 100644
--- a/tests/qemuxmlconfdata/pvpanic-pci-x86_64.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/pvpanic-pci-x86_64.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 fa3b7dc0cb..458efb7188 100644
--- a/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/q35-multifunction.x86_64-latest.args b/tests/qemuxmlconfdata/q35-multifunction.x86_64-latest.args
index d8bc6d8478..45d20ff3ec 100644
--- a/tests/qemuxmlconfdata/q35-multifunction.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-multifunction.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 484de9ad27..9a10a484f6 100644
--- a/tests/qemuxmlconfdata/q35-pci-force-address.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-pci-force-address.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-latest.args b/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-latest.args
index 0f221ac2db..e478408ef7 100644
--- a/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/q35-pcie.x86_64-latest.args b/tests/qemuxmlconfdata/q35-pcie.x86_64-latest.args
index 0720377f2f..de392a1a89 100644
--- a/tests/qemuxmlconfdata/q35-pcie.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-pcie.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/q35-usb2-multi.x86_64-latest.args b/tests/qemuxmlconfdata/q35-usb2-multi.x86_64-latest.args
index f3598e90fe..25d568ee78 100644
--- a/tests/qemuxmlconfdata/q35-usb2-multi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-usb2-multi.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/q35-usb2-reorder.x86_64-latest.args b/tests/qemuxmlconfdata/q35-usb2-reorder.x86_64-latest.args
index c1d4ee40f1..95e3b11d41 100644
--- a/tests/qemuxmlconfdata/q35-usb2-reorder.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-usb2-reorder.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/q35-usb2.x86_64-latest.args b/tests/qemuxmlconfdata/q35-usb2.x86_64-latest.args
index 86776e45f5..4d6ec71820 100644
--- a/tests/qemuxmlconfdata/q35-usb2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-usb2.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 d06a25ef10..82736207ec 100644
--- a/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-virt-manager-basic/.config \
 -uuid 1b826c23-8767-47ad-a6b5-c83a88277f71 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
@@ -43,7 +43,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-virt-manager-basic/.config \
 -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:9a:e6:c6","bus":"pci.1","addr":"0x0"}' \
 -chardev pty,id=charserial0 \
 -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -chardev spicevmc,id=charchannel1,name=vdagent \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel1","id":"channel1","name":"com.redhat.spice.0"}' \
diff --git a/tests/qemuxmlconfdata/q35.x86_64-latest.args b/tests/qemuxmlconfdata/q35.x86_64-latest.args
index 54ca1cb119..a3ce32772c 100644
--- a/tests/qemuxmlconfdata/q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/qemu-ns-alt.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns-alt.x86_64-latest.args
index 07af64af26..06ec76d1b3 100644
--- a/tests/qemuxmlconfdata/qemu-ns-alt.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/qemu-ns-alt.x86_64-latest.args
@@ -23,7 +23,7 @@ BAR='' \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 52a1488073..8a19dac9c8 100644
--- a/tests/qemuxmlconfdata/qemu-ns-commandline-ns0.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/qemu-ns-commandline-ns0.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 52a1488073..8a19dac9c8 100644
--- a/tests/qemuxmlconfdata/qemu-ns-commandline-ns1.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/qemu-ns-commandline-ns1.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/qemu-ns-commandline.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns-commandline.x86_64-latest.args
index 52a1488073..8a19dac9c8 100644
--- a/tests/qemuxmlconfdata/qemu-ns-commandline.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/qemu-ns-commandline.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 52a1488073..8a19dac9c8 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 52a1488073..8a19dac9c8 100644
--- a/tests/qemuxmlconfdata/qemu-ns-domain-commandline.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/qemu-ns-domain-commandline.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 52a1488073..8a19dac9c8 100644
--- a/tests/qemuxmlconfdata/qemu-ns-domain-ns0.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/qemu-ns-domain-ns0.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 43abe6e1fe..1c624fa658 100644
--- a/tests/qemuxmlconfdata/qemu-ns-no-env.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/qemu-ns-no-env.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/qemu-ns.x86_64-latest.args b/tests/qemuxmlconfdata/qemu-ns.x86_64-latest.args
index de5067e1d5..459950e911 100644
--- a/tests/qemuxmlconfdata/qemu-ns.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/qemu-ns.x86_64-latest.args
@@ -24,7 +24,7 @@ BAR='' \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/reboot-timeout-disabled.x86_64-latest.args b/tests/qemuxmlconfdata/reboot-timeout-disabled.x86_64-latest.args
index 0a2a024edb..faf0da785f 100644
--- a/tests/qemuxmlconfdata/reboot-timeout-disabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/reboot-timeout-disabled.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/reboot-timeout-enabled.x86_64-latest.args b/tests/qemuxmlconfdata/reboot-timeout-enabled.x86_64-latest.args
index 59dbfd7152..605a6a7f7f 100644
--- a/tests/qemuxmlconfdata/reboot-timeout-enabled.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/reboot-timeout-enabled.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/restore-v2-fd.x86_64-latest.args b/tests/qemuxmlconfdata/restore-v2-fd.x86_64-latest.args
index 853b9c30a9..273eaddd6d 100644
--- a/tests/qemuxmlconfdata/restore-v2-fd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/restore-v2-fd.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/restore-v2.x86_64-latest.args b/tests/qemuxmlconfdata/restore-v2.x86_64-latest.args
index fd66760998..5cab2a5138 100644
--- a/tests/qemuxmlconfdata/restore-v2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/restore-v2.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/riscv64-virt-acpi.riscv64-latest.args b/tests/qemuxmlconfdata/riscv64-virt-acpi.riscv64-latest.args
index cc38be287c..a07c5a92c6 100644
--- a/tests/qemuxmlconfdata/riscv64-virt-acpi.riscv64-latest.args
+++ b/tests/qemuxmlconfdata/riscv64-virt-acpi.riscv64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.abi-update.args b/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.abi-update.args
index 99e1946d98..3184cec16d 100644
--- a/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.abi-update.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.args b/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.args
index 99e1946d98..3184cec16d 100644
--- a/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.args
+++ b/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/riscv64-virt-features-aia.riscv64-latest.args b/tests/qemuxmlconfdata/riscv64-virt-features-aia.riscv64-latest.args
index 0256026ba4..85ed15438e 100644
--- a/tests/qemuxmlconfdata/riscv64-virt-features-aia.riscv64-latest.args
+++ b/tests/qemuxmlconfdata/riscv64-virt-features-aia.riscv64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.args b/tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.args
index 217e318baa..3e5d16975d 100644
--- a/tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.args
+++ b/tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -uuid 96bc2754-8842-4714-a45f-3f69e7a9a852 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -42,7 +42,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \
 -device '{"driver":"usb-kbd","id":"input1","bus":"usb.0","port":"2"}' \
diff --git a/tests/qemuxmlconfdata/riscv64-virt-headless-mmio.riscv64-latest.args b/tests/qemuxmlconfdata/riscv64-virt-headless-mmio.riscv64-latest.args
index aa847822a1..1bcbdb2f25 100644
--- a/tests/qemuxmlconfdata/riscv64-virt-headless-mmio.riscv64-latest.args
+++ b/tests/qemuxmlconfdata/riscv64-virt-headless-mmio.riscv64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -34,7 +34,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -device '{"driver":"virtio-net-device","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37"}' \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-device","id":"balloon0"}' \
diff --git a/tests/qemuxmlconfdata/riscv64-virt-headless.riscv64-latest.args b/tests/qemuxmlconfdata/riscv64-virt-headless.riscv64-latest.args
index 5ccfc8d206..be63cfa3df 100644
--- a/tests/qemuxmlconfdata/riscv64-virt-headless.riscv64-latest.args
+++ b/tests/qemuxmlconfdata/riscv64-virt-headless.riscv64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -42,7 +42,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","addr":"0x0"}' \
diff --git a/tests/qemuxmlconfdata/riscv64-virt-minimal.riscv64-latest.abi-update.args b/tests/qemuxmlconfdata/riscv64-virt-minimal.riscv64-latest.abi-update.args
index 74bf8bc134..4e9f6c39bc 100644
--- a/tests/qemuxmlconfdata/riscv64-virt-minimal.riscv64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/riscv64-virt-minimal.riscv64-latest.abi-update.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/riscv64-virt-minimal.riscv64-latest.args b/tests/qemuxmlconfdata/riscv64-virt-minimal.riscv64-latest.args
index 74bf8bc134..4e9f6c39bc 100644
--- a/tests/qemuxmlconfdata/riscv64-virt-minimal.riscv64-latest.args
+++ b/tests/qemuxmlconfdata/riscv64-virt-minimal.riscv64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390-async-teardown-disabled.s390x-latest.args b/tests/qemuxmlconfdata/s390-async-teardown-disabled.s390x-latest.args
index 96b18b83ce..6e5203d072 100644
--- a/tests/qemuxmlconfdata/s390-async-teardown-disabled.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390-async-teardown-disabled.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390-async-teardown-no-attrib.s390x-latest.args b/tests/qemuxmlconfdata/s390-async-teardown-no-attrib.s390x-latest.args
index cc7866499f..d4951ba3f1 100644
--- a/tests/qemuxmlconfdata/s390-async-teardown-no-attrib.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390-async-teardown-no-attrib.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390-async-teardown.s390x-latest.args b/tests/qemuxmlconfdata/s390-async-teardown.s390x-latest.args
index cc7866499f..d4951ba3f1 100644
--- a/tests/qemuxmlconfdata/s390-async-teardown.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390-async-teardown.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0.s390x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0.s390x-latest.args
index 71678a29cf..bf9ee5fa4c 100644
--- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-10.0.0.args b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-10.0.0.args
index 3f3de9a668..6936ab6377 100644
--- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-10.0.0.args
+++ b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-10.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.s390x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.s390x-latest.args
index a3e60cd6ab..1bd574fd6d 100644
--- a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-10.0.0.args b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-10.0.0.args
index 61e38d908b..91eb69ad96 100644
--- a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-10.0.0.args
+++ b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-10.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args b/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args
index 1dceeb59d4..9ff15dd079 100644
--- a/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390-panic-missing.s390x-latest.args b/tests/qemuxmlconfdata/s390-panic-missing.s390x-latest.args
index a2d6a10038..ef8acd792a 100644
--- a/tests/qemuxmlconfdata/s390-panic-missing.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390-panic-missing.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390-panic-no-address.s390x-latest.args b/tests/qemuxmlconfdata/s390-panic-no-address.s390x-latest.args
index 7f7dedfa2b..a394800191 100644
--- a/tests/qemuxmlconfdata/s390-panic-no-address.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390-panic-no-address.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390-panic.s390x-latest.args b/tests/qemuxmlconfdata/s390-panic.s390x-latest.args
index bd79ab1ee3..a0680e5efc 100644
--- a/tests/qemuxmlconfdata/s390-panic.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390-panic.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390-serial-2.s390x-latest.args b/tests/qemuxmlconfdata/s390-serial-2.s390x-latest.args
index 3d57c421d6..c6adbcb0ef 100644
--- a/tests/qemuxmlconfdata/s390-serial-2.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390-serial-2.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390-serial-console.s390x-latest.args b/tests/qemuxmlconfdata/s390-serial-console.s390x-latest.args
index 8ee435d467..0eb20eb5e3 100644
--- a/tests/qemuxmlconfdata/s390-serial-console.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390-serial-console.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390-serial.s390x-latest.args b/tests/qemuxmlconfdata/s390-serial.s390x-latest.args
index 8ee435d467..0eb20eb5e3 100644
--- a/tests/qemuxmlconfdata/s390-serial.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390-serial.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args
index 485b121a08..0ab1c12582 100644
--- a/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.args b/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.args
index 85a3e5a53c..1c2e77a6e1 100644
--- a/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args b/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args
index 485b121a08..0ab1c12582 100644
--- a/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390x-ccw-acpi.s390x-latest.args b/tests/qemuxmlconfdata/s390x-ccw-acpi.s390x-latest.args
index 84098e580e..0f0d7c907e 100644
--- a/tests/qemuxmlconfdata/s390x-ccw-acpi.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390x-ccw-acpi.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.abi-update.args b/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.abi-update.args
index 4c27502208..58795a1c5f 100644
--- a/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.abi-update.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.args b/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.args
index 4c27502208..58795a1c5f 100644
--- a/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.args b/tests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.args
index d80f459d12..25a3e89e47 100644
--- a/tests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -uuid a7ca230a-fbe0-48b8-8ea6-25836f8cbc32 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -31,7 +31,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \
 -netdev '{"type":"user","id":"hostnet0"}' \
 -device '{"driver":"virtio-net-ccw","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:1a:29","devno":"fe.0.0001"}' \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -chardev pty,id=charconsole0 \
 -device '{"driver":"sclpconsole","chardev":"charconsole0","id":"console0"}' \
diff --git a/tests/qemuxmlconfdata/s390x-ccw-headless.s390x-latest.args b/tests/qemuxmlconfdata/s390x-ccw-headless.s390x-latest.args
index b39b36db1e..b0a9e6cc1c 100644
--- a/tests/qemuxmlconfdata/s390x-ccw-headless.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390x-ccw-headless.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -32,7 +32,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \
 -netdev '{"type":"user","id":"hostnet0"}' \
 -device '{"driver":"virtio-net-ccw","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","devno":"fe.0.0001"}' \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -chardev pty,id=charconsole0 \
 -device '{"driver":"sclpconsole","chardev":"charconsole0","id":"console0"}' \
diff --git a/tests/qemuxmlconfdata/s390x-ccw-minimal.s390x-latest.abi-update.args b/tests/qemuxmlconfdata/s390x-ccw-minimal.s390x-latest.abi-update.args
index 84098e580e..0f0d7c907e 100644
--- a/tests/qemuxmlconfdata/s390x-ccw-minimal.s390x-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/s390x-ccw-minimal.s390x-latest.abi-update.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/s390x-ccw-minimal.s390x-latest.args b/tests/qemuxmlconfdata/s390x-ccw-minimal.s390x-latest.args
index 84098e580e..0f0d7c907e 100644
--- a/tests/qemuxmlconfdata/s390x-ccw-minimal.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390x-ccw-minimal.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 76df9c30b0..5cc171d512 100644
--- a/tests/qemuxmlconfdata/schema-reorder-domain-subelements.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/schema-reorder-domain-subelements.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-passtvhostuu/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/seclabel-dac-none.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dac-none.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/seclabel-dac-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-dac-none.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/seclabel-device-multiple.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-device-multiple.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/seclabel-device-multiple.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-device-multiple.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/seclabel-dynamic-baselabel.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic-baselabel.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/seclabel-dynamic-baselabel.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-dynamic-baselabel.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/seclabel-dynamic-labelskip.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic-labelskip.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/seclabel-dynamic-labelskip.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-dynamic-labelskip.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 3cdc3360a7..8b6a26156d 100644
--- a/tests/qemuxmlconfdata/seclabel-dynamic-none-relabel.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-dynamic-none-relabel.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-migt10/.config \
 -uuid 0d73c5c3-43d0-f75b-31de-6aa919b0176b \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/seclabel-dynamic-none.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic-none.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/seclabel-dynamic-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-dynamic-none.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/seclabel-dynamic-override.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic-override.x86_64-latest.args
index a8f42a7674..070683ac77 100644
--- a/tests/qemuxmlconfdata/seclabel-dynamic-override.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-dynamic-override.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/seclabel-dynamic-relabel.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic-relabel.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/seclabel-dynamic-relabel.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-dynamic-relabel.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/seclabel-dynamic.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-dynamic.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/seclabel-dynamic.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-dynamic.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/seclabel-none.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-none.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/seclabel-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-none.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/seclabel-selinux-none-override.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-selinux-none-override.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/seclabel-static-labelskip.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-static-labelskip.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/seclabel-static-labelskip.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-static-labelskip.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/seclabel-static-relabel.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-static-relabel.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/seclabel-static-relabel.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-static-relabel.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/seclabel-static.x86_64-latest.args b/tests/qemuxmlconfdata/seclabel-static.x86_64-latest.args
index 23beb54806..689b636c57 100644
--- a/tests/qemuxmlconfdata/seclabel-static.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/seclabel-static.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/serial-debugcon.x86_64-latest.args b/tests/qemuxmlconfdata/serial-debugcon.x86_64-latest.args
index d14c874772..d4cd55756a 100644
--- a/tests/qemuxmlconfdata/serial-debugcon.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-debugcon.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 a4ef64b0e6..4f17962ad8 100644
--- a/tests/qemuxmlconfdata/serial-dev-chardev-iobase.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-dev-chardev-iobase.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/serial-dev-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-dev-chardev.x86_64-latest.args
index 4e0b5a20b5..f652d91ee4 100644
--- a/tests/qemuxmlconfdata/serial-dev-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-dev-chardev.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args
index 59021c4443..7d2eae029f 100644
--- a/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args b/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args
index 260fb2f37a..0a48c675ff 100644
--- a/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args
index 2841bbd3ba..4a15316669 100644
--- a/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/serial-pty-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-pty-chardev.x86_64-latest.args
index 8b128669d1..b49d6ed233 100644
--- a/tests/qemuxmlconfdata/serial-pty-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-pty-chardev.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/serial-spiceport.x86_64-latest.args b/tests/qemuxmlconfdata/serial-spiceport.x86_64-latest.args
index dbbe2e10e5..d1110f5ffd 100644
--- a/tests/qemuxmlconfdata/serial-spiceport.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-spiceport.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 4a4c23e178..64173810ea 100644
--- a/tests/qemuxmlconfdata/serial-target-port-auto.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-target-port-auto.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/serial-tcp-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-tcp-chardev.x86_64-latest.args
index 9f6a7e08e6..d06f18055e 100644
--- a/tests/qemuxmlconfdata/serial-tcp-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-tcp-chardev.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 6c0ef3ef8d..ac1af3a533 100644
--- a/tests/qemuxmlconfdata/serial-tcp-telnet-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-tcp-telnet-chardev.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 3a755c1aff..d46be03c01 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 f8f1bb8502..fa87b76d78 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 f8f1bb8502..fa87b76d78 100644
--- a/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 492d1be626..d127cc4ecf 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/serial-udp-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-udp-chardev.x86_64-latest.args
index 3592ef6b19..b36d4ddddf 100644
--- a/tests/qemuxmlconfdata/serial-udp-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-udp-chardev.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args
index 15bb205e36..a1e7e2e7b5 100644
--- a/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
 -chardev socket,id=charserial0,path=/tmp/serial.sock \
 -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
--chardev socket,id=charserial1,fd=1729,server=on,wait=off \
+-chardev socket,id=charserial1,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1","index":1}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
diff --git a/tests/qemuxmlconfdata/serial-vc-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-vc-chardev.x86_64-latest.args
index 50df7aa9bd..e5355f6040 100644
--- a/tests/qemuxmlconfdata/serial-vc-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-vc-chardev.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/sgx-epc.x86_64-latest+sgx.args b/tests/qemuxmlconfdata/sgx-epc.x86_64-latest+sgx.args
index e7cfb7dade..83acdc9d47 100644
--- a/tests/qemuxmlconfdata/sgx-epc.x86_64-latest+sgx.args
+++ b/tests/qemuxmlconfdata/sgx-epc.x86_64-latest+sgx.args
@@ -24,7 +24,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/shmem-plain-doorbell.x86_64-latest.args b/tests/qemuxmlconfdata/shmem-plain-doorbell.x86_64-latest.args
index 5894fa0e0c..c68e42d014 100644
--- a/tests/qemuxmlconfdata/shmem-plain-doorbell.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/shmem-plain-doorbell.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/smartcard-controller.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-controller.x86_64-latest.args
index 89406ff729..0959020464 100644
--- a/tests/qemuxmlconfdata/smartcard-controller.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smartcard-controller.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 47210c66fe..c4f04d5736 100644
--- a/tests/qemuxmlconfdata/smartcard-host-certificates-database.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smartcard-host-certificates-database.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/smartcard-host-certificates.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-host-certificates.x86_64-latest.args
index 49c58929bf..bd3a94aaf3 100644
--- a/tests/qemuxmlconfdata/smartcard-host-certificates.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smartcard-host-certificates.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/smartcard-host.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-host.x86_64-latest.args
index 89406ff729..0959020464 100644
--- a/tests/qemuxmlconfdata/smartcard-host.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smartcard-host.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/smartcard-passthrough-spicevmc.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-passthrough-spicevmc.x86_64-latest.args
index d776270688..2177b6f6cc 100644
--- a/tests/qemuxmlconfdata/smartcard-passthrough-spicevmc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smartcard-passthrough-spicevmc.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/smartcard-passthrough-tcp.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-passthrough-tcp.x86_64-latest.args
index 26bb0b9bbf..c495083dde 100644
--- a/tests/qemuxmlconfdata/smartcard-passthrough-tcp.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smartcard-passthrough-tcp.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args
index 737a96a4c1..62a3138a08 100644
--- a/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args
@@ -21,14 +21,14 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
 -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \
--chardev socket,id=charsmartcard0,fd=1729,server=on,wait=off \
+-chardev socket,id=charsmartcard0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"smartcard0","bus":"ccid0.0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
diff --git a/tests/qemuxmlconfdata/smbios-type-fwcfg.x86_64-latest.args b/tests/qemuxmlconfdata/smbios-type-fwcfg.x86_64-latest.args
index 41831fec53..85037b665e 100644
--- a/tests/qemuxmlconfdata/smbios-type-fwcfg.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smbios-type-fwcfg.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/smbios.x86_64-latest.args b/tests/qemuxmlconfdata/smbios.x86_64-latest.args
index 969e587683..eac754934f 100644
--- a/tests/qemuxmlconfdata/smbios.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smbios.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/sound-device-virtio.x86_64-latest.args b/tests/qemuxmlconfdata/sound-device-virtio.x86_64-latest.args
index cca0069c64..128e09de9f 100644
--- a/tests/qemuxmlconfdata/sound-device-virtio.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/sound-device-virtio.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/sound-device.x86_64-latest.args b/tests/qemuxmlconfdata/sound-device.x86_64-latest.args
index 9e40e9b680..adfd33395e 100644
--- a/tests/qemuxmlconfdata/sound-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/sound-device.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/sparc-minimal.sparc-latest.args b/tests/qemuxmlconfdata/sparc-minimal.sparc-latest.args
index 9d09b33003..f7c1aaef00 100644
--- a/tests/qemuxmlconfdata/sparc-minimal.sparc-latest.args
+++ b/tests/qemuxmlconfdata/sparc-minimal.sparc-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-redhat62sparc/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args b/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args
index d140b1e09d..eebc7071da 100644
--- a/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args b/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args
index 76a4b5c77b..8712ebd8f8 100644
--- a/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/throttlefilter.x86_64-latest.args b/tests/qemuxmlconfdata/throttlefilter.x86_64-latest.args
index 95914ef5ce..a49915f69d 100644
--- a/tests/qemuxmlconfdata/throttlefilter.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/throttlefilter.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 6dd97dfbe7..ab982e5ef3 100644
--- a/tests/qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 9ff9ac0db2..868c59fbb9 100644
--- a/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 9ff9ac0db2..868c59fbb9 100644
--- a/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args
index 9ff9ac0db2..868c59fbb9 100644
--- a/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args
index 9ff9ac0db2..868c59fbb9 100644
--- a/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args
index 5ddf21a4c7..c5b4198d38 100644
--- a/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args
index 319bf9579c..f9f6acff01 100644
--- a/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args
index 896b6c3040..cd92127ade 100644
--- a/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args b/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args
index 36ae1a984d..8e53f8388c 100644
--- a/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 e4be4266bb..a08dae37e7 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-i440fx.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-i440fx.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 cf8a176cd8..b39522b193 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-isapc.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-isapc.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 4aaf685a38..e5a1550c66 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-microvm.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-microvm.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-pseries.ppc64-latest.abi-update.args b/tests/qemuxmlconfdata/usb-controller-automatic-pseries.ppc64-latest.abi-update.args
index 3d8df5ff6f..d5664c5022 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-pseries.ppc64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-pseries.ppc64-latest.abi-update.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-pseries.ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-pseries.ppc64-latest.args
index 1859e1f5f9..4fbd72e76c 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-pseries.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-pseries.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 9a660060a9..108e66bb44 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-q35.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-realview.aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-realview.aarch64-latest.args
index ccbff79f35..41cd0da428 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-realview.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-realview.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-s390x.s390x-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-s390x.s390x-latest.args
index 77901f73fe..8811f2e78d 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-s390x.s390x-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-s390x.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 e883ce10cc..772fc92764 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-versatilepb.armv7l-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-versatilepb.armv7l-latest.args
index 88fe2b62e8..50f5ca6c94 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-versatilepb.armv7l-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-versatilepb.armv7l-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-virt-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-virt-aarch64.aarch64-latest.args
index 073131f2d2..b290e35d9a 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-virt-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-virt-aarch64.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-virt-loongarch64.loongarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-virt-loongarch64.loongarch64-latest.args
index cb73962813..1bfe5b55da 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-virt-loongarch64.loongarch64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-virt-loongarch64.loongarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-virt-riscv64.riscv64-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-virt-riscv64.riscv64-latest.args
index 5413ca8b57..dc4a3a4340 100644
--- a/tests/qemuxmlconfdata/usb-controller-automatic-virt-riscv64.riscv64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-automatic-virt-riscv64.riscv64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-g3beige.ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-g3beige.ppc64-latest.args
index 7b0fd85a77..f65cd92257 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-g3beige.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-g3beige.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99.ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99.ppc64-latest.args
index ba81f4e2ad..9187aa729c 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99ppc.ppc-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99ppc.ppc-latest.args
index da5437bc24..edafb1e693 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99ppc.ppc-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99ppc.ppc-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-powernv9.ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-powernv9.ppc64-latest.args
index 71528dee24..8706b4d8ce 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-powernv9.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-powernv9.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-realview.aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-realview.aarch64-latest.args
index 0d956241fc..fc0d8ca8aa 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-realview.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-realview.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb.armv7l-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb.armv7l-latest.args
index a05a413290..4e46702d1e 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb.armv7l-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb.armv7l-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-virt-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-virt-aarch64.aarch64-latest.args
index 746a28b6bc..1f509bb22e 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-virt-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-virt-aarch64.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-g3beige.ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-g3beige.ppc64-latest.args
index 7b0fd85a77..f65cd92257 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-g3beige.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-g3beige.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 e4be4266bb..a08dae37e7 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-mac99.ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-mac99.ppc64-latest.args
index ba81f4e2ad..9187aa729c 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-mac99.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-mac99.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.ppc-latest.args b/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.ppc-latest.args
index da5437bc24..edafb1e693 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.ppc-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.ppc-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-powernv9.ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-powernv9.ppc64-latest.args
index 71528dee24..8706b4d8ce 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-powernv9.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-powernv9.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.abi-update.args b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.abi-update.args
index 3d8df5ff6f..d5664c5022 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.abi-update.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.args
index 1859e1f5f9..4fbd72e76c 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 7ba7b39a87..29a8a8f251 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-q35.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-q35.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-latest.args
index ccbff79f35..41cd0da428 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-s390x.s390x-latest.args b/tests/qemuxmlconfdata/usb-controller-default-s390x.s390x-latest.args
index 77901f73fe..8811f2e78d 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-s390x.s390x-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-s390x.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-versatilepb.armv7l-latest.args b/tests/qemuxmlconfdata/usb-controller-default-versatilepb.armv7l-latest.args
index 88fe2b62e8..50f5ca6c94 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-versatilepb.armv7l-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-versatilepb.armv7l-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-virt-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-virt-aarch64.aarch64-latest.args
index 95bb398434..45813573d4 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-virt-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-virt-aarch64.aarch64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-virt-loongarch64.loongarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-virt-loongarch64.loongarch64-latest.args
index 04b70a2dba..1317443649 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-virt-loongarch64.loongarch64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-virt-loongarch64.loongarch64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-default-virt-riscv64.riscv64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-virt-riscv64.riscv64-latest.args
index a0f79e499e..2e20215293 100644
--- a/tests/qemuxmlconfdata/usb-controller-default-virt-riscv64.riscv64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-default-virt-riscv64.riscv64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 4a8ed73ef3..d6201c5380 100644
--- a/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 4225a3489c..9d8f457b1a 100644
--- a/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 2ac2bbe4aa..3090e9388f 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 14e62871ca..fc2bfd5144 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 5c6eed22d1..303a2f791f 100644
--- a/tests/qemuxmlconfdata/usb-controller-nec-xhci.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-nec-xhci.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.args
index e4be4266bb..a08dae37e7 100644
--- a/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 852574e17f..8f471e15b5 100644
--- a/tests/qemuxmlconfdata/usb-controller-qemu-xhci.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-controller-qemu-xhci.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 6c98dfc021..55d7d9e96c 100644
--- a/tests/qemuxmlconfdata/usb-hub-autoadd-deluxe.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-hub-autoadd-deluxe.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-hub-autoadd.x86_64-latest.args b/tests/qemuxmlconfdata/usb-hub-autoadd.x86_64-latest.args
index d8fc231f89..c388433db7 100644
--- a/tests/qemuxmlconfdata/usb-hub-autoadd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-hub-autoadd.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-hub.x86_64-latest.args b/tests/qemuxmlconfdata/usb-hub.x86_64-latest.args
index b01bbbe463..c8cb25adcb 100644
--- a/tests/qemuxmlconfdata/usb-hub.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-hub.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 6aeb776c8d..65450eeb87 100644
--- a/tests/qemuxmlconfdata/usb-long-port-path.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-long-port-path.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-none.x86_64-latest.args b/tests/qemuxmlconfdata/usb-none.x86_64-latest.args
index ba1e6d550f..9f1fc86dcd 100644
--- a/tests/qemuxmlconfdata/usb-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-none.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-port-autoassign.x86_64-latest.args b/tests/qemuxmlconfdata/usb-port-autoassign.x86_64-latest.args
index 8a8f747c1a..b2f1b19903 100644
--- a/tests/qemuxmlconfdata/usb-port-autoassign.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-port-autoassign.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-port-missing.x86_64-latest.args b/tests/qemuxmlconfdata/usb-port-missing.x86_64-latest.args
index 5f06d7a229..b81c3e6ae3 100644
--- a/tests/qemuxmlconfdata/usb-port-missing.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-port-missing.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-ports.x86_64-latest.args b/tests/qemuxmlconfdata/usb-ports.x86_64-latest.args
index c8ed29e53d..c42e3b825a 100644
--- a/tests/qemuxmlconfdata/usb-ports.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-ports.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-redir-boot.x86_64-latest.args b/tests/qemuxmlconfdata/usb-redir-boot.x86_64-latest.args
index edbd32dd09..34cf5b6658 100644
--- a/tests/qemuxmlconfdata/usb-redir-boot.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-redir-boot.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 c8af5e2caf..839db22f12 100644
--- a/tests/qemuxmlconfdata/usb-redir-filter-version.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-redir-filter-version.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-redir-filter.x86_64-latest.args b/tests/qemuxmlconfdata/usb-redir-filter.x86_64-latest.args
index 714a983c62..a811ca0e09 100644
--- a/tests/qemuxmlconfdata/usb-redir-filter.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-redir-filter.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args b/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args
index f01464521a..7bdcd30d90 100644
--- a/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -33,7 +33,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -chardev socket,id=charredir0,path=/tmp/connect.socket \
 -device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","bus":"usb.0","port":"1"}' \
--chardev socket,id=charredir1,fd=1729,server=on,wait=off \
+-chardev socket,id=charredir1,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bus":"usb.0","port":"2"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
diff --git a/tests/qemuxmlconfdata/usb-redir.x86_64-latest.args b/tests/qemuxmlconfdata/usb-redir.x86_64-latest.args
index 3fa6875a39..a9e7332d12 100644
--- a/tests/qemuxmlconfdata/usb-redir.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-redir.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/usb1-usb2.x86_64-latest.args b/tests/qemuxmlconfdata/usb1-usb2.x86_64-latest.args
index e112a90ad3..7f196528fc 100644
--- a/tests/qemuxmlconfdata/usb1-usb2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb1-usb2.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/user-aliases-usb.x86_64-latest.args b/tests/qemuxmlconfdata/user-aliases-usb.x86_64-latest.args
index 3da572e975..ffc95850fb 100644
--- a/tests/qemuxmlconfdata/user-aliases-usb.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/user-aliases-usb.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-gentoo/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args b/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args
index 03cbcab64a..3e0fe1ff0b 100644
--- a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-gentoo/.config \
 -uuid a75aca4b-a02f-2bcb-4a91-c93cd848c34b \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -60,7 +60,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-gentoo/.config \
 -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
 -chardev pty,id=charserial1 \
 -device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1","index":1}' \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -vnc 127.0.0.1:0,audiodev=audio1 \
diff --git a/tests/qemuxmlconfdata/user-aliases2.x86_64-latest.args b/tests/qemuxmlconfdata/user-aliases2.x86_64-latest.args
index 3c7c21c22f..139df16e0c 100644
--- a/tests/qemuxmlconfdata/user-aliases2.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/user-aliases2.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/vcpu-placement-static.x86_64-latest.args b/tests/qemuxmlconfdata/vcpu-placement-static.x86_64-latest.args
index dc188d45fc..239c7b494a 100644
--- a/tests/qemuxmlconfdata/vcpu-placement-static.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vcpu-placement-static.x86_64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-dummy2/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.args b/tests/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.args
index 72ca38c305..a38a0b1df5 100644
--- a/tests/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.args
+++ b/tests/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 d3c71544f8..967ae0a962 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
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 b4c2e3fe98..ac42fda09a 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
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 51fada2721..32a48fa840 100644
--- a/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.0.args b/tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.0.args
index ee8625dc0d..2702380e6a 100644
--- a/tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.0.args
+++ b/tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.0.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 d3c71544f8..967ae0a962 100644
--- a/tests/qemuxmlconfdata/vhost-user-fs-readonly.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-user-fs-readonly.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 dab40e524c..136da432dd 100644
--- a/tests/qemuxmlconfdata/vhost-user-fs-sock.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-user-fs-sock.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 ba03152c36..96f6e67aa8 100644
--- a/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -31,9 +31,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \
 -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-storage","id":"ide0-0-0","bootindex":1}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--chardev socket,id=chr-vu-video0,fd=1729 \
+-chardev socket,id=chr-vu-video0,fd=XXXXXXX \
 -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \
--chardev socket,id=chr-vu-video1,fd=1729 \
+-chardev socket,id=chr-vu-video1,fd=XXXXXXX \
 -device '{"driver":"vhost-user-gpu-pci","id":"video1","max_outputs":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x4"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
diff --git a/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args
index 69c4f5fa4c..4ddc6ad65c 100644
--- a/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -31,7 +31,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \
 -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-storage","id":"ide0-0-0","bootindex":1}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--chardev socket,id=chr-vu-video0,fd=1729 \
+-chardev socket,id=chr-vu-video0,fd=XXXXXXX \
 -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
diff --git a/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args
index f6a8536b43..d16eabdd90 100644
--- a/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args b/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args
index ed9714cec7..05b7f64523 100644
--- a/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args
+++ b/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args b/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args
index f7c7371648..ec0f06e2f4 100644
--- a/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args
+++ b/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args b/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args
index f56ba3b919..04c97134a4 100644
--- a/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args
+++ b/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args
index f800c6788c..fcc1b74bd0 100644
--- a/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 893d1448db..97921f0414 100644
--- a/tests/qemuxmlconfdata/video-bochs-display-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-bochs-display-device.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 c2ba47e6e7..da3dfcd166 100644
--- a/tests/qemuxmlconfdata/video-bochs-edid-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-bochs-edid-none.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 1b0835c59b..e4c5ac43e8 100644
--- a/tests/qemuxmlconfdata/video-bochs-edid-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-bochs-edid-off.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 522aab4b14..ff8e263b6d 100644
--- a/tests/qemuxmlconfdata/video-bochs-edid-on.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-bochs-edid-on.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 09583d06f2..ff124bf000 100644
--- a/tests/qemuxmlconfdata/video-device-pciaddr-default.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-device-pciaddr-default.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid cdbebdfa-1d6d-65c3-be0f-fd74b978a773 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/video-none-device.x86_64-latest.args b/tests/qemuxmlconfdata/video-none-device.x86_64-latest.args
index 10e8ae1880..94c269df53 100644
--- a/tests/qemuxmlconfdata/video-none-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-none-device.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 84b9f4f73e..8d1453ccba 100644
--- a/tests/qemuxmlconfdata/video-qxl-device-vgamem.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-qxl-device-vgamem.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 42a8197abe..635fe95fae 100644
--- a/tests/qemuxmlconfdata/video-qxl-device-vram64.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-qxl-device-vram64.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/video-qxl-device.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-device.x86_64-latest.args
index 84b9f4f73e..8d1453ccba 100644
--- a/tests/qemuxmlconfdata/video-qxl-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-qxl-device.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/video-qxl-heads.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-heads.x86_64-latest.args
index e3319f3c48..87887998ac 100644
--- a/tests/qemuxmlconfdata/video-qxl-heads.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-qxl-heads.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/video-qxl-noheads.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-noheads.x86_64-latest.args
index 41aa82250f..c00f4452e2 100644
--- a/tests/qemuxmlconfdata/video-qxl-noheads.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-qxl-noheads.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/video-qxl-resolution.x86_64-latest.args b/tests/qemuxmlconfdata/video-qxl-resolution.x86_64-latest.args
index 721ef8dc0b..5a61a41593 100644
--- a/tests/qemuxmlconfdata/video-qxl-resolution.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-qxl-resolution.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 8040756044..7385968638 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 34f88d4cc5..80ad486061 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 8040756044..7385968638 100644
--- a/tests/qemuxmlconfdata/video-qxl-sec-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-qxl-sec-device.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 0a52f9dc08..cfbbd5c921 100644
--- a/tests/qemuxmlconfdata/video-ramfb-display-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-ramfb-display-device.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 f5bc6a1dcf..400b39104b 100644
--- a/tests/qemuxmlconfdata/video-vga-device-vgamem.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-vga-device-vgamem.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/video-vga-device.x86_64-latest.args b/tests/qemuxmlconfdata/video-vga-device.x86_64-latest.args
index f5bc6a1dcf..400b39104b 100644
--- a/tests/qemuxmlconfdata/video-vga-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-vga-device.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 0720c75549..29487e9e50 100644
--- a/tests/qemuxmlconfdata/video-vga-edid-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-vga-edid-none.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 b8af7d4af7..f3481bae44 100644
--- a/tests/qemuxmlconfdata/video-vga-edid-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-vga-edid-off.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 7c4145688c..4fb0d7477b 100644
--- a/tests/qemuxmlconfdata/video-vga-edid-on.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-vga-edid-on.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 e3319f3c48..87887998ac 100644
--- a/tests/qemuxmlconfdata/video-vga-qxl-heads.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-vga-qxl-heads.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 837d5055c1..daeb7c64dc 100644
--- a/tests/qemuxmlconfdata/video-virtio-blob-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-blob-off.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 172bd372e1..a9cea4fb41 100644
--- a/tests/qemuxmlconfdata/video-virtio-blob-on.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-blob-on.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 b0f4ec660b..05a522bd13 100644
--- a/tests/qemuxmlconfdata/video-virtio-edid-none.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-edid-none.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 c63978111b..576803a41f 100644
--- a/tests/qemuxmlconfdata/video-virtio-edid-off.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-edid-off.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 fba5ffc1c1..e7bd9401be 100644
--- a/tests/qemuxmlconfdata/video-virtio-edid-on.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-edid-on.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.args b/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.args
index 935aa07144..90d8866923 100644
--- a/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1803 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.args b/tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.args
index 1da8f0ab68..e35052d8e2 100644
--- a/tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1803 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 fec2b04ca9..74b64b3c91 100644
--- a/tests/qemuxmlconfdata/video-virtio-gpu-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-gpu-device.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 9ab281a94d..1acbc159f1 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
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 68aabbec28..67c9c4fcbb 100644
--- a/tests/qemuxmlconfdata/video-virtio-gpu-secondary.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-gpu-secondary.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 7a2a85f863..5224433d91 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
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 5cd1b7998b..d7e683a734 100644
--- a/tests/qemuxmlconfdata/video-virtio-gpu-virgl.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-gpu-virgl.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 e4ecf34124..d9096cfc1b 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.args b/tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.args
index fec2b04ca9..74b64b3c91 100644
--- a/tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/virtio-9p-createmode.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-9p-createmode.x86_64-latest.args
index 8bc391a4fe..c9499b2098 100644
--- a/tests/qemuxmlconfdata/virtio-9p-createmode.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-9p-createmode.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/virtio-9p-multidevs.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-9p-multidevs.x86_64-latest.args
index 31b51f30c8..2c3584a99e 100644
--- a/tests/qemuxmlconfdata/virtio-9p-multidevs.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-9p-multidevs.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/virtio-input-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-input-passthrough.x86_64-latest.args
index 31f434b150..04c8a29191 100644
--- a/tests/qemuxmlconfdata/virtio-input-passthrough.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-input-passthrough.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/virtio-input.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-input.x86_64-latest.args
index 20439c7de1..02afdf6506 100644
--- a/tests/qemuxmlconfdata/virtio-input.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-input.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.args b/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.args
index 3c9cc0e9d1..42f65d7805 100644
--- a/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.args
@@ -23,7 +23,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 0d49128149..7706aa3905 100644
--- a/tests/qemuxmlconfdata/virtio-iommu-x86_64.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-iommu-x86_64.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/virtio-lun.x86_64-9.0.0.args b/tests/qemuxmlconfdata/virtio-lun.x86_64-9.0.0.args
index b95698f58d..318669d956 100644
--- a/tests/qemuxmlconfdata/virtio-lun.x86_64-9.0.0.args
+++ b/tests/qemuxmlconfdata/virtio-lun.x86_64-9.0.0.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args
index b529c798db..955390e23b 100644
--- a/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 a5ed1cbb41..1723c24d04 100644
--- a/tests/qemuxmlconfdata/virtio-options-controller-ats.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-controller-ats.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 4193dc043d..a55ff345a3 100644
--- a/tests/qemuxmlconfdata/virtio-options-controller-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-controller-iommu.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 069e1179b4..644283b585 100644
--- a/tests/qemuxmlconfdata/virtio-options-controller-packed.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-controller-packed.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 a165eab675..58750eb659 100644
--- a/tests/qemuxmlconfdata/virtio-options-disk-ats.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-disk-ats.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 8714d6ef42..42eace3f23 100644
--- a/tests/qemuxmlconfdata/virtio-options-disk-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-disk-iommu.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 f84b9c2433..ac6e4badaa 100644
--- a/tests/qemuxmlconfdata/virtio-options-disk-packed.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-disk-packed.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 2c88713004..eb9d3b0fdb 100644
--- a/tests/qemuxmlconfdata/virtio-options-fs-ats.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-fs-ats.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 f94345baec..6d43517b23 100644
--- a/tests/qemuxmlconfdata/virtio-options-fs-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-fs-iommu.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 708d2ea207..11e366d2b0 100644
--- a/tests/qemuxmlconfdata/virtio-options-fs-packed.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-fs-packed.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 fe93032cb2..93a7219ac1 100644
--- a/tests/qemuxmlconfdata/virtio-options-input-ats.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-input-ats.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 cdad9633d6..c41bad1d36 100644
--- a/tests/qemuxmlconfdata/virtio-options-input-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-input-iommu.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 80e290f77e..83b6d4dd8a 100644
--- a/tests/qemuxmlconfdata/virtio-options-input-packed.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-input-packed.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 7805be0666..23fad7b10e 100644
--- a/tests/qemuxmlconfdata/virtio-options-memballoon-ats.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-memballoon-ats.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 1921441359..3506eff224 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 82fadcfc19..b1e3b366f5 100644
--- a/tests/qemuxmlconfdata/virtio-options-memballoon-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-memballoon-iommu.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 1eadfdb9ab..61ca7f73a9 100644
--- a/tests/qemuxmlconfdata/virtio-options-memballoon-packed.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-memballoon-packed.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 0c27d4b9b7..65cc6f259e 100644
--- a/tests/qemuxmlconfdata/virtio-options-net-ats.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-net-ats.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 de8862357e..efd2c923ad 100644
--- a/tests/qemuxmlconfdata/virtio-options-net-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-net-iommu.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 3d1270a180..38f5c91de9 100644
--- a/tests/qemuxmlconfdata/virtio-options-net-packed.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-net-packed.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 bb9f95c150..f6b71bca40 100644
--- a/tests/qemuxmlconfdata/virtio-options-rng-ats.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-rng-ats.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 ea4d2cb533..d594c67210 100644
--- a/tests/qemuxmlconfdata/virtio-options-rng-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-rng-iommu.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 f18355db9d..5aa1fb79b1 100644
--- a/tests/qemuxmlconfdata/virtio-options-rng-packed.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-rng-packed.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 a6ac54961a..3b6e9e43af 100644
--- a/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.args
@@ -21,16 +21,16 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--chardev socket,id=chr-vu-video0,fd=1729 \
+-chardev socket,id=chr-vu-video0,fd=XXXXXXX \
 -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \
--chardev socket,id=chr-vu-video1,fd=1729 \
+-chardev socket,id=chr-vu-video1,fd=XXXXXXX \
 -device '{"driver":"vhost-user-gpu-pci","ats":false,"id":"video1","max_outputs":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x3"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
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 f515669f17..c37c260a7c 100644
--- a/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.args
@@ -21,16 +21,16 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--chardev socket,id=chr-vu-video0,fd=1729 \
+-chardev socket,id=chr-vu-video0,fd=XXXXXXX \
 -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \
--chardev socket,id=chr-vu-video1,fd=1729 \
+-chardev socket,id=chr-vu-video1,fd=XXXXXXX \
 -device '{"driver":"vhost-user-gpu-pci","iommu_platform":false,"id":"video1","max_outputs":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x3"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
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 f0eefd1a5f..9ef03eaa0f 100644
--- a/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.args
@@ -21,16 +21,16 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--chardev socket,id=chr-vu-video0,fd=1729 \
+-chardev socket,id=chr-vu-video0,fd=XXXXXXX \
 -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \
--chardev socket,id=chr-vu-video1,fd=1729 \
+-chardev socket,id=chr-vu-video1,fd=XXXXXXX \
 -device '{"driver":"vhost-user-gpu-pci","packed":false,"id":"video1","max_outputs":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x3"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
diff --git a/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args
index 0f65cefd57..4cb38ae04f 100644
--- a/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args
@@ -22,7 +22,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -45,7 +45,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"virtio-tablet-pci","iommu_platform":true,"ats":true,"packed":true,"page-per-vq":true,"id":"input2","bus":"pci.0","addr":"0x11"}' \
 -device '{"driver":"virtio-input-host-pci","iommu_platform":true,"ats":true,"packed":true,"page-per-vq":true,"id":"input3","evdev":"/dev/input/event1234","bus":"pci.0","addr":"0x12"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--chardev socket,id=chr-vu-video0,fd=1729 \
+-chardev socket,id=chr-vu-video0,fd=XXXXXXX \
 -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \
 -device '{"driver":"virtio-balloon-pci","iommu_platform":true,"ats":true,"packed":true,"page-per-vq":true,"id":"balloon0","bus":"pci.0","addr":"0xc"}' \
 -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}' \
diff --git a/tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-latest.args
index 2126b014d8..83d1fa30be 100644
--- a/tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/virtio-rng-ccw.s390x-latest.args b/tests/qemuxmlconfdata/virtio-rng-ccw.s390x-latest.args
index fe120c9b9c..5e1892510b 100644
--- a/tests/qemuxmlconfdata/virtio-rng-ccw.s390x-latest.args
+++ b/tests/qemuxmlconfdata/virtio-rng-ccw.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/virtio-rng-default.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-rng-default.x86_64-latest.args
index 48e845fec0..8f0ca84d04 100644
--- a/tests/qemuxmlconfdata/virtio-rng-default.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-rng-default.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 94823c8a69..c90f2161bf 100644
--- a/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
@@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
--chardev socket,id=charrng0,fd=1729,server=on,wait=off \
+-chardev socket,id=charrng0,fd=XXXXXXX,server=on,wait=off \
 -object '{"qom-type":"rng-egd","id":"objrng0","chardev":"charrng0"}' \
 -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci.0","addr":"0x3"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
diff --git a/tests/qemuxmlconfdata/virtio-rng-egd.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-rng-egd.x86_64-latest.args
index 5e2f9c928d..a570b2a865 100644
--- a/tests/qemuxmlconfdata/virtio-rng-egd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-rng-egd.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/virtio-rng-multiple.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-rng-multiple.x86_64-latest.args
index 4eae536074..1b884c93d2 100644
--- a/tests/qemuxmlconfdata/virtio-rng-multiple.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-rng-multiple.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/virtio-rng-random.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-rng-random.x86_64-latest.args
index 252730c85b..76463ca9d5 100644
--- a/tests/qemuxmlconfdata/virtio-rng-random.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-rng-random.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args
index c92eb58f61..e54eea6164 100644
--- a/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/vmcoreinfo.x86_64-latest.args b/tests/qemuxmlconfdata/vmcoreinfo.x86_64-latest.args
index 35aaa0d401..ec60e9764c 100644
--- a/tests/qemuxmlconfdata/vmcoreinfo.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vmcoreinfo.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/watchdog-device.x86_64-latest.args b/tests/qemuxmlconfdata/watchdog-device.x86_64-latest.args
index f4e34880be..9854a4f64f 100644
--- a/tests/qemuxmlconfdata/watchdog-device.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/watchdog-device.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/watchdog-diag288.s390x-latest.args b/tests/qemuxmlconfdata/watchdog-diag288.s390x-latest.args
index f4f9ec15fb..465ec4aa8c 100644
--- a/tests/qemuxmlconfdata/watchdog-diag288.s390x-latest.args
+++ b/tests/qemuxmlconfdata/watchdog-diag288.s390x-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/watchdog-dump.x86_64-latest.args b/tests/qemuxmlconfdata/watchdog-dump.x86_64-latest.args
index c97d6c87b4..f010299994 100644
--- a/tests/qemuxmlconfdata/watchdog-dump.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/watchdog-dump.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/watchdog-injectnmi.x86_64-latest.args b/tests/qemuxmlconfdata/watchdog-injectnmi.x86_64-latest.args
index bf757d8369..56329a57c9 100644
--- a/tests/qemuxmlconfdata/watchdog-injectnmi.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/watchdog-injectnmi.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/watchdog-q35-multiple.x86_64-latest.args b/tests/qemuxmlconfdata/watchdog-q35-multiple.x86_64-latest.args
index b790bb1f76..fe45a52e60 100644
--- a/tests/qemuxmlconfdata/watchdog-q35-multiple.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/watchdog-q35-multiple.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconfdata/watchdog.x86_64-latest.args b/tests/qemuxmlconfdata/watchdog.x86_64-latest.args
index b64d5454ac..d53cb5b4eb 100644
--- a/tests/qemuxmlconfdata/watchdog.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/watchdog.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 2bd5e8bde6..5cbcc96cea 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-kvm/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 eb3d834a6c..86670453d6 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 c82cf98fd2..5a723d870a 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 14a3fbc6b4..8166955cfa 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 a8fb64384c..d998826d94 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 33981e6dd0..be243e911f 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 6563b05937..06a0622f98 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 6563b05937..06a0622f98 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 45f33f6f31..2e564abb3e 100644
--- a/tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -uuid 2c0abd3d-8f18-42c0-a132-9708213aaac9 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
@@ -37,7 +37,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:4c:e3:86","bus":"pci.0","addr":"0x3"}' \
 -chardev pty,id=charserial0 \
 -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
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 7ed7d8d19d..648a693721 100644
--- a/tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
@@ -38,7 +38,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.0","addr":"0x2"}' \
 -chardev pty,id=charserial0 \
 -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}' \
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 606fd70519..9147e03d05 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 606fd70519..9147e03d05 100644
--- a/tests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 29ea0bedac..79e4fe78ee 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 29ea0bedac..79e4fe78ee 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 419714b6d1..2fb82f684d 100644
--- a/tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args
@@ -20,7 +20,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -uuid 61288c03-0b0d-4f1e-9496-0f0256f2e013 \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
@@ -44,7 +44,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:d2:70:0b","bus":"pci.1","addr":"0x0"}' \
 -chardev pty,id=charserial0 \
 -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
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 1c7b94726d..a2ef934627 100644
--- a/tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc,driftfix=slew \
 -global kvm-pit.lost_tick_policy=delay \
@@ -45,7 +45,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \
 -chardev pty,id=charserial0 \
 -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -global ICH9-LPC.noreboot=off \
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 9566106b94..3003a120ca 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
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
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 9566106b94..3003a120ca 100644
--- a/tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.args
@@ -21,7 +21,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
 -display none \
 -no-user-config \
 -nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \
 -mon chardev=charmonitor,id=monitor,mode=control \
 -rtc base=utc \
 -no-shutdown \
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 6f5852657c..653cdb4012 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -524,9 +524,17 @@ testCompareXMLToArgvStabilizeArgs(virCommand *cmd,
         if (a + 1 >= nargs)
             break;

-        if (STREQ(args[a], "-add-fd")) {
+        if (STREQ(args[a], "-add-fd") ||
+            STREQ(args[a], "-chardev")) {
             testCompareXMLToArgvStabilizeOne(&args[a + 1], "fd", fdsubsts, false);

+            /* qemuxmlconftest also tests the JSON syntax which isn't supported via
+             * -chardev upstream. The syntax is weird so we need to make sure to
+             *  apply the substitution only on JSON with -chardev */
+            if (STREQ(args[a], "-chardev") && STRPREFIX(args[a + 1], "{")) {
+                testCompareXMLToArgvStabilizeOne(&args[a + 1], "str", fdsubsts, true);
+            }
+
             a++;
         }
     }
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index e7a61d0c6f..7c0c975261 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -1037,6 +1037,8 @@ testQemuPrepareHostBackendChardevOne(virDomainDeviceDef *dev,
             return 0;
     } else {
         devalias = "monitor";
+        fakesourcefd = 1764;
+        virTestDummyFDContextMarkFD(fakesourcefd, g_strdup("@mon-fd@"));
     }

     switch ((virDomainChrType) chardev->type) {
@@ -1067,7 +1069,8 @@ testQemuPrepareHostBackendChardevOne(virDomainDeviceDef *dev,
     case VIR_DOMAIN_CHR_TYPE_UNIX:
         if (chardev->data.nix.listen) {
             g_autofree char *name = g_strdup_printf("%s-source", devalias);
-            fakesourcefd = 1729;
+            if (fakesourcefd == -1)
+                fakesourcefd = 1729;

             charpriv->directfd = qemuFDPassDirectNew(name, &fakesourcefd);
         }
-- 
2.54.0

    