Michael S. Tsirkin 5e59b02435 Merge branch pci into master ...

Merge master and pci branch, resolve build breakage in hw/esp.c
introduced by f90c2bcd.

Conflicts:
	hw/esp.c

2012-07-29 17:05:35 +03:00

..

bus.c

usb: restore USBDevice->attached on vmload

2012-06-20 14:46:02 +02:00

core.c

Merge remote-tracking branch 'mjt/mjt-iov2' into staging

2012-07-09 12:35:06 -05:00

desc.c

qdev: Use wrapper for qdev_get_path

2012-06-18 15:14:38 +02:00

desc.h

usb: add serial number generator

2012-04-26 12:21:17 +02:00

dev-audio.c

usb: add serial number generator

2012-04-26 12:21:17 +02:00

dev-bluetooth.c

Allow machines to configure the QEMU_VERSION that's exposed via hardware

2012-06-19 13:36:56 -05:00

dev-hid.c

Allow machines to configure the QEMU_VERSION that's exposed via hardware

2012-06-19 13:36:56 -05:00

dev-hub.c

Allow machines to configure the QEMU_VERSION that's exposed via hardware

2012-06-19 13:36:56 -05:00

dev-network.c

hw, net: "net_client_type" -> "NetClientOptionsKind" (qapi-generated)

2012-07-23 11:55:18 +01:00

dev-serial.c

Allow machines to configure the QEMU_VERSION that's exposed via hardware

2012-06-19 13:36:56 -05:00

dev-smartcard-reader.c

Allow machines to configure the QEMU_VERSION that's exposed via hardware

2012-06-19 13:36:56 -05:00

dev-storage.c

hw/block-common: Factor out fall back to legacy -drive serial=...

2012-07-17 16:48:32 +02:00

dev-uas.c

usb: add usb attached scsi emulation

2012-07-12 15:00:39 +02:00

dev-wacom.c

Allow machines to configure the QEMU_VERSION that's exposed via hardware

2012-06-19 13:36:56 -05:00

hcd-ehci.c

ehci: improve expire time calculation

2012-07-12 15:00:50 +02:00

hcd-musb.c

usb: the big rename

2012-03-13 10:15:32 +01:00

hcd-ohci.c

usb-ohci: Use universal DMA helper functions

2012-06-27 16:33:25 -05:00

hcd-uhci.c

Merge branch pci into master

2012-07-29 17:05:35 +03:00

hcd-xhci.c

xhci: trace: slots

2012-06-07 10:02:22 +02:00

host-bsd.c

usb: the big rename

2012-03-13 10:15:32 +01:00

host-linux.c

usb-host: add trace events for iso xfers

2012-07-09 11:59:55 +02:00

host-stub.c

usb: the big rename

2012-03-13 10:15:32 +01:00

libhw.c

usb: Convert usb_packet_{map, unmap} to universal DMA helpers

2012-06-27 16:33:25 -05:00

Makefile.objs

usb: add usb attached scsi emulation

2012-07-12 15:00:39 +02:00

redirect.c

usb-redir: Correctly handle the usb_redir_babble usbredir status

2012-07-09 11:59:54 +02:00