From: Peter Krempa Date: Thu, 25 Aug 2022 14:41:23 +0000 (+0200) Subject: qemuxml2*test: Remove 'q35-virtio-pci' test case X-Git-Tag: v8.8.0-rc1~116 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=517ca3c46a25db6779235b0f103429eb8c539330;p=thirdparty%2Flibvirt.git qemuxml2*test: Remove 'q35-virtio-pci' test case As noted by the comments the only difference was the qemu capabilities asserted. Now that we use only real caps for this test case it makes no sense to have two copies. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.x86_64-4.2.0.args b/tests/qemuxml2argvdata/q35-virtio-pci.x86_64-4.2.0.args deleted file mode 100644 index 15daab14b7..0000000000 --- a/tests/qemuxml2argvdata/q35-virtio-pci.x86_64-4.2.0.args +++ /dev/null @@ -1,66 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/tmp/lib/domain--1-q35-test \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \ -XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \ -XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=q35-test,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-q35-test/master-key.aes \ --machine pc-q35-4.2,usb=off,dump-guest-core=off \ --accel tcg \ --cpu qemu64 \ --m 2048 \ --overcommit mem-lock=off \ --smp 2,sockets=2,cores=1,threads=1 \ --uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ --device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \ --device pcie-root-port,port=16,chassis=3,id=pci.3,bus=pcie.0,multifunction=on,addr=0x2 \ --device pcie-root-port,port=17,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x1 \ --device pcie-root-port,port=18,chassis=5,id=pci.5,bus=pcie.0,addr=0x2.0x2 \ --device pcie-root-port,port=19,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x3 \ --device pcie-root-port,port=20,chassis=7,id=pci.7,bus=pcie.0,addr=0x2.0x4 \ --device pcie-root-port,port=21,chassis=8,id=pci.8,bus=pcie.0,addr=0x2.0x5 \ --device pcie-root-port,port=22,chassis=9,id=pci.9,bus=pcie.0,addr=0x2.0x6 \ --device pcie-root-port,port=23,chassis=10,id=pci.10,bus=pcie.0,addr=0x2.0x7 \ --device pcie-root-port,port=24,chassis=11,id=pci.11,bus=pcie.0,multifunction=on,addr=0x3 \ --device pcie-root-port,port=25,chassis=12,id=pci.12,bus=pcie.0,addr=0x3.0x1 \ --device pcie-root-port,port=26,chassis=13,id=pci.13,bus=pcie.0,addr=0x3.0x2 \ --device pcie-root-port,port=27,chassis=14,id=pci.14,bus=pcie.0,addr=0x3.0x3 \ --device pcie-root-port,port=28,chassis=15,id=pci.15,bus=pcie.0,addr=0x3.0x4 \ --device nec-usb-xhci,id=usb,bus=pci.8,addr=0x0 \ --device virtio-scsi-pci,id=scsi0,bus=pci.7,addr=0x0 \ --device virtio-serial-pci,id=virtio-serial0,bus=pci.6,addr=0x0 \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=off,bus=pci.9,addr=0x0,drive=libvirt-1-format,id=virtio-disk1,bootindex=1 \ --fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \ --device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,bus=pci.3,addr=0x0 \ --netdev user,id=hostnet0 \ --device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.4,addr=0x0 \ --netdev user,id=hostnet1 \ --device e1000e,netdev=hostnet1,id=net1,mac=00:11:22:33:44:66,bus=pci.5,addr=0x0 \ --device virtio-input-host-pci,id=input0,evdev=/dev/input/event1234,bus=pci.12,addr=0x0 \ --device virtio-mouse-pci,id=input1,bus=pci.13,addr=0x0 \ --device virtio-keyboard-pci,id=input2,bus=pci.14,addr=0x0 \ --device virtio-tablet-pci,id=input3,bus=pci.15,addr=0x0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-vga,id=video0,max_outputs=1,bus=pcie.0,addr=0x1 \ --device virtio-balloon-pci,id=balloon0,bus=pci.10,addr=0x0 \ --object rng-random,id=objrng0,filename=/dev/urandom \ --device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,bus=pci.11,addr=0x0 \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.x86_64-latest.args b/tests/qemuxml2argvdata/q35-virtio-pci.x86_64-latest.args deleted file mode 100644 index 4a84c2e621..0000000000 --- a/tests/qemuxml2argvdata/q35-virtio-pci.x86_64-latest.args +++ /dev/null @@ -1,67 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/tmp/lib/domain--1-q35-test \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \ -XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \ -XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=q35-test,debug-threads=on \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-q35-test/master-key.aes"}' \ --machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ --accel tcg \ --cpu qemu64 \ --m 2048 \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":2147483648}' \ --overcommit mem-lock=off \ --smp 2,sockets=2,cores=1,threads=1 \ --uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot strict=on \ --device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"0x1e"}' \ --device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1","addr":"0x0"}' \ --device '{"driver":"pcie-root-port","port":16,"chassis":3,"id":"pci.3","bus":"pcie.0","multifunction":true,"addr":"0x2"}' \ --device '{"driver":"pcie-root-port","port":17,"chassis":4,"id":"pci.4","bus":"pcie.0","addr":"0x2.0x1"}' \ --device '{"driver":"pcie-root-port","port":18,"chassis":5,"id":"pci.5","bus":"pcie.0","addr":"0x2.0x2"}' \ --device '{"driver":"pcie-root-port","port":19,"chassis":6,"id":"pci.6","bus":"pcie.0","addr":"0x2.0x3"}' \ --device '{"driver":"pcie-root-port","port":20,"chassis":7,"id":"pci.7","bus":"pcie.0","addr":"0x2.0x4"}' \ --device '{"driver":"pcie-root-port","port":21,"chassis":8,"id":"pci.8","bus":"pcie.0","addr":"0x2.0x5"}' \ --device '{"driver":"pcie-root-port","port":22,"chassis":9,"id":"pci.9","bus":"pcie.0","addr":"0x2.0x6"}' \ --device '{"driver":"pcie-root-port","port":23,"chassis":10,"id":"pci.10","bus":"pcie.0","addr":"0x2.0x7"}' \ --device '{"driver":"pcie-root-port","port":24,"chassis":11,"id":"pci.11","bus":"pcie.0","multifunction":true,"addr":"0x3"}' \ --device '{"driver":"pcie-root-port","port":25,"chassis":12,"id":"pci.12","bus":"pcie.0","addr":"0x3.0x1"}' \ --device '{"driver":"pcie-root-port","port":26,"chassis":13,"id":"pci.13","bus":"pcie.0","addr":"0x3.0x2"}' \ --device '{"driver":"pcie-root-port","port":27,"chassis":14,"id":"pci.14","bus":"pcie.0","addr":"0x3.0x3"}' \ --device '{"driver":"pcie-root-port","port":28,"chassis":15,"id":"pci.15","bus":"pcie.0","addr":"0x3.0x4"}' \ --device '{"driver":"nec-usb-xhci","id":"usb","bus":"pci.8","addr":"0x0"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.7","addr":"0x0"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.6","addr":"0x0"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.9","addr":"0x0","drive":"libvirt-1-format","id":"virtio-disk1","bootindex":1}' \ --fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \ --device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_tag":"/import/from/host","bus":"pci.3","addr":"0x0"}' \ --netdev user,id=hostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.4","addr":"0x0"}' \ --netdev user,id=hostnet1 \ --device '{"driver":"e1000e","netdev":"hostnet1","id":"net1","mac":"00:11:22:33:44:66","bus":"pci.5","addr":"0x0"}' \ --device '{"driver":"virtio-input-host-pci","id":"input0","evdev":"/dev/input/event1234","bus":"pci.12","addr":"0x0"}' \ --device '{"driver":"virtio-mouse-pci","id":"input1","bus":"pci.13","addr":"0x0"}' \ --device '{"driver":"virtio-keyboard-pci","id":"input2","bus":"pci.14","addr":"0x0"}' \ --device '{"driver":"virtio-tablet-pci","id":"input3","bus":"pci.15","addr":"0x0"}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-vga","id":"video0","max_outputs":1,"bus":"pcie.0","addr":"0x1"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.10","addr":"0x0"}' \ --object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"}' \ --device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","max-bytes":123,"period":1234,"bus":"pci.11","addr":"0x0"}' \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.xml b/tests/qemuxml2argvdata/q35-virtio-pci.xml deleted file mode 120000 index 42e49a5403..0000000000 --- a/tests/qemuxml2argvdata/q35-virtio-pci.xml +++ /dev/null @@ -1 +0,0 @@ -q35-pcie.xml \ No newline at end of file diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1af8b84f25..cfe241e5a7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2565,13 +2565,6 @@ mymain(void) /* verify that devices with pcie capability are assigned to a pcie slot */ DO_TEST_CAPS_VER("q35-pcie", "4.2.0"); DO_TEST_CAPS_LATEST("q35-pcie"); - /* same XML as q35-pcie, but don't set - * QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, so virtio devices should - * be assigned to legacy pci slots. This doesn't apply to the 'real' caps - * tests as such configuration is not present in real life. - */ - DO_TEST_CAPS_VER("q35-virtio-pci", "4.2.0"); - DO_TEST_CAPS_LATEST("q35-virtio-pci"); /* same as q35-pcie, but all PCI controllers are added automatically */ DO_TEST_CAPS_VER("q35-pcie-autoadd", "4.2.0"); DO_TEST_CAPS_LATEST("q35-pcie-autoadd"); diff --git a/tests/qemuxml2xmloutdata/q35-virtio-pci.xml b/tests/qemuxml2xmloutdata/q35-virtio-pci.xml deleted file mode 100644 index d0f7bdb486..0000000000 --- a/tests/qemuxml2xmloutdata/q35-virtio-pci.xml +++ /dev/null @@ -1,154 +0,0 @@ - - q35-test - 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 - 2097152 - 2097152 - 2 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - - - -
- - -
- - -
- - -
- - -
- - - - -
- - - - -
- - - - -
- - - -
- - -
- - -
- - -
- - - -