[Qemu-devel] [PATCH] remove warning when using auto filters with -usbdevice

[Qemu-devel] [PATCH] remove warning when using auto filters with -usbdevice

[Andreas Winkelbauer]

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

This patch adds a check in usb_device_add() to distinguish between usb
auto filters and usb devices.

In turn confusing warnings like "Warning: could not add USB device
host:auto:..." are removed.

Signed-off-by: Andreas Winkelbauer <andreas.winkelbauer@gmx.at>
---

bye,
Andi

[-- Attachment #2: qemu-autofilter-add.patch --]
[-- Type: text/x-patch, Size: 678 bytes --]

diff -uNrp trunk.orig/vl.c trunk/vl.c
--- trunk.orig/vl.c	2008-09-17 02:11:53.000000000 +0200
+++ trunk/vl.c	2008-09-17 03:20:28.000000000 +0200
@@ -5786,7 +5786,13 @@ static int usb_device_add(const char *de
         return -1;
 
     if (strstart(devname, "host:", &p)) {
-        dev = usb_host_device_open(p);
+        /* check if we actually want to add an auto filter */
+        if (strstart(p, "auto:", NULL))	{
+            usb_host_device_open(p);
+            return 0;
+        } else {
+            dev = usb_host_device_open(p);
+        }
     } else if (!strcmp(devname, "mouse")) {
         dev = usb_mouse_init();
     } else if (!strcmp(devname, "tablet")) {

Re: [Qemu-devel] [PATCH] remove warning when using auto filters with -usbdevice

[Anthony Liguori]

Andreas Winkelbauer wrote:
> This patch adds a check in usb_device_add() to distinguish between usb
> auto filters and usb devices.
>
> In turn confusing warnings like "Warning: could not add USB device
> host:auto:..." are removed.
>
> Signed-off-by: Andreas Winkelbauer <andreas.winkelbauer@gmx.at>
> ---
>
> bye,
> Andi
>   
> diff -uNrp trunk.orig/vl.c trunk/vl.c
> --- trunk.orig/vl.c    2008-09-17 02:11:53.000000000 +0200
> +++ trunk/vl.c    2008-09-17 03:20:28.000000000 +0200
> @@ -5786,7 +5786,13 @@ static int usb_device_add(const char *de
>          return -1;
>  
>      if (strstart(devname, "host:", &p)) {
> -        dev = usb_host_device_open(p);
> +        /* check if we actually want to add an auto filter */
> +        if (strstart(p, "auto:", NULL))    {
> +            usb_host_device_open(p);
> +            return 0;

This does not check the results of usb_host_device_open().  I think a 
better approach would be to introduce an auto_add flag into this 
function that defaults to = 1, and if strstart(p, "auto:"), then set it 
to zero.  Lower in the function, where you would add 'dev', first check 
auto_add.  Then you maintain a single return point and also ensure that 
you do proper error checking.

Regards,

Anthony Liguori

> +        } else {
> +            dev = usb_host_device_open(p);
> +        }
>      } else if (!strcmp(devname, "mouse")) {
>          dev = usb_mouse_init();
>      } else if (!strcmp(devname, "tablet")) {