qemumonitorjsontest: Stabilize FD names in '-chardev'

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>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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"}' \

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"}' \

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"}' \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \