diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-04 19:49:15 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-04 19:49:15 -0500 |
| commit | 938406dfb11d8a40d9228b3596d49a583d7218ff (patch) | |
| tree | e573870cfe8fa52868b4442b9f0bae799e44e537 /qdict.c | |
| parent | 4be403c8158e1b6be743f0fef004310cea4e3975 (diff) | |
| parent | 39c138c8420f51a7da7b35233a8d7400a0b589ac (diff) | |
| download | qemu-938406dfb11d8a40d9228b3596d49a583d7218ff.zip qemu-938406dfb11d8a40d9228b3596d49a583d7218ff.tar.gz qemu-938406dfb11d8a40d9228b3596d49a583d7218ff.tar.bz2 | |
Merge remote-tracking branch 'kraxel/usb.66' into staging
* kraxel/usb.66:
usb: Fix usb_packet_map() in the presence of IOMMUs
usb-redir: Adjust pkg-config check for usbredirparser .pc file rename (v2)
ehci: Fix interrupt packet MULT handling
xhci: create a memory region for each port
xhci: route string & usb hub support
xhci: tweak limits
compat: turn off msi/msix on xhci for old machine types
add pc-1.3 machine type
Conflicts:
hw/pc_piix.c
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qdict.c')
0 files changed, 0 insertions, 0 deletions