[Qemu-devel] [PATCH 4/4] usb-host: raise libusbx minimum version to 1.0.13

[Qemu-devel] [PATCH 4/4] usb-host: raise libusbx minimum version to 1.0.13

[Gerd Hoffmann]

Allows to remove one FIXME.  Makes LIBUSB_LOG_LEVEL_WARNING build errors
go away.  And starting with that version libusb has a LIBUSBX_API_VERSION
define which allows to easily #ifdef version dependencies should that
need arrive in the future.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 configure            |    2 +-
 hw/usb/host-libusb.c |    5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/configure b/configure
index 51a6c56..33d3354 100755
--- a/configure
+++ b/configure
@@ -3060,7 +3060,7 @@ fi
 
 # check for libusb
 if test "$libusb" != "no" ; then
-    if $pkg_config libusb-1.0 >/dev/null 2>&1 ; then
+    if $pkg_config --atleast-version=1.0.13 libusb-1.0 >/dev/null 2>&1 ; then
         libusb="yes"
 	usb="libusb"
         libusb_cflags=$($pkg_config --cflags libusb-1.0 2>/dev/null)
diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index 29f35b3..d1186b8 100644
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -236,8 +236,6 @@ static int usb_host_init(void)
 
 static int usb_host_get_port(libusb_device *dev, char *port, size_t len)
 {
-#if defined(LIBUSBX_API_VERSION) && (LIBUSBX_API_VERSION >= 0x010000ff)
-    /* have libusb_get_port_path() */
     uint8_t path[7];
     size_t off;
     int rc, i;
@@ -251,9 +249,6 @@ static int usb_host_get_port(libusb_device *dev, char *port, size_t len)
         off += snprintf(port+off, len-off, ".%d", path[i]);
     }
     return off;
-#else
-    return snprintf(port, len, "FIXME");
-#endif
 }
 
 static void usb_host_libusb_error(const char *func, int rc)
-- 
1.7.9.7

Re: [Qemu-devel] [PATCH 4/4] usb-host: raise libusbx minimum version to 1.0.13

[Ed Maste]

I recently discovered QEMU's libusb support and hoped that this would
provide a good solution for the USB host issue on current FreeBSD
versions.  (Right now the FreeBSD ports tree sets USB_HOST=stub, since
the bsd USB code isn't compatible with FreeBSD 8.x and later.)

I'm wondering how best to address QEMU's libusb support on FreeBSD,
and discovered the libusb vs. libusbx saga.  Is it safe to assume that
in the Linux world "pkg-config libusb-1.0" is generally going to refer
to libusbx?

FreeBSD has its own libusb-compatible implementation, but currently
lacks libusb_get_port_path and perhaps others, and if libusbx is
virtually universal on Linux we presumably want to grow these same
interfaces.

Re: [Qemu-devel] [PATCH 4/4] usb-host: raise libusbx minimum version to 1.0.13

[Gerd Hoffmann]

  Hi,

> I'm wondering how best to address QEMU's libusb support on FreeBSD,
> and discovered the libusb vs. libusbx saga.  Is it safe to assume that
> in the Linux world "pkg-config libusb-1.0" is generally going to refer
> to libusbx?

In recent linux distributions yes.

> FreeBSD has its own libusb-compatible implementation, but currently
> lacks libusb_get_port_path and perhaps others, and if libusbx is
> virtually universal on Linux we presumably want to grow these same
> interfaces.

Yes.

Even better would be to get the freebsd support merged into libusbx.

/me suspects the reason why freebsd has its own implementation is
basically the same why the libusbx exists in the first place: unfriendly
libusb upstream.

So if you tried + failed to merge the freebsd bits to libusb in the past
it is worth trying again to get them into libusbx, then switch over
freebsd to libusbx too.

cheers,
  Gerd