Commit f83b70f7 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160511-1' into staging 



usb: misc fixes

# gpg: Signature made Wed 11 May 2016 12:18:25 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-usb-20160511-1:
  usb: Support compilation without poll.h
  usb-mtp: fix usb_mtp_get_device_info so that libmtp on the guest doesn't complain
  usb:xhci: no DMA on HC reset

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 26617924 a277c3e0

hw/usb/dev-mtp.c

+2 −2
Original line number Diff line number Diff line
@@ -788,8 +788,8 @@ static MTPData *usb_mtp_get_device_info(MTPState *s, MTPControl *c) 
    trace_usb_mtp_op_get_device_info(s->dev.addr);



    usb_mtp_add_u16(d, 100);

    usb_mtp_add_u32(d, 0xffffffff);

    usb_mtp_add_u16(d, 0x0101);

    usb_mtp_add_u32(d, 0x00000006);

    usb_mtp_add_u16(d, 0x0064);

    usb_mtp_add_wstr(d, L"");

    usb_mtp_add_u16(d, 0x0000);

hw/usb/hcd-xhci.c

+4 −1
Original line number Diff line number Diff line
@@ -1531,7 +1531,10 @@ static TRBCCode xhci_disable_ep(XHCIState *xhci, unsigned int slotid, 
        usb_packet_cleanup(&epctx->transfers[i].packet);

    }



    /* only touch guest RAM if we're not resetting the HC */

    if (xhci->dcbaap_low || xhci->dcbaap_high) {

        xhci_set_ep_state(xhci, epctx, NULL, EP_DISABLED);

    }



    timer_free(epctx->kick_timer);

    g_free(epctx);

hw/usb/host-libusb.c

+12 −1
Original line number Diff line number Diff line
@@ -34,7 +34,9 @@ 
 */



#include "qemu/osdep.h"

#ifndef CONFIG_WIN32

#include <poll.h>

#endif

#include <libusb.h>



#include "qapi/error.h"
@@ -204,6 +206,8 @@ static const char *err_names[] = { 
static libusb_context *ctx;

static uint32_t loglevel;



#ifndef CONFIG_WIN32



static void usb_host_handle_fd(void *opaque)

{

    struct timeval tv = { 0, 0 };
@@ -223,9 +227,13 @@ static void usb_host_del_fd(int fd, void *user_data) 
    qemu_set_fd_handler(fd, NULL, NULL, NULL);

}



#endif /* !CONFIG_WIN32 */



static int usb_host_init(void)

{

#ifndef CONFIG_WIN32

    const struct libusb_pollfd **poll;

#endif

    int i, rc;



    if (ctx) {
@@ -236,7 +244,9 @@ static int usb_host_init(void) 
        return -1;

    }

    libusb_set_debug(ctx, loglevel);



#ifdef CONFIG_WIN32

    /* FIXME: add support for Windows. */

#else

    libusb_set_pollfd_notifiers(ctx, usb_host_add_fd,

                                usb_host_del_fd,

                                ctx);
@@ -247,6 +257,7 @@ static int usb_host_init(void) 
        }

    }

    free(poll);

#endif

    return 0;

}