* [Qemu-devel] [PATCH] usb-host: switch to LIBUSB_API_VERSION
@ 2017-04-03 10:52 Gerd Hoffmann
2017-04-03 12:28 ` Marc-André Lureau
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2017-04-03 10:52 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
libusbx doesn't exist any more, the fork got merged back to libusb. So
stop using LIBUSBX_API_VERSION and use LIBUSB_API_VERSION instead. For
backward compatibility alias LIBUSB_API_VERSION to LIBUSBX_API_VERSION
in case we figure LIBUSB_API_VERSION isn't defined.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb/host-libusb.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index c9876a5..f9c8eaf 100644
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -159,7 +159,10 @@ static void usb_host_attach_kernel(USBHostDevice *s);
#define BULK_TIMEOUT 0 /* unlimited */
#define INTR_TIMEOUT 0 /* unlimited */
-#if LIBUSBX_API_VERSION >= 0x01000103
+#ifndef LIBUSB_API_VERSION
+# define LIBUSB_API_VERSION LIBUSBX_API_VERSION
+#endif
+#if LIBUSB_API_VERSION >= 0x01000103
# define HAVE_STREAMS 1
#endif
@@ -269,7 +272,7 @@ static int usb_host_get_port(libusb_device *dev, char *port, size_t len)
size_t off;
int rc, i;
-#if LIBUSBX_API_VERSION >= 0x01000102
+#if LIBUSB_API_VERSION >= 0x01000102
rc = libusb_get_port_numbers(dev, path, 7);
#else
rc = libusb_get_port_path(ctx, dev, path, 7);
--
2.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] usb-host: switch to LIBUSB_API_VERSION
2017-04-03 10:52 [Qemu-devel] [PATCH] usb-host: switch to LIBUSB_API_VERSION Gerd Hoffmann
@ 2017-04-03 12:28 ` Marc-André Lureau
2017-04-03 12:39 ` Philippe Mathieu-Daudé
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Marc-André Lureau @ 2017-04-03 12:28 UTC (permalink / raw)
To: Gerd Hoffmann, qemu-devel
Hi
On Mon, Apr 3, 2017 at 12:53 PM Gerd Hoffmann <kraxel@redhat.com> wrote:
> libusbx doesn't exist any more, the fork got merged back to libusb. So
> stop using LIBUSBX_API_VERSION and use LIBUSB_API_VERSION instead. For
> backward compatibility alias LIBUSB_API_VERSION to LIBUSBX_API_VERSION
> in case we figure LIBUSB_API_VERSION isn't defined.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>
looks good
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> hw/usb/host-libusb.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
> index c9876a5..f9c8eaf 100644
> --- a/hw/usb/host-libusb.c
> +++ b/hw/usb/host-libusb.c
> @@ -159,7 +159,10 @@ static void usb_host_attach_kernel(USBHostDevice *s);
> #define BULK_TIMEOUT 0 /* unlimited */
> #define INTR_TIMEOUT 0 /* unlimited */
>
> -#if LIBUSBX_API_VERSION >= 0x01000103
> +#ifndef LIBUSB_API_VERSION
> +# define LIBUSB_API_VERSION LIBUSBX_API_VERSION
> +#endif
> +#if LIBUSB_API_VERSION >= 0x01000103
> # define HAVE_STREAMS 1
> #endif
>
> @@ -269,7 +272,7 @@ static int usb_host_get_port(libusb_device *dev, char
> *port, size_t len)
> size_t off;
> int rc, i;
>
> -#if LIBUSBX_API_VERSION >= 0x01000102
> +#if LIBUSB_API_VERSION >= 0x01000102
> rc = libusb_get_port_numbers(dev, path, 7);
> #else
> rc = libusb_get_port_path(ctx, dev, path, 7);
> --
> 2.9.3
>
>
> --
Marc-André Lureau
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] usb-host: switch to LIBUSB_API_VERSION
2017-04-03 10:52 [Qemu-devel] [PATCH] usb-host: switch to LIBUSB_API_VERSION Gerd Hoffmann
2017-04-03 12:28 ` Marc-André Lureau
@ 2017-04-03 12:39 ` Philippe Mathieu-Daudé
2017-04-03 12:53 ` Peter Maydell
2017-04-03 14:13 ` Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-04-03 12:39 UTC (permalink / raw)
To: Gerd Hoffmann, qemu-devel
On 04/03/2017 07:52 AM, Gerd Hoffmann wrote:
> libusbx doesn't exist any more, the fork got merged back to libusb. So
> stop using LIBUSBX_API_VERSION and use LIBUSB_API_VERSION instead. For
> backward compatibility alias LIBUSB_API_VERSION to LIBUSBX_API_VERSION
> in case we figure LIBUSB_API_VERSION isn't defined.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/usb/host-libusb.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
> index c9876a5..f9c8eaf 100644
> --- a/hw/usb/host-libusb.c
> +++ b/hw/usb/host-libusb.c
> @@ -159,7 +159,10 @@ static void usb_host_attach_kernel(USBHostDevice *s);
> #define BULK_TIMEOUT 0 /* unlimited */
> #define INTR_TIMEOUT 0 /* unlimited */
>
> -#if LIBUSBX_API_VERSION >= 0x01000103
> +#ifndef LIBUSB_API_VERSION
> +# define LIBUSB_API_VERSION LIBUSBX_API_VERSION
> +#endif
> +#if LIBUSB_API_VERSION >= 0x01000103
> # define HAVE_STREAMS 1
> #endif
>
> @@ -269,7 +272,7 @@ static int usb_host_get_port(libusb_device *dev, char *port, size_t len)
> size_t off;
> int rc, i;
>
> -#if LIBUSBX_API_VERSION >= 0x01000102
> +#if LIBUSB_API_VERSION >= 0x01000102
> rc = libusb_get_port_numbers(dev, path, 7);
> #else
> rc = libusb_get_port_path(ctx, dev, path, 7);
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] usb-host: switch to LIBUSB_API_VERSION
2017-04-03 10:52 [Qemu-devel] [PATCH] usb-host: switch to LIBUSB_API_VERSION Gerd Hoffmann
2017-04-03 12:28 ` Marc-André Lureau
2017-04-03 12:39 ` Philippe Mathieu-Daudé
@ 2017-04-03 12:53 ` Peter Maydell
2017-04-03 14:13 ` Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2017-04-03 12:53 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: QEMU Developers
On 3 April 2017 at 11:52, Gerd Hoffmann <kraxel@redhat.com> wrote:
> libusbx doesn't exist any more, the fork got merged back to libusb. So
> stop using LIBUSBX_API_VERSION and use LIBUSB_API_VERSION instead. For
> backward compatibility alias LIBUSB_API_VERSION to LIBUSBX_API_VERSION
> in case we figure LIBUSB_API_VERSION isn't defined.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This does silence the compiler warning on FreeBSD, thanks.
Tested-by: Peter Maydell <peter.maydell@linaro.org>
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] usb-host: switch to LIBUSB_API_VERSION
2017-04-03 10:52 [Qemu-devel] [PATCH] usb-host: switch to LIBUSB_API_VERSION Gerd Hoffmann
` (2 preceding siblings ...)
2017-04-03 12:53 ` Peter Maydell
@ 2017-04-03 14:13 ` Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2017-04-03 14:13 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: QEMU Developers
On 3 April 2017 at 11:52, Gerd Hoffmann <kraxel@redhat.com> wrote:
> libusbx doesn't exist any more, the fork got merged back to libusb. So
> stop using LIBUSBX_API_VERSION and use LIBUSB_API_VERSION instead. For
> backward compatibility alias LIBUSB_API_VERSION to LIBUSBX_API_VERSION
> in case we figure LIBUSB_API_VERSION isn't defined.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Applying to master at Gerd's suggestion since it's got review
and it just missed the boat for his -rc3 pull request.
thanks
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-04-03 14:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-03 10:52 [Qemu-devel] [PATCH] usb-host: switch to LIBUSB_API_VERSION Gerd Hoffmann
2017-04-03 12:28 ` Marc-André Lureau
2017-04-03 12:39 ` Philippe Mathieu-Daudé
2017-04-03 12:53 ` Peter Maydell
2017-04-03 14:13 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.