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

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

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);
>

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

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