qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Hans de Goede <hdegoede@redhat.com>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: Hans de Goede <hdegoede@redhat.com>, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 2/2] usb/host-libusb: Fix building with libusb git master code
Date: Thu,  6 Jun 2013 16:39:34 +0200	[thread overview]
Message-ID: <1370529574-31069-3-git-send-email-hdegoede@redhat.com> (raw)
In-Reply-To: <1370529574-31069-1-git-send-email-hdegoede@redhat.com>

The next libusb release will deprecate libusb_get_port_path, and since
we compile with -Werror, this breaks the build.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 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 3a582c5..0c12b0f 100644
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -241,7 +241,11 @@ 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
+    rc = libusb_get_port_numbers(dev, path, 7);
+#else
     rc = libusb_get_port_path(ctx, dev, path, 7);
+#endif
     if (rc < 0) {
         return 0;
     }
-- 
1.8.2.1

  parent reply	other threads:[~2013-06-06 14:39 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-06 14:39 [Qemu-devel] [PATCH 0/2] 2 compile / build fixes Hans de Goede
2013-06-06 14:39 ` [Qemu-devel] [PATCH 1/2] device_tree: Fix build with latest libfdt Hans de Goede
2013-06-06 14:51   ` Gerd Hoffmann
2013-06-11  2:13   ` Peter Crosthwaite
2013-06-12 13:55     ` Paolo Bonzini
2013-06-12 14:01       ` Peter Maydell
2013-06-12 14:03         ` Paolo Bonzini
2013-06-06 14:39 ` Hans de Goede [this message]
2013-06-06 14:47   ` [Qemu-devel] [PATCH 2/2] usb/host-libusb: Fix building with libusb git master code Gerd Hoffmann
2013-06-07 14:13   ` Ed Maste

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1370529574-31069-3-git-send-email-hdegoede@redhat.com \
    --to=hdegoede@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).