From: Peter Krempa <[email protected]> Use the virTestMakeDummyFD() function to setup real FDs for all chardev backends which are set up via testQemuPrepareHostBackendChardevOne.
Signed-off-by: Peter Krempa <[email protected]> --- .../aarch64-pci-serial.aarch64-latest.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 2 +- ...h64-virt-headless-mmio.aarch64-latest.args | 2 +- .../aarch64-virt-headless.aarch64-latest.args | 2 +- .../channel-unix-guestfwd.x86_64-latest.args | 2 +- ...hannel-unix-source-path.x86_64-latest.args | 20 +++++++++---------- .../channel-virtio-unix.x86_64-latest.args | 8 ++++---- .../chardev-backends-json.x86_64-9.1.0.args | 8 ++++---- .../chardev-backends-json.x86_64-latest.args | 8 ++++---- .../chardev-backends.x86_64-9.1.0.args | 8 ++++---- .../chardev-backends.x86_64-latest.args | 8 ++++---- .../chardev-label.x86_64-latest.args | 2 +- .../console-virtio-unix.x86_64-latest.args | 2 +- ...ch64-virt-headless.aarch64-latest+hvf.args | 2 +- ...x86_64-q35-headless.x86_64-latest+hvf.args | 2 +- ...ch64-virt-graphics.loongarch64-latest.args | 2 +- ...ch64-virt-headless.loongarch64-latest.args | 2 +- .../name-escape.x86_64-latest.args | 2 +- .../parallel-unix-chardev.x86_64-latest.args | 2 +- .../ppc64-pseries-graphics.ppc64-latest.args | 2 +- .../ppc64-pseries-headless.ppc64-latest.args | 2 +- .../q35-virt-manager-basic.x86_64-latest.args | 2 +- .../riscv64-virt-graphics.riscv64-latest.args | 2 +- ...v64-virt-headless-mmio.riscv64-latest.args | 2 +- .../riscv64-virt-headless.riscv64-latest.args | 2 +- .../s390x-ccw-graphics.s390x-latest.args | 2 +- .../s390x-ccw-headless.s390x-latest.args | 2 +- .../serial-file-chardev.x86_64-latest.args | 2 +- .../serial-file-log.x86_64-latest.args | 4 ++-- .../serial-many-chardev.x86_64-latest.args | 2 +- .../serial-unix-chardev.x86_64-latest.args | 2 +- ...rtcard-passthrough-unix.x86_64-latest.args | 2 +- .../usb-redir-unix.x86_64-latest.args | 2 +- .../user-aliases.x86_64-latest.args | 2 +- .../virtio-rng-egd-unix.x86_64-latest.args | 2 +- .../x86_64-pc-graphics.x86_64-latest.args | 2 +- .../x86_64-pc-headless.x86_64-latest.args | 2 +- .../x86_64-q35-graphics.x86_64-latest.args | 2 +- .../x86_64-q35-headless.x86_64-latest.args | 2 +- tests/testutilsqemu.c | 16 +++++---------- 40 files changed, 69 insertions(+), 75 deletions(-) diff --git a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args b/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args index 504f401021..58f924055a 100644 --- 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 b987772672..3954c5f203 100644 --- 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 aa5ee67f34..319a34619f 100644 --- 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 8d046cb2b8..9ee3449d6d 100644 --- 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 5c631f35ea..5487c78b6b 100644 --- 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 c6247fbad1..6ec74a8504 100644 --- 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 70d4e0cfc5..aa8255d135 100644 --- 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 ea08a0b651..fd1c94f8ed 100644 --- a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args +++ b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args @@ -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 b52e836f1f..7e5540ff09 100644 --- 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 578fbc5d96..3a3128eb3e 100644 --- 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 61ec4fac66..68357c42f1 100644 --- 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 2c721abf3b..1ceef01587 100644 --- 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 9925ad4230..69d93383f8 100644 --- 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 c428a00e64..e0cb3ea6ed 100644 --- 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 6cd5b380bd..b36258359e 100644 --- a/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest+hvf.args +++ b/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest+hvf.args @@ -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 5105a1d1d3..2c1b89e269 100644 --- 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 3265b7f561..e7eeec3511 100644 --- 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 5d0db75717..072afcfb5b 100644 --- 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 260e0cc4b5..719b2cc062 100644 --- 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 47c0fc440e..a13b86853e 100644 --- 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 8c71679647..d2b1381b73 100644 --- 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 82736207ec..b476bfe761 100644 --- 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 3e5d16975d..fbe3d5914c 100644 --- 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 1bcbdb2f25..70a1e298c1 100644 --- 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 be63cfa3df..e90e2a768f 100644 --- 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 25a3e89e47..0b69ee8e88 100644 --- 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 b0a9e6cc1c..0975b76b70 100644 --- 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 7d2eae029f..b59e693928 100644 --- 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 0a48c675ff..17a1eeb098 100644 --- 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 4a15316669..59a8f2369b 100644 --- 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 a1e7e2e7b5..abb68a8d49 100644 --- 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 62a3138a08..ca1fd472c3 100644 --- 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 7bdcd30d90..9be7acf12e 100644 --- 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 d978f2d7a8..f5ca356773 100644 --- 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 c90f2161bf..ca4685b733 100644 --- 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 2e564abb3e..1815c86f40 100644 --- 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 648a693721..3cae322027 100644 --- 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 2fb82f684d..360d4628a0 100644 --- 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 a2ef934627..96f98a12a2 100644 --- 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 81dff17cc9..202cef28f9 100644 --- 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"); } -- 2.54.0
