Merge remote-tracking branch 'kraxel/usb.80' into staging

# By Gerd Hoffmann (6) and Hans de Goede (1)
# Via Gerd Hoffmann
* kraxel/usb.80:
  use libusb for usb-host
  xhci: fix address device
  xhci: use slotid as device address
  xhci: fix portsc writes
  xhci: add xhci_cap_write
  xhci: remove leftover debug printf
  usb-serial: Remove double call to qemu_chr_add_handlers( NULL )

Message-id: 1366107190[email protected]
Signed-off-by: Anthony Liguori <[email protected]>

diff --combined trace-events
index 968edb6988f799939600502706e89ceabf71329c,bf6bd85458aa7002d720fc37e008a85eddcfa8e2..581d67a14f10eaf9b93aa82da37b62648e7f239a
--- 1/trace-events
--- 2/trace-events
+++ b/trace-events
@@@ -362,6 -362,7 +362,7 @@@ usb_xhci_queue_event(uint32_t vector, u
  usb_xhci_fetch_trb(uint64_t addr, const char *name, uint64_t param, uint32_t status, uint32_t control) "addr %016" PRIx64 ", %s, p %016" PRIx64 ", s %08x, c 0x%08x"
  usb_xhci_port_reset(uint32_t port) "port %d"
  usb_xhci_port_link(uint32_t port, uint32_t pls) "port %d, pls %d"
+ usb_xhci_port_notify(uint32_t port, uint32_t pls) "port %d, bits %x"
  usb_xhci_slot_enable(uint32_t slotid) "slotid %d"
  usb_xhci_slot_disable(uint32_t slotid) "slotid %d"
  usb_xhci_slot_address(uint32_t slotid) "slotid %d"
@@@ -424,11 -425,15 +425,15 @@@ usb_host_open_success(int bus, int addr
  usb_host_open_failure(int bus, int addr) "dev %d:%d"
  usb_host_disconnect(int bus, int addr) "dev %d:%d"
  usb_host_close(int bus, int addr) "dev %d:%d"
+ usb_host_attach_kernel(int bus, int addr, int interface) "dev %d:%d, if %d"
+ usb_host_detach_kernel(int bus, int addr, int interface) "dev %d:%d, if %d"
  usb_host_set_address(int bus, int addr, int config) "dev %d:%d, address %d"
  usb_host_set_config(int bus, int addr, int config) "dev %d:%d, config %d"
  usb_host_set_interface(int bus, int addr, int interface, int alt) "dev %d:%d, interface %d, alt %d"
  usb_host_claim_interfaces(int bus, int addr, int config, int nif) "dev %d:%d, config %d, nif %d"
+ usb_host_claim_interface(int bus, int addr, int config, int interface) "dev %d:%d, config %d, if %d"
  usb_host_release_interfaces(int bus, int addr) "dev %d:%d"
+ usb_host_release_interface(int bus, int addr, int interface) "dev %d:%d, if %d"
  usb_host_req_control(int bus, int addr, void *p, int req, int value, int index) "dev %d:%d, packet %p, req 0x%x, value %d, index %d"
  usb_host_req_data(int bus, int addr, void *p, int in, int ep, int size) "dev %d:%d, packet %p, in %d, ep %d, size %d"
  usb_host_req_complete(int bus, int addr, void *p, int status, int length) "dev %d:%d, packet %p, status %d, length %d"
@@@ -962,10 -967,6 +967,10 @@@ dma_bdrv_cb(void *dbs, int ret) "dbs=%
  dma_map_wait(void *dbs) "dbs=%p"
  
  # console.h
 +console_gfx_new(void) ""
 +console_txt_new(int w, int h) "%dx%d"
 +console_select(int nr) "%d"
 +console_refresh(int interval) "interval %d ms"
  displaysurface_create(void *display_surface, int w, int h) "surface=%p, %dx%d"
  displaysurface_create_from(void *display_surface, int w, int h, int bpp, int swap) "surface=%p, %dx%d, bpp %d, bswap %d"
  displaysurface_free(void *display_surface) "surface=%p"
@@@ -974,13 -975,6 +979,13 @@@ displaychangelistener_unregister(void *
  
  # vga.c
  ppm_save(const char *filename, void *display_surface) "%s surface=%p"
 +vmware_value_read(uint32_t index, uint32_t value) "index %d, value 0x%x"
 +vmware_value_write(uint32_t index, uint32_t value) "index %d, value 0x%x"
 +vmware_palette_read(uint32_t index, uint32_t value) "index %d, value 0x%x"
 +vmware_palette_write(uint32_t index, uint32_t value) "index %d, value 0x%x"
 +vmware_scratch_read(uint32_t index, uint32_t value) "index %d, value 0x%x"
 +vmware_scratch_write(uint32_t index, uint32_t value) "index %d, value 0x%x"
 +vmware_setmode(uint32_t w, uint32_t h, uint32_t bpp) "%dx%d @ %d bpp"
  
  # savevm.c