qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Hans de Goede <hdegoede@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 6/9] usb/host-libusb: Fix building with libusb git master code
Date: Mon, 24 Jun 2013 08:44:40 +0200	[thread overview]
Message-ID: <1372056283-4845-7-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1372056283-4845-1-git-send-email-kraxel@redhat.com>

From: Hans de Goede <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>
Signed-off-by: Gerd Hoffmann <kraxel@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.7.9.7

  parent reply	other threads:[~2013-06-24  6:44 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-24  6:44 [Qemu-devel] [PULL 0/9] usb patch queue Gerd Hoffmann
2013-06-24  6:44 ` [Qemu-devel] [PATCH 1/9] usb/hcd-ehci-sysbus: Convert to QOM realize Gerd Hoffmann
2013-06-24  6:44 ` [Qemu-devel] [PATCH 2/9] usb/hcd-ehci: Split off instance_init from realize Gerd Hoffmann
2013-06-24  6:44 ` [Qemu-devel] [PATCH 3/9] usb/hcd-ehci: Add Tegra2 SysBus EHCI device Gerd Hoffmann
2013-06-24  6:44 ` [Qemu-devel] [PATCH 4/9] usb/hcd-ehci: Replace PORTSC macros with variables Gerd Hoffmann
2013-06-24  6:44 ` [Qemu-devel] [PATCH 5/9] usb/hcd-ehci: Add Faraday FUSBH200 support Gerd Hoffmann
2013-06-24  6:44 ` Gerd Hoffmann [this message]
2013-06-24  6:44 ` [Qemu-devel] [PATCH 7/9] usb-host-libusb: set USB_DEV_FLAG_IS_HOST Gerd Hoffmann
2013-06-24  6:44 ` [Qemu-devel] [PATCH 8/9] usb: add serial bus property Gerd Hoffmann
2013-06-24  6:44 ` [Qemu-devel] [PATCH 9/9] usb: fix serial number for hid devices Gerd Hoffmann

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=1372056283-4845-7-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=hdegoede@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).