[libvirt] [PATCH 0/2] qemu: error out on USB ports out of range
https://bugzilla.redhat.com/show_bug.cgi?id=1399260 Ján Tomko (2): tests: Fix USB ports in usb-redir-filter qemu: error out on USB ports out of range src/conf/domain_addr.c | 7 ++++++ .../qemuxml2argv-usb-ports-out-of-range.xml | 25 ++++++++++++++++++++++ .../qemuxml2argv-usb-redir-filter-version.args | 4 ++-- .../qemuxml2argv-usb-redir-filter-version.xml | 4 ++-- tests/qemuxml2argvtest.c | 3 +++ .../qemuxml2xmlout-usb-redir-filter-version.xml | 4 ++-- 6 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-ports-out-of-range.xml -- 2.7.3
This test case references ports 4 and 5 on the PIIX3 UHCI controller which only has two. --- tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.xml | 4 ++-- tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir-filter-version.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args index 5fd9e4a..0113efd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args @@ -23,9 +23,9 @@ server,nowait \ -chardev spicevmc,id=charredir0,name=usbredir \ -device 'usb-redir,chardev=charredir0,id=redir0,\ filter=0x08:0x15E1:0x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|-1:-1:-1:-1:0,\ -bus=usb.0,port=4' \ +bus=usb.0,port=1' \ -chardev spicevmc,id=charredir1,name=usbredir \ -device 'usb-redir,chardev=charredir1,id=redir1,\ filter=0x08:0x15E1:0x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|-1:-1:-1:-1:0,\ -bus=usb.0,port=5' \ +bus=usb.0,port=2' \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.xml index c07cddd..d9110d8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.xml @@ -17,10 +17,10 @@ <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <redirdev bus='usb' type='spicevmc'> - <address type='usb' bus='0' port='4'/> + <address type='usb' bus='0' port='1'/> </redirdev> <redirdev bus='usb' type='spicevmc'> - <address type='usb' bus='0' port='5'/> + <address type='usb' bus='0' port='2'/> </redirdev> <redirfilter> <usbdev class='0x08' vendor='0x15E1' product='0x2007' version='1.09' allow='yes'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir-filter-version.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir-filter-version.xml index 77ce72f..c291e57 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir-filter-version.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir-filter-version.xml @@ -21,10 +21,10 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <redirdev bus='usb' type='spicevmc'> - <address type='usb' bus='0' port='4'/> + <address type='usb' bus='0' port='1'/> </redirdev> <redirdev bus='usb' type='spicevmc'> - <address type='usb' bus='0' port='5'/> + <address type='usb' bus='0' port='2'/> </redirdev> <redirfilter> <usbdev class='0x08' vendor='0x15E1' product='0x2007' version='1.09' allow='yes'/> -- 2.7.3
My overly sophisticated address reservation code forgot to add an error message for user-requested ports out of range. https://bugzilla.redhat.com/show_bug.cgi?id=1399260 --- src/conf/domain_addr.c | 7 ++++++ .../qemuxml2argv-usb-ports-out-of-range.xml | 25 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ 3 files changed, 35 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-ports-out-of-range.xml diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 4d3eabc..b64fc18 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1987,6 +1987,13 @@ virDomainUSBAddressReserve(virDomainDeviceInfoPtr info, portStr))) goto cleanup; + if (targetPort >= virBitmapSize(targetHub->portmap)) { + virReportError(VIR_ERR_XML_ERROR, + _("requested USB port %s not present on USB bus %u"), + portStr, info->addr.usb.bus); + goto cleanup; + } + if (virBitmapIsBitSet(targetHub->portmap, targetPort)) { virReportError(VIR_ERR_XML_ERROR, _("Duplicate USB address bus %u port %s"), diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ports-out-of-range.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-ports-out-of-range.xml new file mode 100644 index 0000000..5415b88 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ports-out-of-range.xml @@ -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'/> + <memballoon model='virtio'/> + <hub type='usb'> + <address type='usb' bus='0' port='1'/> + </hub> + <input type='mouse' bus='usb'> + <address type='usb' bus='0' port='4'/> + </input> + <hub type='usb'> + <address type='usb' bus='0' port='1.9'/> + </hub> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8d1bdb7..d12077c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1320,6 +1320,9 @@ mymain(void) DO_TEST("usb-ports", QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); + DO_TEST_PARSE_ERROR("usb-ports-out-of-range", + QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB, + QEMU_CAPS_NODEFCONFIG); DO_TEST("usb-port-autoassign", QEMU_CAPS_CHARDEV, QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); -- 2.7.3
On Mon, Nov 28, 2016 at 05:51:44PM +0100, Ján Tomko wrote:
https://bugzilla.redhat.com/show_bug.cgi?id=1399260
Ján Tomko (2): tests: Fix USB ports in usb-redir-filter qemu: error out on USB ports out of range
ACK series and safe for freeze. Erik
src/conf/domain_addr.c | 7 ++++++ .../qemuxml2argv-usb-ports-out-of-range.xml | 25 ++++++++++++++++++++++ .../qemuxml2argv-usb-redir-filter-version.args | 4 ++-- .../qemuxml2argv-usb-redir-filter-version.xml | 4 ++-- tests/qemuxml2argvtest.c | 3 +++ .../qemuxml2xmlout-usb-redir-filter-version.xml | 4 ++-- 6 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-ports-out-of-range.xml
-- 2.7.3
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
participants (2)
-
Erik Skultety -
Ján Tomko