[qemu-xen staging-4.9] Fix libusb-1.0.22 deprecated libusb_set_debug with libusb_set_option

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[qemu-xen staging-4.9] Fix libusb-1.0.22 deprecated libusb_set_debug with libusb_set_option

patchbot
commit 125b7a551659c6963e2d9b624676411b3651bf22
Author:     John Thomson <[hidden email]>
AuthorDate: Thu Apr 5 23:20:46 2018 +1000
Commit:     Anthony PERARD <[hidden email]>
CommitDate: Mon Jul 9 12:37:57 2018 +0100

    Fix libusb-1.0.22 deprecated libusb_set_debug with libusb_set_option
   
    libusb-1.0.22 marked libusb_set_debug deprecated
    it is replaced with
    libusb_set_option(libusb_context, LIBUSB_OPTION_LOG_LEVEL, libusb_log_level);
   
    details here: https://github.com/libusb/libusb/commit/539f22e2fd916558d11ab9a66f10f461c5593168
   
    Warning here:
   
      CC      hw/usb/host-libusb.o
    /builds/xen/src/qemu-xen/hw/usb/host-libusb.c: In function 'usb_host_init':
    /builds/xen/src/qemu-xen/hw/usb/host-libusb.c:250:5: error: 'libusb_set_debug' is deprecated: Use libusb_set_option instead [-Werror=deprecated-declarations]
         libusb_set_debug(ctx, loglevel);
         ^~~~~~~~~~~~~~~~
    In file included from /builds/xen/src/qemu-xen/hw/usb/host-libusb.c:40:0:
    /usr/include/libusb-1.0/libusb.h:1300:18: note: declared here
     void LIBUSB_CALL libusb_set_debug(libusb_context *ctx, int level);
                      ^~~~~~~~~~~~~~~~
    cc1: all warnings being treated as errors
    make: *** [/builds/xen/src/qemu-xen/rules.mak:66: hw/usb/host-libusb.o] Error 1
    make: Leaving directory '/builds/xen/src/xen/tools/qemu-xen-build'
   
    Signed-off-by: John Thomson <[hidden email]>
    Message-id: [hidden email]
    Signed-off-by: Gerd Hoffmann <[hidden email]>
    (cherry picked from commit 9d8fa0df49af16a208fa961c2968fba4daffcc07)
---
 hw/usb/host-libusb.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index bd81d71a98..d6a85bc628 100644
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -244,7 +244,11 @@ static int usb_host_init(void)
     if (rc != 0) {
         return -1;
     }
+#if LIBUSB_API_VERSION >= 0x01000106
+    libusb_set_option(ctx, LIBUSB_OPTION_LOG_LEVEL, loglevel);
+#else
     libusb_set_debug(ctx, loglevel);
+#endif
 #ifdef CONFIG_WIN32
     /* FIXME: add support for Windows. */
 #else
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging-4.9

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog