From patchwork Tue Mar 13 12:19:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 146409 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B23AFB6EEA for ; Wed, 14 Mar 2012 00:38:58 +1100 (EST) Received: from localhost ([::1]:53142 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7QjP-0001Fd-Uk for incoming@patchwork.ozlabs.org; Tue, 13 Mar 2012 08:21:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7QiU-0007Kw-Un for qemu-devel@nongnu.org; Tue, 13 Mar 2012 08:20:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7Qi7-0000vF-Lb for qemu-devel@nongnu.org; Tue, 13 Mar 2012 08:20:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28495) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7Qi7-0000uj-DZ for qemu-devel@nongnu.org; Tue, 13 Mar 2012 08:20:15 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2DCKEX5020472 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 13 Mar 2012 08:20:14 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-19.ams2.redhat.com [10.36.116.19]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q2DCKC8p000849; Tue, 13 Mar 2012 08:20:13 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id CD47941597; Tue, 13 Mar 2012 13:20:11 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2012 13:19:57 +0100 Message-Id: <1331641211-20077-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PULL 00/14] usb patch queue X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 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%)