From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1FBlgG-0005fY-2w for qemu-devel@nongnu.org; Tue, 21 Feb 2006 23:32:48 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1FBlgE-0005em-Sw for qemu-devel@nongnu.org; Tue, 21 Feb 2006 23:32:47 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FBlgE-0005eP-J3 for qemu-devel@nongnu.org; Tue, 21 Feb 2006 23:32:46 -0500 Received: from [24.93.47.42] (helo=ms-smtp-03-eri0.texas.rr.com) by monty-python.gnu.org with esmtp (Exim 4.52) id 1FBlmd-0006q6-O8 for qemu-devel@nongnu.org; Tue, 21 Feb 2006 23:39:23 -0500 Received: from [192.168.0.11] (cpe-67-9-160-120.austin.res.rr.com [67.9.160.120]) by ms-smtp-03-eri0.texas.rr.com (8.13.4/8.13.4) with ESMTP id k1M4WiM5019244 for ; Tue, 21 Feb 2006 22:32:44 -0600 (CST) Message-ID: <43FBE96F.6070504@austin.rr.com> Date: Tue, 21 Feb 2006 22:32:47 -0600 From: Lonnie Mendez MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------020501030900000207090104" Subject: [Qemu-devel] [PATCH] [USB] recent fixes Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is a multi-part message in MIME format. --------------020501030900000207090104 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hello list. I've bundled a few fixes recently posted along with a modification by myself. Please find description below and patch attached. usb-linux.c: -Modified code in usb_host_scan function to avoid returning information on the host's root hubs. These are the physical ports that the usb devices plug in to that show up with product id 0x0000 and vendor id 0x0000. This cleans up the information presented by 'info usbhost' by only showing usb devices on the system that can be proxied. hw/usb-uhci.c: The below changes were submitted by Krister Walfridsson to the list recently to allow further functionality with the uhci driver used by *BSD guests. -Changed region number registered with pci_register_io_region from 0 to 4. -Added USB release value to pci configuration space of the controller. --------------020501030900000207090104 Content-Type: text/plain; name="misc-usb-fixes.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="misc-usb-fixes.patch" --- a/qemu/usb-linux.c 2006-01-15 22:06:40.000000000 -0600 +++ b/qemu/usb-linux.c 2006-02-21 10:13:51.000000000 -0600 @@ -278,7 +354,7 @@ if (strlen(line) > 0) line[strlen(line) - 1] = '\0'; if (line[0] == 'T' && line[1] == ':') { - if (device_count) { + if (device_count && (vendor_id || product_id)) { ret = func(opaque, bus_num, addr, class_id, vendor_id, product_id, product_name, speed); if (ret) @@ -321,7 +397,7 @@ } fail: ; } - if (device_count) { + if (device_count && (vendor_id || product_id)) { ret = func(opaque, bus_num, addr, class_id, vendor_id, product_id, product_name, speed); } --- a/qemu/hw/usb-uhci.c 2005-12-19 16:51:53.000000000 -0600 +++ b/qemu/hw/usb-uhci.c 2006-02-21 10:25:45.000000000 -0600 @@ -654,6 +661,7 @@ pci_conf[0x0b] = 0x0c; pci_conf[0x0e] = 0x00; // header_type pci_conf[0x3d] = 4; // interrupt pin 3 + pci_conf[0x60] = 0x10; // release number for(i = 0; i < NB_PORTS; i++) { port = &s->ports[i]; @@ -666,6 +674,6 @@ uhci_reset(s); - pci_register_io_region(&s->dev, 0, 0x20, + pci_register_io_region(&s->dev, 4, 0x20, PCI_ADDRESS_SPACE_IO, uhci_map); } --------------020501030900000207090104--