From: Peter Krempa <pkrempa@redhat.com> Use 'testCompareXMLToArgvStabilizeOne' to provide stable test outputs even when we'll switch to real FDs in tests. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxmlconfdata/downscript.x86_64-latest.args | 2 +- .../graphics-spice-timeout.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args | 2 +- .../qemuxmlconfdata/net-bandwidth2.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args | 6 +++--- .../qemuxmlconfdata/net-eth-hostip.x86_64-latest.args | 2 +- .../qemuxmlconfdata/net-eth-ifname.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args | 4 ++-- .../net-eth-unmanaged-tap.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-eth.x86_64-latest.args | 2 +- .../net-isolated-port.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-midonet.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-mtu.x86_64-latest.args | 4 ++-- .../qemuxmlconfdata/net-openvswitch.x86_64-latest.args | 2 +- .../net-virtio-network-portgroup.x86_64-latest.args | 6 +++--- .../net-virtio-teaming-network.x86_64-latest.args | 2 +- .../net-virtio-vhost.x86_64-latest.args | 6 +++--- .../tap-vhost-incorrect.x86_64-latest.args | 4 ++-- tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/user-aliases.x86_64-latest.args | 2 +- tests/qemuxmlconftest.c | 10 ++++++++++ 21 files changed, 39 insertions(+), 29 deletions(-) diff --git a/tests/qemuxmlconfdata/downscript.x86_64-latest.args b/tests/qemuxmlconfdata/downscript.x86_64-latest.args index af29ca9aa1..d0054089b6 100644 --- a/tests/qemuxmlconfdata/downscript.x86_64-latest.args +++ b/tests/qemuxmlconfdata/downscript.x86_64-latest.args @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_tag":"fs1","bus":"pci.0","addr":"0x3"}' \ -fsdev local,security_model=mapped,id=fsdev-fs1,path=/export/fs2 \ -device '{"driver":"virtio-9p-pci","id":"fs1","fsdev":"fsdev-fs1","mount_tag":"fs2","bus":"pci.0","addr":"0x4"}' \ --netdev '{"type":"tap","fd":"2900","vhost":true,"vhostfd":"2200","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:f6:66:88","bus":"pci.0","addr":"0xb"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0xc"}' \ diff --git a/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args b/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args index 1ff9a0f46d..cd5c91f9c4 100644 --- a/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-f14/.config \ -boot menu=on,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":"0x6"}' \ --netdev '{"type":"tap","fd":"2900","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:71:70:89","bus":"pci.0","addr":"0x7"}' \ -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ diff --git a/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args b/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args index 44bf06ee28..210ae98d3c 100644 --- a/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-f14-60/.config \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/home/zippy/tmp/Fedora-14-x86_64-Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-storage","id":"ide0-1-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"2800","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:24:a5:9f","bus":"pci.0","addr":"0x7"}' \ -chardev pty,id=charserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \ diff --git a/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args b/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args index a3731cab99..573c24ba17 100644 --- a/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-f14-60/.config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14-6.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":2}' \ --netdev '{"type":"tap","fd":"2800","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:24:a5:9f","bus":"pci.0","addr":"0x7"}' \ -chardev pty,id=charserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \ diff --git a/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args b/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args index ac93af6891..9c061e4e6f 100644 --- a/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args @@ -33,11 +33,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":"0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-storage","id":"ide0-1-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":"52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hostnet2"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id":"hostnet2"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet2","id":"net2","mac":"52:54:00:e5:48:60","bus":"pci.0","addr":"0x5"}' \ -chardev pty,id=charserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \ diff --git a/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args index d5a8b6a107..6a9b53ca52 100644 --- a/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-hostip.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}' \ --netdev '{"type":"tap","fd":"2900","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args index d5a8b6a107..6a9b53ca52 100644 --- a/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-ifname.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}' \ --netdev '{"type":"tap","fd":"2900","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args index 09313dcbd6..70845d070a 100644 --- a/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args @@ -29,9 +29,9 @@ 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}' \ --netdev '{"type":"tap","fd":"2900","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"2900","id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet1"}' \ -device '{"driver":"e1000","netdev":"hostnet1","id":"net1","mac":"00:11:22:33:44:56","bus":"pci.0","addr":"0x3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x4"}' \ diff --git a/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args index 5190a79647..2c441611ca 100644 --- a/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-unmanaged-tap.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}' \ --netdev '{"type":"tap","fd":"2900","vhost":true,"vhostfd":"2200","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"fe:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxmlconfdata/net-eth.x86_64-latest.args b/tests/qemuxmlconfdata/net-eth.x86_64-latest.args index d5a8b6a107..6a9b53ca52 100644 --- a/tests/qemuxmlconfdata/net-eth.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth.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}' \ --netdev '{"type":"tap","fd":"2900","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args b/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args index ae4ac627e4..20f83c0f16 100644 --- a/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-q35-test/.config \ -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.2","addr":"0x0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-storage","id":"sata0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:d6:c0:0b","bus":"pci.1","addr":"0x0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":67108864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","addr":"0x1"}' \ diff --git a/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args b/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args index 0f5a84c3ba..f5bac0b91c 100644 --- a/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-midonet.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}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ diff --git a/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args b/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args index c8f189d6e8..ce88e8b1ba 100644 --- a/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args @@ -33,9 +33,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":"0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-storage","id":"ide0-1-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","host_mtu":1500,"netdev":"hostnet0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","sndbuf":1600,"id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","sndbuf":1600,"id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","host_mtu":9000,"netdev":"hostnet1","id":"net1","mac":"52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ -chardev pty,id=charserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \ diff --git a/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args b/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args index 6d134dcf80..31cc8cbbf3 100644 --- a/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-openvswitch.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}' \ --netdev '{"type":"tap","fd":"2800","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \ diff --git a/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args index a604512bf5..c01bc60976 100644 --- a/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args @@ -29,11 +29,11 @@ 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}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"2800","id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet1"}' \ -device '{"driver":"rtl8139","netdev":"hostnet1","id":"net1","mac":"10:11:22:33:44:55","bus":"pci.0","addr":"0x3"}' \ --netdev '{"type":"tap","fd":"2800","id":"hostnet2"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet2"}' \ -device '{"driver":"rtl8139","netdev":"hostnet2","id":"net2","mac":"22:11:22:33:44:55","bus":"pci.0","addr":"0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x5"}' \ diff --git a/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args index d639218629..2c2c219ba4 100644 --- a/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-teaming-network.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}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hostua-backup0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id":"hostua-backup0"}' \ -device '{"driver":"virtio-net-pci","failover":true,"netdev":"hostua-backup0","id":"ua-backup0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0000:06:12.2","id":"hostdev0","failover_pair_id":"ua-backup0","bus":"pci.0","addr":"0x3"}' \ diff --git a/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args b/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args index fae2efe381..c77cbd2a71 100644 --- a/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args @@ -28,11 +28,11 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -boot menu=on,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":"0x6"}' \ --netdev '{"type":"tap","fds":"2900:2901:2902:2903:2904","vhost":true,"vhostfds":"2200:2201:2202:2203:2204","id":"hostnet0"}' \ +-netdev '{"type":"tap","fds":"XXXXXXX","vhost":true,"vhostfds":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","mq":true,"vectors":12,"netdev":"hostnet0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"2900","vhost":true,"vhostfd":"2200","id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","ioeventfd":true,"netdev":"hostnet1","id":"net1","mac":"52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ --netdev '{"type":"tap","fds":"2900:2901:2902:2903:2904","vhost":true,"vhostfds":"2200:2201:2202:2203:2204","id":"hostnet2"}' \ +-netdev '{"type":"tap","fds":"XXXXXXX","vhost":true,"vhostfds":"XXXXXXX","id":"hostnet2"}' \ -device '{"driver":"virtio-net-pci","ioeventfd":true,"mq":true,"vectors":12,"netdev":"hostnet2","id":"net2","mac":"52:54:00:e5:48:5a","bus":"pci.0","addr":"0x4"}' \ -chardev pty,id=charserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \ diff --git a/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args b/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args index eebc7071da..9e0df73d75 100644 --- a/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args @@ -28,9 +28,9 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -boot menu=on,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":"0x6"}' \ --netdev '{"type":"tap","fd":"2800","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"e1000","netdev":"hostnet0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":"52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ -chardev pty,id=charserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \ diff --git a/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args b/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args index 8712ebd8f8..f66842a89d 100644 --- a/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \ -device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":"0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-storage","id":"ide0-1-0","bootindex":1}' \ --netdev '{"type":"tap","fds":"2800:2801:2802:2803:2804","vhost":true,"vhostfds":"2200:2201:2202:2203:2204","id":"hostnet0"}' \ +-netdev '{"type":"tap","fds":"XXXXXXX","vhost":true,"vhostfds":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","mq":true,"vectors":12,"netdev":"hostnet0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ -chardev pty,id=charserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \ diff --git a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args b/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args index 3e0fe1ff0b..d978f2d7a8 100644 --- a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args +++ b/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args @@ -49,7 +49,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-gentoo/.config \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"libvirt-2-format","id":"ua-myEncryptedDisk1"}' \ -blockdev '{"driver":"file","filename":"/home/zippy/tmp/install-amd64-minimal-20140619.iso","node-name":"libvirt-1-storage","read-only":true,"cache":{"direct":true,"no-flush":false}}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"share-rw":true,"drive":"libvirt-1-storage","id":"ua-WhatAnAwesomeCDROM","bootindex":2,"write-cache":"on"}' \ --netdev '{"type":"tap","fd":"2900","vhost":true,"vhostfd":"2200","id":"hostua-CheckoutThisNIC"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id":"hostua-CheckoutThisNIC"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostua-CheckoutThisNIC","id":"ua-CheckoutThisNIC","mac":"52:54:00:d6:c0:0b","bus":"pci.0","addr":"0x3"}' \ -netdev '{"type":"socket","listen":"127.0.0.1:1234","id":"hostua-WeCanAlsoDoServerMode"}' \ -device '{"driver":"rtl8139","netdev":"hostua-WeCanAlsoDoServerMode","id":"ua-WeCanAlsoDoServerMode","mac":"52:54:00:22:c9:42","bus":"pci.0","addr":"0x9"}' \ diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index a6f2a3a19e..0b0bcdea92 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -542,6 +542,16 @@ testCompareXMLToArgvStabilizeArgs(virCommand *cmd, testCompareXMLToArgvStabilizeOne(&args[a + 1], "vhostfd", fdsubsts, false); } + a++; + } else if (STREQ(args[a], "-netdev")) { + /* Stabiilize both the singular and plural forms. For the plural + * forms we don't bother splitting the colon separated lists into + * individual FDs so they will stay censored */ + testCompareXMLToArgvStabilizeOne(&args[a + 1], "fd", fdsubsts, false); + testCompareXMLToArgvStabilizeOne(&args[a + 1], "fds", fdsubsts, false); + testCompareXMLToArgvStabilizeOne(&args[a + 1], "vhostfd", fdsubsts, false); + testCompareXMLToArgvStabilizeOne(&args[a + 1], "vhostfds", fdsubsts, false); + a++; } } -- 2.54.0