mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-27 19:11:16 +00:00
Add tests for USB address assignment
Introduce tests with the ich9, xhci and the default (piix3) usb controller to demonstrate the effect of the next patch.
This commit is contained in:
parent
ddd31fd7dc
commit
69f5ce45ab
32
tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-autoassign.args
Normal file
32
tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-autoassign.args
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
LC_ALL=C \
|
||||||
|
PATH=/bin \
|
||||||
|
HOME=/home/test \
|
||||||
|
USER=test \
|
||||||
|
LOGNAME=test \
|
||||||
|
QEMU_AUDIO_DRV=none \
|
||||||
|
/usr/bin/qemu \
|
||||||
|
-name QEMUGuest1 \
|
||||||
|
-S \
|
||||||
|
-M pc \
|
||||||
|
-m 214 \
|
||||||
|
-smp 1,sockets=1,cores=1,threads=1 \
|
||||||
|
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
|
||||||
|
-nographic \
|
||||||
|
-nodefconfig \
|
||||||
|
-nodefaults \
|
||||||
|
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
|
||||||
|
server,nowait \
|
||||||
|
-mon chardev=charmonitor,id=monitor,mode=readline \
|
||||||
|
-no-acpi \
|
||||||
|
-boot c \
|
||||||
|
-device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x4.0x7 \
|
||||||
|
-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,\
|
||||||
|
addr=0x4 \
|
||||||
|
-device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
|
||||||
|
-device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
|
||||||
|
-device usb-hub,id=hub0 \
|
||||||
|
-device usb-hub,id=hub1 \
|
||||||
|
-device usb-mouse,id=input0 \
|
||||||
|
-device usb-mouse,id=input1 \
|
||||||
|
-device usb-mouse,id=input2 \
|
||||||
|
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
|
39
tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-autoassign.xml
Normal file
39
tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-autoassign.xml
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
<domain type='qemu'>
|
||||||
|
<name>QEMUGuest1</name>
|
||||||
|
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
||||||
|
<memory unit='KiB'>219136</memory>
|
||||||
|
<currentMemory unit='KiB'>219136</currentMemory>
|
||||||
|
<vcpu placement='static'>1</vcpu>
|
||||||
|
<os>
|
||||||
|
<type arch='i686' machine='pc'>hvm</type>
|
||||||
|
<boot dev='hd'/>
|
||||||
|
</os>
|
||||||
|
<devices>
|
||||||
|
<emulator>/usr/bin/qemu</emulator>
|
||||||
|
<controller type='usb' index='0' model='ich9-ehci1'>
|
||||||
|
<address type='pci' domain='0' bus='0' slot='4' function='7'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='usb' index='0' model='ich9-uhci1'>
|
||||||
|
<master startport='0'/>
|
||||||
|
<address type='pci' domain='0' bus='0' slot='4' function='0' multifunction='on'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='usb' index='0' model='ich9-uhci2'>
|
||||||
|
<master startport='2'/>
|
||||||
|
<address type='pci' domain='0' bus='0' slot='4' function='1'/>
|
||||||
|
</controller>
|
||||||
|
<controller type='usb' index='0' model='ich9-uhci3'>
|
||||||
|
<master startport='4'/>
|
||||||
|
<address type='pci' domain='0' bus='0' slot='4' function='2'/>
|
||||||
|
</controller>
|
||||||
|
<hub type='usb'/>
|
||||||
|
<input type='mouse' bus='usb'>
|
||||||
|
</input>
|
||||||
|
<hub type='usb'>
|
||||||
|
</hub>
|
||||||
|
<input type='mouse' bus='usb'>
|
||||||
|
</input>
|
||||||
|
<input type='mouse' bus='usb'>
|
||||||
|
</input>
|
||||||
|
<memballoon model='virtio'/>
|
||||||
|
</devices>
|
||||||
|
</domain>
|
28
tests/qemuxml2argvdata/qemuxml2argv-usb-port-autoassign.args
Normal file
28
tests/qemuxml2argvdata/qemuxml2argv-usb-port-autoassign.args
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
LC_ALL=C \
|
||||||
|
PATH=/bin \
|
||||||
|
HOME=/home/test \
|
||||||
|
USER=test \
|
||||||
|
LOGNAME=test \
|
||||||
|
QEMU_AUDIO_DRV=none \
|
||||||
|
/usr/bin/qemu \
|
||||||
|
-name QEMUGuest1 \
|
||||||
|
-S \
|
||||||
|
-M pc \
|
||||||
|
-m 214 \
|
||||||
|
-smp 1,sockets=1,cores=1,threads=1 \
|
||||||
|
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
|
||||||
|
-nographic \
|
||||||
|
-nodefconfig \
|
||||||
|
-nodefaults \
|
||||||
|
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
|
||||||
|
server,nowait \
|
||||||
|
-mon chardev=charmonitor,id=monitor,mode=readline \
|
||||||
|
-no-acpi \
|
||||||
|
-boot c \
|
||||||
|
-usb \
|
||||||
|
-device usb-hub,id=hub0,bus=usb.0,port=1 \
|
||||||
|
-device usb-hub,id=hub1 \
|
||||||
|
-device usb-mouse,id=input0 \
|
||||||
|
-device usb-mouse,id=input1 \
|
||||||
|
-device usb-mouse,id=input2 \
|
||||||
|
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
|
27
tests/qemuxml2argvdata/qemuxml2argv-usb-port-autoassign.xml
Normal file
27
tests/qemuxml2argvdata/qemuxml2argv-usb-port-autoassign.xml
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
<domain type='qemu'>
|
||||||
|
<name>QEMUGuest1</name>
|
||||||
|
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
||||||
|
<memory unit='KiB'>219136</memory>
|
||||||
|
<currentMemory unit='KiB'>219136</currentMemory>
|
||||||
|
<vcpu placement='static'>1</vcpu>
|
||||||
|
<os>
|
||||||
|
<type arch='i686' machine='pc'>hvm</type>
|
||||||
|
<boot dev='hd'/>
|
||||||
|
</os>
|
||||||
|
<devices>
|
||||||
|
<emulator>/usr/bin/qemu</emulator>
|
||||||
|
<controller type='usb' index='0'/>
|
||||||
|
<memballoon model='virtio'/>
|
||||||
|
<hub type='usb'>
|
||||||
|
<address type='usb' bus='0' port='1'/>
|
||||||
|
</hub>
|
||||||
|
<input type='mouse' bus='usb'>
|
||||||
|
</input>
|
||||||
|
<hub type='usb'>
|
||||||
|
</hub>
|
||||||
|
<input type='mouse' bus='usb'>
|
||||||
|
</input>
|
||||||
|
<input type='mouse' bus='usb'>
|
||||||
|
</input>
|
||||||
|
</devices>
|
||||||
|
</domain>
|
27
tests/qemuxml2argvdata/qemuxml2argv-usb-xhci-autoassign.args
Normal file
27
tests/qemuxml2argvdata/qemuxml2argv-usb-xhci-autoassign.args
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
LC_ALL=C \
|
||||||
|
PATH=/bin \
|
||||||
|
HOME=/home/test \
|
||||||
|
USER=test \
|
||||||
|
LOGNAME=test \
|
||||||
|
QEMU_AUDIO_DRV=none \
|
||||||
|
/usr/bin/qemu \
|
||||||
|
-name QEMUGuest1 \
|
||||||
|
-S \
|
||||||
|
-M pc \
|
||||||
|
-m 214 \
|
||||||
|
-smp 1,sockets=1,cores=1,threads=1 \
|
||||||
|
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
|
||||||
|
-nographic \
|
||||||
|
-nodefconfig \
|
||||||
|
-nodefaults \
|
||||||
|
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
|
||||||
|
server,nowait \
|
||||||
|
-mon chardev=charmonitor,id=monitor,mode=readline \
|
||||||
|
-no-acpi \
|
||||||
|
-boot c \
|
||||||
|
-device nec-usb-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x3 \
|
||||||
|
-device usb-hub,id=hub0 \
|
||||||
|
-device usb-hub,id=hub1 \
|
||||||
|
-device usb-mouse,id=input0 \
|
||||||
|
-device usb-mouse,id=input1 \
|
||||||
|
-device usb-mouse,id=input2
|
25
tests/qemuxml2argvdata/qemuxml2argv-usb-xhci-autoassign.xml
Normal file
25
tests/qemuxml2argvdata/qemuxml2argv-usb-xhci-autoassign.xml
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
<domain type='qemu'>
|
||||||
|
<name>QEMUGuest1</name>
|
||||||
|
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
||||||
|
<memory unit='KiB'>219136</memory>
|
||||||
|
<currentMemory unit='KiB'>219136</currentMemory>
|
||||||
|
<vcpu placement='static'>1</vcpu>
|
||||||
|
<os>
|
||||||
|
<type arch='i686' machine='pc'>hvm</type>
|
||||||
|
<boot dev='hd'/>
|
||||||
|
</os>
|
||||||
|
<devices>
|
||||||
|
<emulator>/usr/bin/qemu</emulator>
|
||||||
|
<controller type='usb' index='0' model='nec-xhci' ports='8'/>
|
||||||
|
<hub type='usb'/>
|
||||||
|
<input type='mouse' bus='usb'>
|
||||||
|
</input>
|
||||||
|
<hub type='usb'>
|
||||||
|
</hub>
|
||||||
|
<input type='mouse' bus='usb'>
|
||||||
|
</input>
|
||||||
|
<input type='mouse' bus='usb'>
|
||||||
|
</input>
|
||||||
|
<memballoon model='none'/>
|
||||||
|
</devices>
|
||||||
|
</domain>
|
@ -1177,6 +1177,10 @@ mymain(void)
|
|||||||
DO_TEST_PARSE_ERROR("usb-ich9-no-companion",
|
DO_TEST_PARSE_ERROR("usb-ich9-no-companion",
|
||||||
QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
||||||
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1);
|
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1);
|
||||||
|
DO_TEST("usb-ich9-autoassign",
|
||||||
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
||||||
|
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1,
|
||||||
|
QEMU_CAPS_USB_HUB);
|
||||||
DO_TEST("usb-hub",
|
DO_TEST("usb-hub",
|
||||||
QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB,
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB,
|
||||||
QEMU_CAPS_NODEFCONFIG);
|
QEMU_CAPS_NODEFCONFIG);
|
||||||
@ -1189,6 +1193,9 @@ mymain(void)
|
|||||||
DO_TEST("usb-ports",
|
DO_TEST("usb-ports",
|
||||||
QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB,
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB,
|
||||||
QEMU_CAPS_NODEFCONFIG);
|
QEMU_CAPS_NODEFCONFIG);
|
||||||
|
DO_TEST("usb-port-autoassign",
|
||||||
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB,
|
||||||
|
QEMU_CAPS_NODEFCONFIG);
|
||||||
DO_TEST("usb-redir",
|
DO_TEST("usb-redir",
|
||||||
QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG,
|
||||||
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB,
|
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB,
|
||||||
@ -1243,6 +1250,10 @@ mymain(void)
|
|||||||
DO_TEST("usb-controller-xhci",
|
DO_TEST("usb-controller-xhci",
|
||||||
QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI,
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI,
|
||||||
QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NEC_USB_XHCI_PORTS);
|
QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NEC_USB_XHCI_PORTS);
|
||||||
|
DO_TEST("usb-xhci-autoassign",
|
||||||
|
QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI,
|
||||||
|
QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NEC_USB_XHCI_PORTS,
|
||||||
|
QEMU_CAPS_USB_HUB);
|
||||||
|
|
||||||
DO_TEST("smbios", QEMU_CAPS_SMBIOS_TYPE);
|
DO_TEST("smbios", QEMU_CAPS_SMBIOS_TYPE);
|
||||||
DO_TEST_PARSE_ERROR("smbios-date", QEMU_CAPS_SMBIOS_TYPE);
|
DO_TEST_PARSE_ERROR("smbios-date", QEMU_CAPS_SMBIOS_TYPE);
|
||||||
|
Loading…
Reference in New Issue
Block a user