Message ID | 1331641211-20077-1-git-send-email-kraxel@redhat.com |
---|---|
State | New |
Headers | show |
On 03/13/2012 07:19 AM, Gerd Hoffmann wrote: > Hi, > > This pull brings in the bug usb rename, i.e. move all usb emulation > source code into hw/usb/. Also UHCI got some love, featuring some > cleanups, some small fixes and full tracing support. Beside that it > brings the usual bunch of little fixes here and there. > > please pull, > Gerd Pulled. Thanks. Regards, Anthony Liguori > > The following changes since commit cb72b75824c0362e5cb32eb8796930f29fa36d17: > > Merge remote-tracking branch 'mdroth/qga-pull-3-12-2012' into staging (2012-03-12 20:52:34 -0500) > > are available in the git repository at: > > git://git.kraxel.org/qemu usb.44 > > Benjamin Herrenschmidt (1): > Endian fix an assertion in usb-msd > > Gerd Hoffmann (11): > usb: the big rename > usb: zap hw/ush-{ohic,uhci}.h + init wrappers > usb: improve packet state sanity checks > uhci: pass addr to uhci_async_alloc > uhci: fix uhci_async_cancel_all > uhci: cancel on schedule stop. > uhci: tracing support > uhci: use enum for uhci_handle_td return codes > uhci: renumber uhci_handle_td return codes > uhci: new uhci_handle_td return code for tds still in flight > uhci: alloc can't fail, drop check. > > Hans de Goede (1): > usb-ehci: drop unused isoch_pause variable > > Wei Yang (1): > usb-ohci: DMA writeback bug fixes > > Makefile.objs | 24 ++-- > Makefile.target | 2 +- > configure | 4 +- > hw/alpha_sys.h | 1 - > hw/mips_fulong2e.c | 7 +- > hw/mips_malta.c | 3 +- > hw/pc_piix.c | 4 +- > hw/ppc_newworld.c | 3 +- > hw/ppc_oldworld.c | 3 +- > hw/ppc_prep.c | 3 +- > hw/realview.c | 3 +- > hw/usb-ohci.h | 9 -- > hw/usb-uhci.h | 10 -- > hw/usb.h | 1 + > hw/{usb-bus.c => usb/bus.c} | 6 +- > hw/{usb.c => usb/core.c} | 39 +++++- > hw/{usb-desc.c => usb/desc.c} | 4 +- > hw/{usb-desc.h => usb/desc.h} | 0 > hw/{usb-audio.c => usb/dev-audio.c} | 8 +- > hw/{usb-bt.c => usb/dev-bluetooth.c} | 6 +- > hw/{usb-hid.c => usb/dev-hid.c} | 8 +- > hw/{usb-hub.c => usb/dev-hub.c} | 4 +- > hw/{usb-net.c => usb/dev-network.c} | 4 +- > hw/{usb-serial.c => usb/dev-serial.c} | 4 +- > hw/{usb-ccid.c => usb/dev-smartcard-reader.c} | 4 +- > hw/{usb-msd.c => usb/dev-storage.c} | 12 +- > hw/{usb-wacom.c => usb/dev-wacom.c} | 6 +- > hw/{usb-ehci.c => usb/hcd-ehci.c} | 12 +-- > hw/{usb-musb.c => usb/hcd-musb.c} | 6 +- > hw/{usb-ohci.c => usb/hcd-ohci.c} | 33 +++-- > hw/{usb-uhci.c => usb/hcd-uhci.c} | 156 ++++++++++--------------- > hw/{usb-xhci.c => usb/hcd-xhci.c} | 10 +- > usb-bsd.c => hw/usb/host-bsd.c | 0 > usb-linux.c => hw/usb/host-linux.c | 0 > usb-stub.c => hw/usb/host-stub.c | 0 > hw/{usb-libhw.c => usb/libhw.c} | 2 +- > usb-redir.c => hw/usb/redirect.c | 0 > hw/versatilepb.c | 3 +- > trace-events | 40 ++++++- > 39 files changed, 226 insertions(+), 218 deletions(-) > delete mode 100644 hw/usb-ohci.h > delete mode 100644 hw/usb-uhci.h > rename hw/{usb-bus.c => usb/bus.c} (99%) > rename hw/{usb.c => usb/core.c} (95%) > rename hw/{usb-desc.c => usb/desc.c} (99%) > rename hw/{usb-desc.h => usb/desc.h} (100%) > rename hw/{usb-audio.c => usb/dev-audio.c} (99%) > rename hw/{usb-bt.c => usb/dev-bluetooth.c} (99%) > rename hw/{usb-hid.c => usb/dev-hid.c} (99%) > rename hw/{usb-hub.c => usb/dev-hub.c} (99%) > rename hw/{usb-net.c => usb/dev-network.c} (99%) > rename hw/{usb-serial.c => usb/dev-serial.c} (99%) > rename hw/{usb-ccid.c => usb/dev-smartcard-reader.c} (99%) > rename hw/{usb-msd.c => usb/dev-storage.c} (98%) > rename hw/{usb-wacom.c => usb/dev-wacom.c} (99%) > rename hw/{usb-ehci.c => usb/hcd-ehci.c} (99%) > rename hw/{usb-musb.c => usb/hcd-musb.c} (99%) > rename hw/{usb-ohci.c => usb/hcd-ohci.c} (98%) > rename hw/{usb-uhci.c => usb/hcd-uhci.c} (91%) > rename hw/{usb-xhci.c => usb/hcd-xhci.c} (99%) > rename usb-bsd.c => hw/usb/host-bsd.c (100%) > rename usb-linux.c => hw/usb/host-linux.c (100%) > rename usb-stub.c => hw/usb/host-stub.c (100%) > rename hw/{usb-libhw.c => usb/libhw.c} (99%) > rename usb-redir.c => hw/usb/redirect.c (100%) > >