testQemuPrepareHostBackendChardevOne: Use real FDs for all cases

Use the virTestMakeDummyFD() function to setup real FDs for all chardev
backends which are set up via testQemuPrepareHostBackendChardevOne.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args
index 504f401021f79fd3192d276f78e2c316da612413..58f924055a7beb4b8122df567c6e53636dedee5b 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \
 -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \
 -device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x0"}' \
 -device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x1"}' \
--add-fd set=0,fd=XXXXXXX,opaque=serial0-log \
+-add-fd set=0,fd=@serial0-log-fd@,opaque=serial0-log \
 -chardev pty,id=charserial0,logfile=/dev/fdset/0,logappend=on \
 -device '{"driver":"pci-serial","chardev":"charserial0","id":"serial0","bus":"pci.2","addr":"0x1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \

diff --git a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args
index b987772672fe710f21abd9853761bb4890b3065e..3954c5f203ebd5472a312251aec48b886469898a 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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 aa5ee67f34f782c16370696ae09305b4a37159cd..319a34619f7313e97381a7c898c65dc3daa76687 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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 8d046cb2b8d715c74bebd8b0d5203efcd9cb2787..9ee3449d6daa9f1f09f7609424191f406573b95a 100644 (file)
--- a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args
+++ b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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/channel-unix-guestfwd.x86_64-latest.args b/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args
index 5c631f35eaef2f8de26258765a6b2e980c269a13..5487c78b6befa2af87f360018435f8c71f06ac92 100644 (file)
--- a/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-shutdown \
 -boot strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
--chardev socket,id=charchannel0,fd=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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 c6247fbad13fad3c9f55e87d08154731b1bb7dba..6ec74a85043c751b04e67fed7fc80a7e0fa55884 100644 (file)
--- a/tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.args
@@ -28,25 +28,25 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel1,fd=@channel1-fd@,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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel2,fd=@channel2-fd@,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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel3,fd=@channel3-fd@,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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel4,fd=@channel4-fd@,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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel5,fd=@channel5-fd@,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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel6,fd=@channel6-fd@,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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel7,fd=@channel7-fd@,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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel8,fd=@channel8-fd@,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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel9,fd=@channel9-fd@,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-unix.x86_64-latest.args b/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args
index 70d4e0cfc531fdd7662ae437b1b5e5dbcebbe272..aa8255d135ec2f1e4fac416c69f26f40e99015b5 100644 (file)
--- a/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel1,fd=@channel1-fd@,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel1","id":"channel1"}' \
--chardev socket,id=charchannel2,fd=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel2,fd=@channel2-fd@,server=on,wait=off \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chardev":"charchannel2","id":"channel2","name":"ble"}' \
--chardev socket,id=charchannel3,fd=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel3,fd=@channel3-fd@,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/chardev-backends-json.x86_64-9.1.0.args b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args
index ea08a0b651f96d54e9d27d6de8ac7f5cb2aeaf6c..fd1c94f8ed57bbc4d2aeb0df3ca1b8c3cf69cdd3 100644 (file)
--- a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args
+++ b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args
@@ -29,24 +29,24 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x3"}' \
 -chardev '{"id":"charparallel0","backend":{"type":"parallel","data":{"device":"/dev/parport0"}}}' \
 -device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel0"}' \
--add-fd set=0,fd=XXXXXXX,opaque=channel0-log \
+-add-fd set=0,fd=@channel0-log-fd@,opaque=channel0-log \
 -chardev '{"id":"charchannel0","backend":{"type":"null","data":{"logfile":"/dev/fdset/0","logappend":true}}}' \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"chardev-null"}' \
--add-fd set=1,fd=XXXXXXX,opaque=channel1-log \
+-add-fd set=1,fd=@channel1-log-fd@,opaque=channel1-log \
 -chardev '{"id":"charchannel1","backend":{"type":"vc","data":{"logfile":"/dev/fdset/1","logappend":true}}}' \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel1","id":"channel1","name":"chardev-vc"}' \
 -chardev '{"id":"charchannel2","backend":{"type":"pty","data":{}}}' \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chardev":"charchannel2","id":"channel2","name":"chardev-pty"}' \
 -chardev '{"id":"charchannel3","backend":{"type":"stdio","data":{}}}' \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chardev":"charchannel3","id":"channel3","name":"chardev-stdio"}' \
--add-fd set=2,fd=XXXXXXX,opaque=channel4-source \
+-add-fd set=2,fd=@channel4-fd@,opaque=channel4-source \
 -chardev '{"id":"charchannel4","backend":{"type":"file","data":{"out":"/dev/fdset/2","append":true}}}' \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":5,"chardev":"charchannel4","id":"channel4","name":"chardev-file"}' \
 -chardev '{"id":"charchannel5","backend":{"type":"pipe","data":{"device":"/path/to/pipe"}}}' \
 -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":"XXXXXXX"}},"server":true,"wait":false}}}' \
+-chardev '{"id":"charchannel7","backend":{"type":"socket","data":{"addr":{"type":"fd","data":{"str":"@channel7-fd@"}},"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 b52e836f1fba94e12d919b26ab1d59db40caeb91..7e5540ff0996870c77be1aae098f4ba6bb22e98d 100644 (file)
--- a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args
@@ -29,24 +29,24 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x3"}' \
 -chardev '{"id":"charparallel0","backend":{"type":"parallel","data":{"device":"/dev/parport0"}}}' \
 -device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel0"}' \
--add-fd set=0,fd=XXXXXXX,opaque=channel0-log \
+-add-fd set=0,fd=@channel0-log-fd@,opaque=channel0-log \
 -chardev '{"id":"charchannel0","backend":{"type":"null","data":{"logfile":"/dev/fdset/0","logappend":true}}}' \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"chardev-null"}' \
--add-fd set=1,fd=XXXXXXX,opaque=channel1-log \
+-add-fd set=1,fd=@channel1-log-fd@,opaque=channel1-log \
 -chardev '{"id":"charchannel1","backend":{"type":"vc","data":{"logfile":"/dev/fdset/1","logappend":true}}}' \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel1","id":"channel1","name":"chardev-vc"}' \
 -chardev '{"id":"charchannel2","backend":{"type":"pty","data":{}}}' \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chardev":"charchannel2","id":"channel2","name":"chardev-pty"}' \
 -chardev '{"id":"charchannel3","backend":{"type":"stdio","data":{}}}' \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chardev":"charchannel3","id":"channel3","name":"chardev-stdio"}' \
--add-fd set=2,fd=XXXXXXX,opaque=channel4-source \
+-add-fd set=2,fd=@channel4-fd@,opaque=channel4-source \
 -chardev '{"id":"charchannel4","backend":{"type":"file","data":{"out":"/dev/fdset/2","append":true}}}' \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":5,"chardev":"charchannel4","id":"channel4","name":"chardev-file"}' \
 -chardev '{"id":"charchannel5","backend":{"type":"pipe","data":{"device":"/path/to/pipe"}}}' \
 -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":"XXXXXXX"}},"server":true,"wait":false}}}' \
+-chardev '{"id":"charchannel7","backend":{"type":"socket","data":{"addr":{"type":"fd","data":{"str":"@channel7-fd@"}},"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 578fbc5d96a71c82457ccedea9540985c0aa5c3d..3a3128eb3e23d70a5f5466d7f46452bbd031dd2f 100644 (file)
--- a/tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args
+++ b/tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args
@@ -29,24 +29,24 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x3"}' \
 -chardev parallel,id=charparallel0,path=/dev/parport0 \
 -device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel0"}' \
--add-fd set=0,fd=XXXXXXX,opaque=channel0-log \
+-add-fd set=0,fd=@channel0-log-fd@,opaque=channel0-log \
 -chardev null,id=charchannel0,logfile=/dev/fdset/0,logappend=on \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"chardev-null"}' \
--add-fd set=1,fd=XXXXXXX,opaque=channel1-log \
+-add-fd set=1,fd=@channel1-log-fd@,opaque=channel1-log \
 -chardev vc,id=charchannel1,logfile=/dev/fdset/1,logappend=on \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel1","id":"channel1","name":"chardev-vc"}' \
 -chardev pty,id=charchannel2 \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chardev":"charchannel2","id":"channel2","name":"chardev-pty"}' \
 -chardev stdio,id=charchannel3 \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chardev":"charchannel3","id":"channel3","name":"chardev-stdio"}' \
--add-fd set=2,fd=XXXXXXX,opaque=channel4-source \
+-add-fd set=2,fd=@channel4-fd@,opaque=channel4-source \
 -chardev file,id=charchannel4,path=/dev/fdset/2,append=on \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":5,"chardev":"charchannel4","id":"channel4","name":"chardev-file"}' \
 -chardev pipe,id=charchannel5,path=/path/to/pipe \
 -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel7,fd=@channel7-fd@,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 61ec4fac664636fccad436cab02d7211599c8abb..68357c42f1af1fdeccab3e0a21f80be70aa10698 100644 (file)
--- a/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args
@@ -29,24 +29,24 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x3"}' \
 -chardev parallel,id=charparallel0,path=/dev/parport0 \
 -device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel0"}' \
--add-fd set=0,fd=XXXXXXX,opaque=channel0-log \
+-add-fd set=0,fd=@channel0-log-fd@,opaque=channel0-log \
 -chardev null,id=charchannel0,logfile=/dev/fdset/0,logappend=on \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"chardev-null"}' \
--add-fd set=1,fd=XXXXXXX,opaque=channel1-log \
+-add-fd set=1,fd=@channel1-log-fd@,opaque=channel1-log \
 -chardev vc,id=charchannel1,logfile=/dev/fdset/1,logappend=on \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chardev":"charchannel1","id":"channel1","name":"chardev-vc"}' \
 -chardev pty,id=charchannel2 \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chardev":"charchannel2","id":"channel2","name":"chardev-pty"}' \
 -chardev stdio,id=charchannel3 \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chardev":"charchannel3","id":"channel3","name":"chardev-stdio"}' \
--add-fd set=2,fd=XXXXXXX,opaque=channel4-source \
+-add-fd set=2,fd=@channel4-fd@,opaque=channel4-source \
 -chardev file,id=charchannel4,path=/dev/fdset/2,append=on \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":5,"chardev":"charchannel4","id":"channel4","name":"chardev-file"}' \
 -chardev pipe,id=charchannel5,path=/path/to/pipe \
 -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel7,fd=@channel7-fd@,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 2c721abf3b01c60bfc547663836aa6436ce2d498..1ceef015873eabcccc2def5d06cc08e198c9ebfe 100644 (file)
--- a/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-machine/.config \
 -no-shutdown \
 -boot strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
--add-fd set=0,fd=XXXXXXX,opaque=serial0-source \
+-add-fd set=0,fd=@serial0-fd@,opaque=serial0-source \
 -chardev file,id=charserial0,path=/dev/fdset/0,append=on \
 -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
 -chardev socket,id=charserial1,path=/tmp/serial.sock \

diff --git a/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args b/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args
index 9925ad4230f055e309f263b854e26288fb7f412d..69d93383f8c9b6e657e39062817742f6ce1ffa1a 100644 (file)
--- a/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charconsole0,fd=@console0-fd@,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/hvf-aarch64-virt-headless.aarch64-latest+hvf.args b/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+hvf.args
index c428a00e64f1bd0d4e13308ffe70207d11464da4..e0cb3ea6ed584cf93b15958e138773960b4e23e9 100644 (file)
--- a/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+hvf.args
+++ b/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+hvf.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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 6cd5b380bd785ab2b0d70b1ea3959e3b3c6be473..b36258359e4c7e6a87c4c2315d478c9ff7e22600 100644 (file)
--- 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
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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/loongarch64-virt-graphics.loongarch64-latest.args b/tests/qemuxmlconfdata/loongarch64-virt-graphics.loongarch64-latest.args
index 5105a1d1d3517f749a2ccb1d5434cd50a823a0a2..2c1b89e269c2061fcb871a4e5eaa884b2cab5a56 100644 (file)
--- a/tests/qemuxmlconfdata/loongarch64-virt-graphics.loongarch64-latest.args
+++ b/tests/qemuxmlconfdata/loongarch64-virt-graphics.loongarch64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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 3265b7f5617b5c74bd513d256021fd898f0e0c7c..e7eeec351186bedcefa2a65c1c319d5c9fbe1302 100644 (file)
--- a/tests/qemuxmlconfdata/loongarch64-virt-headless.loongarch64-latest.args
+++ b/tests/qemuxmlconfdata/loongarch64-virt-headless.loongarch64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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/name-escape.x86_64-latest.args b/tests/qemuxmlconfdata/name-escape.x86_64-latest.args
index 5d0db75717590e1c663c9bc7c1c4e138ddf601a5..072afcfb5b638c758561ca6d2dcafb3e2338df7a 100644 (file)
--- a/tests/qemuxmlconfdata/name-escape.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/name-escape.x86_64-latest.args
@@ -34,7 +34,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo=1,bar=2/.config \
 -device '{"driver":"ccid-card-emulated","backend":"certificates","cert1":"cert1,foo","cert2":"cert2","cert3":"cert3","db":"/etc/pki/nssdb,foo","id":"smartcard0","bus":"ccid0.0"}' \
 -chardev serial,id=charserial0,path=/dev/ttyS2,,foo \
 -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":1}' \
--add-fd set=0,fd=XXXXXXX,opaque=serial1-source \
+-add-fd set=0,fd=@serial1-fd@,opaque=serial1-source \
 -chardev file,id=charserial1,path=/dev/fdset/0,append=on \
 -device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1","index":0}' \
 -chardev pipe,id=charchannel0,path=/tmp/guestfwd,,foo \

diff --git a/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args
index 260e0cc4b585836bb54b9ed30134edb18747df90..719b2cc06250d8c6c635ef68bb248fcb5d62302f 100644 (file)
--- a/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -no-shutdown \
 -boot strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
--chardev socket,id=charparallel0,fd=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charparallel0,fd=@parallel0-fd@,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/ppc64-pseries-graphics.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.args
index 47c0fc440eec1b519a8125d067301eaca9fde9b6..a13b86853e3b06e57e30ddf9898e9df7060ee56b 100644 (file)
--- a/tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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 8c716796470238b6866e804204c43dc17788365a..d2b1381b73da0a32bc3f11eb8ec5843038a66db1 100644 (file)
--- a/tests/qemuxmlconfdata/ppc64-pseries-headless.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/ppc64-pseries-headless.ppc64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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/q35-virt-manager-basic.x86_64-latest.args b/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.args
index 82736207ecc20b035aeb1b6d7a6f7e9c8c56ce53..b476bfe761cdfe4a0cfece6a2b1a90f45b7c75a9 100644 (file)
--- a/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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/riscv64-virt-graphics.riscv64-latest.args b/tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.args
index 3e5d16975df07c03373395993556a1bf39abbfa8..fbe3d5914ce681f120f9d2d2753a598d73fe7dd4 100644 (file)
--- a/tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.args
+++ b/tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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 1bcbdb2f25f55e00ed0742203738d8ba354f5b6a..70a1e298c1952fbc7f2e2926d5d41efd555be604 100644 (file)
--- a/tests/qemuxmlconfdata/riscv64-virt-headless-mmio.riscv64-latest.args
+++ b/tests/qemuxmlconfdata/riscv64-virt-headless-mmio.riscv64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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 be63cfa3df2819fbbee6a460f197fc33b727ade6..e90e2a768f7ec5b5b9c624c5cf3792548791e940 100644 (file)
--- a/tests/qemuxmlconfdata/riscv64-virt-headless.riscv64-latest.args
+++ b/tests/qemuxmlconfdata/riscv64-virt-headless.riscv64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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/s390x-ccw-graphics.s390x-latest.args b/tests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.args
index 25a3e89e475bb3fa819a6c3f722f17f079df1707..0b69ee8e88b11a9782b899cd30ec59b37dc1f991 100644 (file)
--- a/tests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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 b0a9e6cc1c986f2009b08f89e4b74be61378b65a..0975b76b70bc81fc8de683ed302955071ee60a15 100644 (file)
--- a/tests/qemuxmlconfdata/s390x-ccw-headless.s390x-latest.args
+++ b/tests/qemuxmlconfdata/s390x-ccw-headless.s390x-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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/serial-file-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args
index 7d2eae029f312ef402aa641523daab0f0d2d8545..b59e693928b46d3e0e4dea81c020c9c2ac33085b 100644 (file)
--- a/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args
@@ -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"}' \
 -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}' \
--add-fd set=0,fd=XXXXXXX,opaque=serial0-source \
+-add-fd set=0,fd=@serial0-fd@,opaque=serial0-source \
 -chardev file,id=charserial0,path=/dev/fdset/0,append=on \
 -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
 -audiodev '{"id":"audio1","driver":"none"}' \

diff --git a/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args b/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args
index 0a48c675ffd334927f97706a6f861f5d48886321..17a1eeb0988d3adbc7a3e4dc63db7977e7deed6a 100644 (file)
--- a/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args
@@ -29,8 +29,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
 -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}' \
--add-fd set=0,fd=XXXXXXX,opaque=serial0-source \
--add-fd set=1,fd=XXXXXXX,opaque=serial0-log \
+-add-fd set=0,fd=@serial0-fd@,opaque=serial0-source \
+-add-fd set=1,fd=@serial0-log-fd@,opaque=serial0-log \
 -chardev file,id=charserial0,path=/dev/fdset/0,append=on,logfile=/dev/fdset/1,logappend=on \
 -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
 -audiodev '{"id":"audio1","driver":"none"}' \

diff --git a/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args
index 4a153166694c394d5f7ccfbce81b90d833ccf394..59a8f2369b025c3aa8120a184daafbbe448aff97 100644 (file)
--- a/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args
@@ -31,7 +31,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-storage","id":"ide0-0-0","bootindex":1}' \
 -chardev pty,id=charserial0 \
 -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
--add-fd set=0,fd=XXXXXXX,opaque=serial1-source \
+-add-fd set=0,fd=@serial1-fd@,opaque=serial1-source \
 -chardev file,id=charserial1,path=/dev/fdset/0,append=on \
 -device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1","index":1}' \
 -audiodev '{"id":"audio1","driver":"none"}' \

diff --git a/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args b/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args
index a1e7e2e7b5255531aeefbafdba99a4cf15a7d1d3..abb68a8d49a67ac012230a44131d457005d70284 100644 (file)
--- a/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charserial1,fd=@serial1-fd@,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/smartcard-passthrough-unix.x86_64-latest.args b/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args
index 62a3138a087cd6375e1e3ce6fc326280d60d832b..ca1fd472c3e1d9f0e7635cd1c072918886d7301d 100644 (file)
--- a/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args
@@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charsmartcard0,fd=@smartcard0-fd@,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/usb-redir-unix.x86_64-latest.args b/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args
index 7bdcd30d904242ecb9a8609cc6518f18c716847c..9be7acf12ed90637925d3c428d98a8bae7f1935b 100644 (file)
--- a/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charredir1,fd=@redir1-fd@,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/user-aliases.x86_64-latest.args b/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args
index d978f2d7a8e057a749cf3418e855a0b50a9877d4..f5ca356773c47f59f8efe9f4fa2b4a7678a0278a 100644 (file)
--- a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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/virtio-rng-egd-unix.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args
index c90f2161bf0749a7c32f6cf844e069aab2a359f4..ca4685b733b0d5d4322ba6b209b330152018cd55 100644 (file)
--- a/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charrng0,fd=@rng0-fd@,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/x86_64-pc-graphics.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args
index 2e564abb3eda5dd03bd1ccfb00d968a2860ef4ed..1815c86f40a1417fe87e4bcf7ff12774600c4285 100644 (file)
--- a/tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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 648a693721c823e335856e25b2176600fe0e72f3..3cae322027be183e0d3bda31679f243379c9af33 100644 (file)
--- a/tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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-q35-graphics.x86_64-latest.args b/tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args
index 2fb82f684dc89c98a780a5df78bf7f2af99bbed3..360d4628a0fdfd85f23a6982d1e86902f3b46aea 100644 (file)
--- a/tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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 a2ef9346271490a8a67fc444c4cd48df4b9bb407..96f98a12a25733d7b40813447b8047d16b9fc21e 100644 (file)
--- a/tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.args
@@ -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=XXXXXXX,server=on,wait=off \
+-chardev socket,id=charchannel0,fd=@channel0-fd@,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/testutilsqemu.c b/tests/testutilsqemu.c
index 81dff17cc9c84a2ee52dad6214f1a7ae72f0d932..202cef28f90733c5beac810013deff66dbaebdb5 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -1043,20 +1043,18 @@ testQemuPrepareHostBackendChardevOne(virDomainDeviceDef *dev,
         break;
 
     case VIR_DOMAIN_CHR_TYPE_FILE:
-        fakesourcefd = 1750;
-
-        if (fcntl(fakesourcefd, F_GETFD) != -1)
-            abort();
-
         charpriv->sourcefd = qemuFDPassNew(devalias, priv);
+        if (fakesourcefd == -1)
+            fakesourcefd = virTestMakeDummyFD(g_strdup_printf("@%s-fd@", devalias));
         qemuFDPassAddFD(charpriv->sourcefd, &fakesourcefd, "-source");
         break;
 
     case VIR_DOMAIN_CHR_TYPE_UNIX:
         if (chardev->data.nix.listen) {
             g_autofree char *name = g_strdup_printf("%s-source", devalias);
+
             if (fakesourcefd == -1)
-                fakesourcefd = 1729;
+                fakesourcefd = virTestMakeDummyFD(g_strdup_printf("@%s-fd@", devalias));
 
             charpriv->directfd = qemuFDPassDirectNew(name, &fakesourcefd);
         }
@@ -1069,13 +1067,9 @@ testQemuPrepareHostBackendChardevOne(virDomainDeviceDef *dev,
     }
 
     if (chardev->logfile) {
-        int fd = 1751;
-
-        if (fcntl(fd, F_GETFD) != -1)
-            abort();
+        int fd = virTestMakeDummyFD(g_strdup_printf("@%s-log-fd@", devalias));
 
         charpriv->logfd = qemuFDPassNew(devalias, priv);
-
         qemuFDPassAddFD(charpriv->logfd, &fd, "-log");
     }