* [Qemu-devel] [RfC PATCH 0/2] usb: reorganize source files.
@ 2012-03-08 9:16 Gerd Hoffmann
2012-03-08 9:16 ` [Qemu-devel] [RfC PATCH 1/2] usb: the big rename Gerd Hoffmann
` (3 more replies)
0 siblings, 4 replies; 14+ messages in thread
From: Gerd Hoffmann @ 2012-03-08 9:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Hi,
Plan is basically to move all usb stuff to hw/usb/
Comments?
cheers,
Gerd
Gerd Hoffmann (2):
usb: the big rename
usb: zap hw/ush-{ohic,uhci}.h + init wrappers
Makefile.objs | 22 ++++++++++++----------
Makefile.target | 2 +-
configure | 4 +++-
hw/alpha_sys.h | 1 -
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-bus.c => usb/bus.c} | 6 +++---
hw/{usb.c => usb/core.c} | 2 +-
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.c} | 0
hw/{usb-msd.c => usb/dev-storage.c} | 6 +++---
hw/{usb-wacom.c => usb/dev-wacom.c} | 6 +++---
hw/{usb-ehci.c => usb/hcd-ehci.c} | 6 +++---
hw/{usb-musb.c => usb/hcd-musb.c} | 6 +++---
hw/{usb-ohci.c => usb/hcd-ohci.c} | 16 +++++-----------
hw/{usb-uhci.c => usb/hcd-uhci.c} | 22 +++-------------------
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 +--
35 files changed, 71 insertions(+), 116 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} (99%)
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.c} (100%)
rename hw/{usb-msd.c => usb/dev-storage.c} (99%)
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} (99%)
rename hw/{usb-uhci.c => usb/hcd-uhci.c} (98%)
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%)
^ permalink raw reply [flat|nested] 14+ messages in thread* [Qemu-devel] [RfC PATCH 1/2] usb: the big rename 2012-03-08 9:16 [Qemu-devel] [RfC PATCH 0/2] usb: reorganize source files Gerd Hoffmann @ 2012-03-08 9:16 ` Gerd Hoffmann 2012-03-08 9:37 ` Alon Levy 2012-03-09 8:34 ` Paolo Bonzini 2012-03-08 9:16 ` [Qemu-devel] [RfC PATCH 2/2] usb: zap hw/ush-{ohic, uhci}.h + init wrappers Gerd Hoffmann ` (2 subsequent siblings) 3 siblings, 2 replies; 14+ messages in thread From: Gerd Hoffmann @ 2012-03-08 9:16 UTC (permalink / raw) To: qemu-devel; +Cc: Gerd Hoffmann Reorganize usb source files. Create a new hw/usb/ directory and move all usb source code to that place. Also make filenames a bit more descriptive. Host adapters are prefixed with "hch-" now, usb device emulations are prefixed with "dev-". Fixup paths Makefile and include paths to make it compile. No code changes. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- Makefile.objs | 22 ++++++++++++---------- Makefile.target | 2 +- configure | 4 +++- hw/{usb-bus.c => usb/bus.c} | 6 +++--- hw/{usb.c => usb/core.c} | 2 +- 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.c} | 0 hw/{usb-msd.c => usb/dev-storage.c} | 6 +++--- hw/{usb-wacom.c => usb/dev-wacom.c} | 6 +++--- hw/{usb-ehci.c => usb/hcd-ehci.c} | 6 +++--- hw/{usb-musb.c => usb/hcd-musb.c} | 6 +++--- hw/{usb-ohci.c => usb/hcd-ohci.c} | 12 ++++++------ hw/{usb-uhci.c => usb/hcd-uhci.c} | 8 ++++---- 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 26 files changed, 67 insertions(+), 63 deletions(-) rename hw/{usb-bus.c => usb/bus.c} (99%) rename hw/{usb.c => usb/core.c} (99%) 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.c} (100%) rename hw/{usb-msd.c => usb/dev-storage.c} (99%) 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} (99%) rename hw/{usb-uhci.c => usb/hcd-uhci.c} (99%) 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%) diff --git a/Makefile.objs b/Makefile.objs index 808de6a..a97338b 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -103,13 +103,15 @@ common-obj-y += eeprom93xx.o common-obj-y += scsi-disk.o cdrom.o common-obj-y += scsi-generic.o scsi-bus.o common-obj-y += hid.o -common-obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o -common-obj-y += usb-serial.o usb-net.o usb-bus.o usb-desc.o usb-audio.o +common-obj-y += usb/core.o usb/bus.o usb/desc.o usb/dev-hub.o +common-obj-y += usb/host-$(HOST_USB).o +common-obj-y += usb/dev-hid.o usb/dev-storage.o usb/dev-wacom.o +common-obj-y += usb/dev-serial.o usb/dev-network.o usb/dev-audio.o common-obj-$(CONFIG_SSI) += ssi.o common-obj-$(CONFIG_SSI_SD) += ssi-sd.o common-obj-$(CONFIG_SD) += sd.o -common-obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o -common-obj-y += bt-hci-csr.o +common-obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o +common-obj-y += bt-hci-csr.o usb/dev-bluetooth.o common-obj-y += buffered_file.o migration.o migration-tcp.o common-obj-y += qemu-char.o #aio.o common-obj-y += msmouse.o ps2.o @@ -190,7 +192,7 @@ user-obj-y += $(trace-obj-y) hw-obj-y = hw-obj-y += vl.o loader.o hw-obj-$(CONFIG_VIRTIO) += virtio-console.o -hw-obj-y += usb-libhw.o +hw-obj-y += usb/libhw.o hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o hw-obj-y += fw_cfg.o hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o @@ -213,10 +215,10 @@ hw-obj-$(CONFIG_PARALLEL) += parallel.o hw-obj-$(CONFIG_I8254) += i8254.o hw-obj-$(CONFIG_PCSPK) += pcspk.o hw-obj-$(CONFIG_PCKBD) += pckbd.o -hw-obj-$(CONFIG_USB_UHCI) += usb-uhci.o -hw-obj-$(CONFIG_USB_OHCI) += usb-ohci.o -hw-obj-$(CONFIG_USB_EHCI) += usb-ehci.o -hw-obj-$(CONFIG_USB_XHCI) += usb-xhci.o +hw-obj-$(CONFIG_USB_UHCI) += usb/hcd-uhci.o +hw-obj-$(CONFIG_USB_OHCI) += usb/hcd-ohci.o +hw-obj-$(CONFIG_USB_EHCI) += usb/hcd-ehci.o +hw-obj-$(CONFIG_USB_XHCI) += usb/hcd-xhci.o hw-obj-$(CONFIG_FDC) += fdc.o hw-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o hw-obj-$(CONFIG_APM) += pm_smbus.o apm.o @@ -226,7 +228,7 @@ hw-obj-$(CONFIG_HPET) += hpet.o hw-obj-$(CONFIG_APPLESMC) += applesmc.o hw-obj-$(CONFIG_SMARTCARD) += usb-ccid.o ccid-card-passthru.o hw-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o -hw-obj-$(CONFIG_USB_REDIR) += usb-redir.o +hw-obj-$(CONFIG_USB_REDIR) += usb/redirect.o hw-obj-$(CONFIG_I8259) += i8259_common.o i8259.o # PPC devices diff --git a/Makefile.target b/Makefile.target index 343eb78..16e6e4b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -365,7 +365,7 @@ obj-arm-y += omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \ obj-arm-y += omap2.o omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \ omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o obj-arm-y += omap_sx1.o palm.o tsc210x.o -obj-arm-y += nseries.o blizzard.o onenand.o cbus.o tusb6010.o usb-musb.o +obj-arm-y += nseries.o blizzard.o onenand.o cbus.o tusb6010.o usb/hcd-musb.o obj-arm-y += mst_fpga.o mainstone.o obj-arm-y += z2.o obj-arm-y += musicpal.o bitbang_i2c.o marvell_88w8618_audio.o diff --git a/configure b/configure index a5eb832..14fa213 100755 --- a/configure +++ b/configure @@ -3428,6 +3428,7 @@ mkdir -p $target_dir mkdir -p $target_dir/fpu mkdir -p $target_dir/tcg mkdir -p $target_dir/ide +mkdir -p $target_dir/usb mkdir -p $target_dir/9pfs mkdir -p $target_dir/kvm if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" -o "$target" = "arm-bsd-user" -o "$target" = "armeb-bsd-user" ; then @@ -3844,7 +3845,7 @@ done # for target in $targets DIRS="tests tests/tcg tests/tcg/cris slirp audio block net pc-bios/optionrom" DIRS="$DIRS pc-bios/spapr-rtas" DIRS="$DIRS roms/seabios roms/vgabios" -DIRS="$DIRS fsdev ui" +DIRS="$DIRS fsdev ui usb" DIRS="$DIRS qapi qapi-generated" DIRS="$DIRS qga trace qom" FILES="Makefile tests/tcg/Makefile qdict-test-data.txt" @@ -3885,6 +3886,7 @@ for hwlib in 32 64; do d=libhw$hwlib mkdir -p $d mkdir -p $d/ide + mkdir -p $d/usb symlink $source_path/Makefile.hw $d/Makefile mkdir -p $d/9pfs echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak diff --git a/hw/usb-bus.c b/hw/usb/bus.c similarity index 99% rename from hw/usb-bus.c rename to hw/usb/bus.c index 70b7ebc..d3f8358 100644 --- a/hw/usb-bus.c +++ b/hw/usb/bus.c @@ -1,6 +1,6 @@ -#include "hw.h" -#include "usb.h" -#include "qdev.h" +#include "hw/hw.h" +#include "hw/usb.h" +#include "hw/qdev.h" #include "sysemu.h" #include "monitor.h" #include "trace.h" diff --git a/hw/usb.c b/hw/usb/core.c similarity index 99% rename from hw/usb.c rename to hw/usb/core.c index 1ec2e90..494989a 100644 --- a/hw/usb.c +++ b/hw/usb/core.c @@ -24,7 +24,7 @@ * THE SOFTWARE. */ #include "qemu-common.h" -#include "usb.h" +#include "hw/usb.h" #include "iov.h" #include "trace.h" diff --git a/hw/usb-desc.c b/hw/usb/desc.c similarity index 99% rename from hw/usb-desc.c rename to hw/usb/desc.c index ccf85ad..9847a75 100644 --- a/hw/usb-desc.c +++ b/hw/usb/desc.c @@ -1,5 +1,5 @@ -#include "usb.h" -#include "usb-desc.h" +#include "hw/usb.h" +#include "hw/usb/desc.h" #include "trace.h" /* ------------------------------------------------------------------ */ diff --git a/hw/usb-desc.h b/hw/usb/desc.h similarity index 100% rename from hw/usb-desc.h rename to hw/usb/desc.h diff --git a/hw/usb-audio.c b/hw/usb/dev-audio.c similarity index 99% rename from hw/usb-audio.c rename to hw/usb/dev-audio.c index fed1361..426b95c 100644 --- a/hw/usb-audio.c +++ b/hw/usb/dev-audio.c @@ -30,10 +30,10 @@ */ #include "qemu-common.h" -#include "usb.h" -#include "usb-desc.h" -#include "hw.h" -#include "audiodev.h" +#include "hw/usb.h" +#include "hw/usb/desc.h" +#include "hw/hw.h" +#include "hw/audiodev.h" #include "audio/audio.h" #define USBAUDIO_VENDOR_NUM 0x46f4 /* CRC16() of "QEMU" */ diff --git a/hw/usb-bt.c b/hw/usb/dev-bluetooth.c similarity index 99% rename from hw/usb-bt.c rename to hw/usb/dev-bluetooth.c index 23c39ec..195370c 100644 --- a/hw/usb-bt.c +++ b/hw/usb/dev-bluetooth.c @@ -19,10 +19,10 @@ */ #include "qemu-common.h" -#include "usb.h" -#include "usb-desc.h" +#include "hw/usb.h" +#include "hw/usb/desc.h" #include "net.h" -#include "bt.h" +#include "hw/bt.h" struct USBBtState { USBDevice dev; diff --git a/hw/usb-hid.c b/hw/usb/dev-hid.c similarity index 99% rename from hw/usb-hid.c rename to hw/usb/dev-hid.c index 37bca78..f29544d 100644 --- a/hw/usb-hid.c +++ b/hw/usb/dev-hid.c @@ -22,12 +22,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" +#include "hw/hw.h" #include "console.h" -#include "usb.h" -#include "usb-desc.h" +#include "hw/usb.h" +#include "hw/usb/desc.h" #include "qemu-timer.h" -#include "hid.h" +#include "hw/hid.h" /* HID interface requests */ #define GET_REPORT 0xa101 diff --git a/hw/usb-hub.c b/hw/usb/dev-hub.c similarity index 99% rename from hw/usb-hub.c rename to hw/usb/dev-hub.c index a12856e..eb4e711 100644 --- a/hw/usb-hub.c +++ b/hw/usb/dev-hub.c @@ -22,8 +22,8 @@ * THE SOFTWARE. */ #include "qemu-common.h" -#include "usb.h" -#include "usb-desc.h" +#include "hw/usb.h" +#include "hw/usb/desc.h" //#define DEBUG diff --git a/hw/usb-net.c b/hw/usb/dev-network.c similarity index 99% rename from hw/usb-net.c rename to hw/usb/dev-network.c index 22b8201..cff55f2 100644 --- a/hw/usb-net.c +++ b/hw/usb/dev-network.c @@ -24,8 +24,8 @@ */ #include "qemu-common.h" -#include "usb.h" -#include "usb-desc.h" +#include "hw/usb.h" +#include "hw/usb/desc.h" #include "net.h" #include "qemu-queue.h" #include "sysemu.h" diff --git a/hw/usb-serial.c b/hw/usb/dev-serial.c similarity index 99% rename from hw/usb-serial.c rename to hw/usb/dev-serial.c index 0aae379..8dcac8b 100644 --- a/hw/usb-serial.c +++ b/hw/usb/dev-serial.c @@ -10,8 +10,8 @@ #include "qemu-common.h" #include "qemu-error.h" -#include "usb.h" -#include "usb-desc.h" +#include "hw/usb.h" +#include "hw/usb/desc.h" #include "qemu-char.h" //#define DEBUG_Serial diff --git a/hw/usb-ccid.c b/hw/usb/dev-smartcard.c similarity index 100% rename from hw/usb-ccid.c rename to hw/usb/dev-smartcard.c diff --git a/hw/usb-msd.c b/hw/usb/dev-storage.c similarity index 99% rename from hw/usb-msd.c rename to hw/usb/dev-storage.c index c6f08a0..6ffaf70 100644 --- a/hw/usb-msd.c +++ b/hw/usb/dev-storage.c @@ -10,9 +10,9 @@ #include "qemu-common.h" #include "qemu-option.h" #include "qemu-config.h" -#include "usb.h" -#include "usb-desc.h" -#include "scsi.h" +#include "hw/usb.h" +#include "hw/usb/desc.h" +#include "hw/scsi.h" #include "console.h" #include "monitor.h" #include "sysemu.h" diff --git a/hw/usb-wacom.c b/hw/usb/dev-wacom.c similarity index 99% rename from hw/usb-wacom.c rename to hw/usb/dev-wacom.c index 197e2dc..c1cfd74 100644 --- a/hw/usb-wacom.c +++ b/hw/usb/dev-wacom.c @@ -25,10 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" +#include "hw/hw.h" #include "console.h" -#include "usb.h" -#include "usb-desc.h" +#include "hw/usb.h" +#include "hw/usb/desc.h" /* Interface requests */ #define WACOM_GET_REPORT 0x2101 diff --git a/hw/usb-ehci.c b/hw/usb/hcd-ehci.c similarity index 99% rename from hw/usb-ehci.c rename to hw/usb/hcd-ehci.c index df742f7..58811d3 100644 --- a/hw/usb-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -22,10 +22,10 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "qemu-timer.h" -#include "usb.h" -#include "pci.h" +#include "hw/usb.h" +#include "hw/pci.h" #include "monitor.h" #include "trace.h" #include "dma.h" diff --git a/hw/usb-musb.c b/hw/usb/hcd-musb.c similarity index 99% rename from hw/usb-musb.c rename to hw/usb/hcd-musb.c index 820907a..fa9385e 100644 --- a/hw/usb-musb.c +++ b/hw/usb/hcd-musb.c @@ -22,9 +22,9 @@ */ #include "qemu-common.h" #include "qemu-timer.h" -#include "usb.h" -#include "irq.h" -#include "hw.h" +#include "hw/usb.h" +#include "hw/irq.h" +#include "hw/hw.h" /* Common USB registers */ #define MUSB_HDRC_FADDR 0x00 /* 8-bit */ diff --git a/hw/usb-ohci.c b/hw/usb/hcd-ohci.c similarity index 99% rename from hw/usb-ohci.c rename to hw/usb/hcd-ohci.c index 20aaa74..dd79cef 100644 --- a/hw/usb-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -26,13 +26,13 @@ * o BIOS work to boot from USB storage */ -#include "hw.h" +#include "hw/hw.h" #include "qemu-timer.h" -#include "usb.h" -#include "pci.h" -#include "usb-ohci.h" -#include "sysbus.h" -#include "qdev-addr.h" +#include "hw/usb.h" +#include "hw/pci.h" +#include "hw/usb-ohci.h" +#include "hw/sysbus.h" +#include "hw/qdev-addr.h" //#define DEBUG_OHCI /* Dump packet contents. */ diff --git a/hw/usb-uhci.c b/hw/usb/hcd-uhci.c similarity index 99% rename from hw/usb-uhci.c rename to hw/usb/hcd-uhci.c index 304b84b..7c2e9b3 100644 --- a/hw/usb-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -25,11 +25,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "usb.h" -#include "pci.h" +#include "hw/hw.h" +#include "hw/usb.h" +#include "hw/pci.h" #include "qemu-timer.h" -#include "usb-uhci.h" +#include "hw/usb-uhci.h" #include "iov.h" #include "dma.h" diff --git a/hw/usb-xhci.c b/hw/usb/hcd-xhci.c similarity index 99% rename from hw/usb-xhci.c rename to hw/usb/hcd-xhci.c index e8f1b6e..73b0c7f 100644 --- a/hw/usb-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -18,12 +18,12 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "hw.h" +#include "hw/hw.h" #include "qemu-timer.h" -#include "usb.h" -#include "pci.h" -#include "qdev-addr.h" -#include "msi.h" +#include "hw/usb.h" +#include "hw/pci.h" +#include "hw/qdev-addr.h" +#include "hw/msi.h" //#define DEBUG_XHCI //#define DEBUG_DATA diff --git a/usb-bsd.c b/hw/usb/host-bsd.c similarity index 100% rename from usb-bsd.c rename to hw/usb/host-bsd.c diff --git a/usb-linux.c b/hw/usb/host-linux.c similarity index 100% rename from usb-linux.c rename to hw/usb/host-linux.c diff --git a/usb-stub.c b/hw/usb/host-stub.c similarity index 100% rename from usb-stub.c rename to hw/usb/host-stub.c diff --git a/hw/usb-libhw.c b/hw/usb/libhw.c similarity index 99% rename from hw/usb-libhw.c rename to hw/usb/libhw.c index 162b42b..2462351 100644 --- a/hw/usb-libhw.c +++ b/hw/usb/libhw.c @@ -21,7 +21,7 @@ */ #include "qemu-common.h" #include "cpu-common.h" -#include "usb.h" +#include "hw/usb.h" #include "dma.h" int usb_packet_map(USBPacket *p, QEMUSGList *sgl) diff --git a/usb-redir.c b/hw/usb/redirect.c similarity index 100% rename from usb-redir.c rename to hw/usb/redirect.c -- 1.7.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [RfC PATCH 1/2] usb: the big rename 2012-03-08 9:16 ` [Qemu-devel] [RfC PATCH 1/2] usb: the big rename Gerd Hoffmann @ 2012-03-08 9:37 ` Alon Levy 2012-03-09 8:34 ` Paolo Bonzini 1 sibling, 0 replies; 14+ messages in thread From: Alon Levy @ 2012-03-08 9:37 UTC (permalink / raw) To: Gerd Hoffmann; +Cc: qemu-devel On Thu, Mar 08, 2012 at 10:16:21AM +0100, Gerd Hoffmann wrote: > Reorganize usb source files. Create a new hw/usb/ directory and move > all usb source code to that place. Also make filenames a bit more > descriptive. Host adapters are prefixed with "hch-" now, usb device > emulations are prefixed with "dev-". Fixup paths Makefile and include > paths to make it compile. No code changes. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > Makefile.objs | 22 ++++++++++++---------- > Makefile.target | 2 +- > configure | 4 +++- > hw/{usb-bus.c => usb/bus.c} | 6 +++--- > hw/{usb.c => usb/core.c} | 2 +- > 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.c} | 0 CCID is the name of the specification. Smartcard might be more descriptive, but if you want to be both descriptive and accurate you could do dev-smartcard-reader.c . > hw/{usb-msd.c => usb/dev-storage.c} | 6 +++--- > hw/{usb-wacom.c => usb/dev-wacom.c} | 6 +++--- > hw/{usb-ehci.c => usb/hcd-ehci.c} | 6 +++--- > hw/{usb-musb.c => usb/hcd-musb.c} | 6 +++--- > hw/{usb-ohci.c => usb/hcd-ohci.c} | 12 ++++++------ > hw/{usb-uhci.c => usb/hcd-uhci.c} | 8 ++++---- > 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 > 26 files changed, 67 insertions(+), 63 deletions(-) > rename hw/{usb-bus.c => usb/bus.c} (99%) > rename hw/{usb.c => usb/core.c} (99%) > 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.c} (100%) > rename hw/{usb-msd.c => usb/dev-storage.c} (99%) > 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} (99%) > rename hw/{usb-uhci.c => usb/hcd-uhci.c} (99%) > 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%) > > diff --git a/Makefile.objs b/Makefile.objs > index 808de6a..a97338b 100644 > --- a/Makefile.objs > +++ b/Makefile.objs > @@ -103,13 +103,15 @@ common-obj-y += eeprom93xx.o > common-obj-y += scsi-disk.o cdrom.o > common-obj-y += scsi-generic.o scsi-bus.o > common-obj-y += hid.o > -common-obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o > -common-obj-y += usb-serial.o usb-net.o usb-bus.o usb-desc.o usb-audio.o > +common-obj-y += usb/core.o usb/bus.o usb/desc.o usb/dev-hub.o > +common-obj-y += usb/host-$(HOST_USB).o > +common-obj-y += usb/dev-hid.o usb/dev-storage.o usb/dev-wacom.o > +common-obj-y += usb/dev-serial.o usb/dev-network.o usb/dev-audio.o > common-obj-$(CONFIG_SSI) += ssi.o > common-obj-$(CONFIG_SSI_SD) += ssi-sd.o > common-obj-$(CONFIG_SD) += sd.o > -common-obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o > -common-obj-y += bt-hci-csr.o > +common-obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o > +common-obj-y += bt-hci-csr.o usb/dev-bluetooth.o > common-obj-y += buffered_file.o migration.o migration-tcp.o > common-obj-y += qemu-char.o #aio.o > common-obj-y += msmouse.o ps2.o > @@ -190,7 +192,7 @@ user-obj-y += $(trace-obj-y) > hw-obj-y = > hw-obj-y += vl.o loader.o > hw-obj-$(CONFIG_VIRTIO) += virtio-console.o > -hw-obj-y += usb-libhw.o > +hw-obj-y += usb/libhw.o > hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o > hw-obj-y += fw_cfg.o > hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o > @@ -213,10 +215,10 @@ hw-obj-$(CONFIG_PARALLEL) += parallel.o > hw-obj-$(CONFIG_I8254) += i8254.o > hw-obj-$(CONFIG_PCSPK) += pcspk.o > hw-obj-$(CONFIG_PCKBD) += pckbd.o > -hw-obj-$(CONFIG_USB_UHCI) += usb-uhci.o > -hw-obj-$(CONFIG_USB_OHCI) += usb-ohci.o > -hw-obj-$(CONFIG_USB_EHCI) += usb-ehci.o > -hw-obj-$(CONFIG_USB_XHCI) += usb-xhci.o > +hw-obj-$(CONFIG_USB_UHCI) += usb/hcd-uhci.o > +hw-obj-$(CONFIG_USB_OHCI) += usb/hcd-ohci.o > +hw-obj-$(CONFIG_USB_EHCI) += usb/hcd-ehci.o > +hw-obj-$(CONFIG_USB_XHCI) += usb/hcd-xhci.o > hw-obj-$(CONFIG_FDC) += fdc.o > hw-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o > hw-obj-$(CONFIG_APM) += pm_smbus.o apm.o > @@ -226,7 +228,7 @@ hw-obj-$(CONFIG_HPET) += hpet.o > hw-obj-$(CONFIG_APPLESMC) += applesmc.o > hw-obj-$(CONFIG_SMARTCARD) += usb-ccid.o ccid-card-passthru.o > hw-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o > -hw-obj-$(CONFIG_USB_REDIR) += usb-redir.o > +hw-obj-$(CONFIG_USB_REDIR) += usb/redirect.o > hw-obj-$(CONFIG_I8259) += i8259_common.o i8259.o > > # PPC devices > diff --git a/Makefile.target b/Makefile.target > index 343eb78..16e6e4b 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -365,7 +365,7 @@ obj-arm-y += omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \ > obj-arm-y += omap2.o omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \ > omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o > obj-arm-y += omap_sx1.o palm.o tsc210x.o > -obj-arm-y += nseries.o blizzard.o onenand.o cbus.o tusb6010.o usb-musb.o > +obj-arm-y += nseries.o blizzard.o onenand.o cbus.o tusb6010.o usb/hcd-musb.o > obj-arm-y += mst_fpga.o mainstone.o > obj-arm-y += z2.o > obj-arm-y += musicpal.o bitbang_i2c.o marvell_88w8618_audio.o > diff --git a/configure b/configure > index a5eb832..14fa213 100755 > --- a/configure > +++ b/configure > @@ -3428,6 +3428,7 @@ mkdir -p $target_dir > mkdir -p $target_dir/fpu > mkdir -p $target_dir/tcg > mkdir -p $target_dir/ide > +mkdir -p $target_dir/usb > mkdir -p $target_dir/9pfs > mkdir -p $target_dir/kvm > if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" -o "$target" = "arm-bsd-user" -o "$target" = "armeb-bsd-user" ; then > @@ -3844,7 +3845,7 @@ done # for target in $targets > DIRS="tests tests/tcg tests/tcg/cris slirp audio block net pc-bios/optionrom" > DIRS="$DIRS pc-bios/spapr-rtas" > DIRS="$DIRS roms/seabios roms/vgabios" > -DIRS="$DIRS fsdev ui" > +DIRS="$DIRS fsdev ui usb" > DIRS="$DIRS qapi qapi-generated" > DIRS="$DIRS qga trace qom" > FILES="Makefile tests/tcg/Makefile qdict-test-data.txt" > @@ -3885,6 +3886,7 @@ for hwlib in 32 64; do > d=libhw$hwlib > mkdir -p $d > mkdir -p $d/ide > + mkdir -p $d/usb > symlink $source_path/Makefile.hw $d/Makefile > mkdir -p $d/9pfs > echo "QEMU_CFLAGS+=-DTARGET_PHYS_ADDR_BITS=$hwlib" > $d/config.mak > diff --git a/hw/usb-bus.c b/hw/usb/bus.c > similarity index 99% > rename from hw/usb-bus.c > rename to hw/usb/bus.c > index 70b7ebc..d3f8358 100644 > --- a/hw/usb-bus.c > +++ b/hw/usb/bus.c > @@ -1,6 +1,6 @@ > -#include "hw.h" > -#include "usb.h" > -#include "qdev.h" > +#include "hw/hw.h" > +#include "hw/usb.h" > +#include "hw/qdev.h" > #include "sysemu.h" > #include "monitor.h" > #include "trace.h" > diff --git a/hw/usb.c b/hw/usb/core.c > similarity index 99% > rename from hw/usb.c > rename to hw/usb/core.c > index 1ec2e90..494989a 100644 > --- a/hw/usb.c > +++ b/hw/usb/core.c > @@ -24,7 +24,7 @@ > * THE SOFTWARE. > */ > #include "qemu-common.h" > -#include "usb.h" > +#include "hw/usb.h" > #include "iov.h" > #include "trace.h" > > diff --git a/hw/usb-desc.c b/hw/usb/desc.c > similarity index 99% > rename from hw/usb-desc.c > rename to hw/usb/desc.c > index ccf85ad..9847a75 100644 > --- a/hw/usb-desc.c > +++ b/hw/usb/desc.c > @@ -1,5 +1,5 @@ > -#include "usb.h" > -#include "usb-desc.h" > +#include "hw/usb.h" > +#include "hw/usb/desc.h" > #include "trace.h" > > /* ------------------------------------------------------------------ */ > diff --git a/hw/usb-desc.h b/hw/usb/desc.h > similarity index 100% > rename from hw/usb-desc.h > rename to hw/usb/desc.h > diff --git a/hw/usb-audio.c b/hw/usb/dev-audio.c > similarity index 99% > rename from hw/usb-audio.c > rename to hw/usb/dev-audio.c > index fed1361..426b95c 100644 > --- a/hw/usb-audio.c > +++ b/hw/usb/dev-audio.c > @@ -30,10 +30,10 @@ > */ > > #include "qemu-common.h" > -#include "usb.h" > -#include "usb-desc.h" > -#include "hw.h" > -#include "audiodev.h" > +#include "hw/usb.h" > +#include "hw/usb/desc.h" > +#include "hw/hw.h" > +#include "hw/audiodev.h" > #include "audio/audio.h" > > #define USBAUDIO_VENDOR_NUM 0x46f4 /* CRC16() of "QEMU" */ > diff --git a/hw/usb-bt.c b/hw/usb/dev-bluetooth.c > similarity index 99% > rename from hw/usb-bt.c > rename to hw/usb/dev-bluetooth.c > index 23c39ec..195370c 100644 > --- a/hw/usb-bt.c > +++ b/hw/usb/dev-bluetooth.c > @@ -19,10 +19,10 @@ > */ > > #include "qemu-common.h" > -#include "usb.h" > -#include "usb-desc.h" > +#include "hw/usb.h" > +#include "hw/usb/desc.h" > #include "net.h" > -#include "bt.h" > +#include "hw/bt.h" > > struct USBBtState { > USBDevice dev; > diff --git a/hw/usb-hid.c b/hw/usb/dev-hid.c > similarity index 99% > rename from hw/usb-hid.c > rename to hw/usb/dev-hid.c > index 37bca78..f29544d 100644 > --- a/hw/usb-hid.c > +++ b/hw/usb/dev-hid.c > @@ -22,12 +22,12 @@ > * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > * THE SOFTWARE. > */ > -#include "hw.h" > +#include "hw/hw.h" > #include "console.h" > -#include "usb.h" > -#include "usb-desc.h" > +#include "hw/usb.h" > +#include "hw/usb/desc.h" > #include "qemu-timer.h" > -#include "hid.h" > +#include "hw/hid.h" > > /* HID interface requests */ > #define GET_REPORT 0xa101 > diff --git a/hw/usb-hub.c b/hw/usb/dev-hub.c > similarity index 99% > rename from hw/usb-hub.c > rename to hw/usb/dev-hub.c > index a12856e..eb4e711 100644 > --- a/hw/usb-hub.c > +++ b/hw/usb/dev-hub.c > @@ -22,8 +22,8 @@ > * THE SOFTWARE. > */ > #include "qemu-common.h" > -#include "usb.h" > -#include "usb-desc.h" > +#include "hw/usb.h" > +#include "hw/usb/desc.h" > > //#define DEBUG > > diff --git a/hw/usb-net.c b/hw/usb/dev-network.c > similarity index 99% > rename from hw/usb-net.c > rename to hw/usb/dev-network.c > index 22b8201..cff55f2 100644 > --- a/hw/usb-net.c > +++ b/hw/usb/dev-network.c > @@ -24,8 +24,8 @@ > */ > > #include "qemu-common.h" > -#include "usb.h" > -#include "usb-desc.h" > +#include "hw/usb.h" > +#include "hw/usb/desc.h" > #include "net.h" > #include "qemu-queue.h" > #include "sysemu.h" > diff --git a/hw/usb-serial.c b/hw/usb/dev-serial.c > similarity index 99% > rename from hw/usb-serial.c > rename to hw/usb/dev-serial.c > index 0aae379..8dcac8b 100644 > --- a/hw/usb-serial.c > +++ b/hw/usb/dev-serial.c > @@ -10,8 +10,8 @@ > > #include "qemu-common.h" > #include "qemu-error.h" > -#include "usb.h" > -#include "usb-desc.h" > +#include "hw/usb.h" > +#include "hw/usb/desc.h" > #include "qemu-char.h" > > //#define DEBUG_Serial > diff --git a/hw/usb-ccid.c b/hw/usb/dev-smartcard.c > similarity index 100% > rename from hw/usb-ccid.c > rename to hw/usb/dev-smartcard.c > diff --git a/hw/usb-msd.c b/hw/usb/dev-storage.c > similarity index 99% > rename from hw/usb-msd.c > rename to hw/usb/dev-storage.c > index c6f08a0..6ffaf70 100644 > --- a/hw/usb-msd.c > +++ b/hw/usb/dev-storage.c > @@ -10,9 +10,9 @@ > #include "qemu-common.h" > #include "qemu-option.h" > #include "qemu-config.h" > -#include "usb.h" > -#include "usb-desc.h" > -#include "scsi.h" > +#include "hw/usb.h" > +#include "hw/usb/desc.h" > +#include "hw/scsi.h" > #include "console.h" > #include "monitor.h" > #include "sysemu.h" > diff --git a/hw/usb-wacom.c b/hw/usb/dev-wacom.c > similarity index 99% > rename from hw/usb-wacom.c > rename to hw/usb/dev-wacom.c > index 197e2dc..c1cfd74 100644 > --- a/hw/usb-wacom.c > +++ b/hw/usb/dev-wacom.c > @@ -25,10 +25,10 @@ > * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > * THE SOFTWARE. > */ > -#include "hw.h" > +#include "hw/hw.h" > #include "console.h" > -#include "usb.h" > -#include "usb-desc.h" > +#include "hw/usb.h" > +#include "hw/usb/desc.h" > > /* Interface requests */ > #define WACOM_GET_REPORT 0x2101 > diff --git a/hw/usb-ehci.c b/hw/usb/hcd-ehci.c > similarity index 99% > rename from hw/usb-ehci.c > rename to hw/usb/hcd-ehci.c > index df742f7..58811d3 100644 > --- a/hw/usb-ehci.c > +++ b/hw/usb/hcd-ehci.c > @@ -22,10 +22,10 @@ > * along with this program; if not, see <http://www.gnu.org/licenses/>. > */ > > -#include "hw.h" > +#include "hw/hw.h" > #include "qemu-timer.h" > -#include "usb.h" > -#include "pci.h" > +#include "hw/usb.h" > +#include "hw/pci.h" > #include "monitor.h" > #include "trace.h" > #include "dma.h" > diff --git a/hw/usb-musb.c b/hw/usb/hcd-musb.c > similarity index 99% > rename from hw/usb-musb.c > rename to hw/usb/hcd-musb.c > index 820907a..fa9385e 100644 > --- a/hw/usb-musb.c > +++ b/hw/usb/hcd-musb.c > @@ -22,9 +22,9 @@ > */ > #include "qemu-common.h" > #include "qemu-timer.h" > -#include "usb.h" > -#include "irq.h" > -#include "hw.h" > +#include "hw/usb.h" > +#include "hw/irq.h" > +#include "hw/hw.h" > > /* Common USB registers */ > #define MUSB_HDRC_FADDR 0x00 /* 8-bit */ > diff --git a/hw/usb-ohci.c b/hw/usb/hcd-ohci.c > similarity index 99% > rename from hw/usb-ohci.c > rename to hw/usb/hcd-ohci.c > index 20aaa74..dd79cef 100644 > --- a/hw/usb-ohci.c > +++ b/hw/usb/hcd-ohci.c > @@ -26,13 +26,13 @@ > * o BIOS work to boot from USB storage > */ > > -#include "hw.h" > +#include "hw/hw.h" > #include "qemu-timer.h" > -#include "usb.h" > -#include "pci.h" > -#include "usb-ohci.h" > -#include "sysbus.h" > -#include "qdev-addr.h" > +#include "hw/usb.h" > +#include "hw/pci.h" > +#include "hw/usb-ohci.h" > +#include "hw/sysbus.h" > +#include "hw/qdev-addr.h" > > //#define DEBUG_OHCI > /* Dump packet contents. */ > diff --git a/hw/usb-uhci.c b/hw/usb/hcd-uhci.c > similarity index 99% > rename from hw/usb-uhci.c > rename to hw/usb/hcd-uhci.c > index 304b84b..7c2e9b3 100644 > --- a/hw/usb-uhci.c > +++ b/hw/usb/hcd-uhci.c > @@ -25,11 +25,11 @@ > * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > * THE SOFTWARE. > */ > -#include "hw.h" > -#include "usb.h" > -#include "pci.h" > +#include "hw/hw.h" > +#include "hw/usb.h" > +#include "hw/pci.h" > #include "qemu-timer.h" > -#include "usb-uhci.h" > +#include "hw/usb-uhci.h" > #include "iov.h" > #include "dma.h" > > diff --git a/hw/usb-xhci.c b/hw/usb/hcd-xhci.c > similarity index 99% > rename from hw/usb-xhci.c > rename to hw/usb/hcd-xhci.c > index e8f1b6e..73b0c7f 100644 > --- a/hw/usb-xhci.c > +++ b/hw/usb/hcd-xhci.c > @@ -18,12 +18,12 @@ > * You should have received a copy of the GNU Lesser General Public > * License along with this library; if not, see <http://www.gnu.org/licenses/>. > */ > -#include "hw.h" > +#include "hw/hw.h" > #include "qemu-timer.h" > -#include "usb.h" > -#include "pci.h" > -#include "qdev-addr.h" > -#include "msi.h" > +#include "hw/usb.h" > +#include "hw/pci.h" > +#include "hw/qdev-addr.h" > +#include "hw/msi.h" > > //#define DEBUG_XHCI > //#define DEBUG_DATA > diff --git a/usb-bsd.c b/hw/usb/host-bsd.c > similarity index 100% > rename from usb-bsd.c > rename to hw/usb/host-bsd.c > diff --git a/usb-linux.c b/hw/usb/host-linux.c > similarity index 100% > rename from usb-linux.c > rename to hw/usb/host-linux.c > diff --git a/usb-stub.c b/hw/usb/host-stub.c > similarity index 100% > rename from usb-stub.c > rename to hw/usb/host-stub.c > diff --git a/hw/usb-libhw.c b/hw/usb/libhw.c > similarity index 99% > rename from hw/usb-libhw.c > rename to hw/usb/libhw.c > index 162b42b..2462351 100644 > --- a/hw/usb-libhw.c > +++ b/hw/usb/libhw.c > @@ -21,7 +21,7 @@ > */ > #include "qemu-common.h" > #include "cpu-common.h" > -#include "usb.h" > +#include "hw/usb.h" > #include "dma.h" > > int usb_packet_map(USBPacket *p, QEMUSGList *sgl) > diff --git a/usb-redir.c b/hw/usb/redirect.c > similarity index 100% > rename from usb-redir.c > rename to hw/usb/redirect.c > -- > 1.7.1 > > ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [RfC PATCH 1/2] usb: the big rename 2012-03-08 9:16 ` [Qemu-devel] [RfC PATCH 1/2] usb: the big rename Gerd Hoffmann 2012-03-08 9:37 ` Alon Levy @ 2012-03-09 8:34 ` Paolo Bonzini 2012-03-09 8:42 ` Gerd Hoffmann 1 sibling, 1 reply; 14+ messages in thread From: Paolo Bonzini @ 2012-03-09 8:34 UTC (permalink / raw) To: Gerd Hoffmann; +Cc: qemu-devel Il 08/03/2012 10:16, Gerd Hoffmann ha scritto: > Reorganize usb source files. Create a new hw/usb/ directory and move > all usb source code to that place. Also make filenames a bit more > descriptive. Host adapters are prefixed with "hch-" now Nice tribute to Christoph, but I think I prefer hcd- as is in the patch. :) , usb device > emulations are prefixed with "dev-". Fixup paths Makefile and include > paths to make it compile. No code changes. Let's start using include/usb instead? Paolo ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [RfC PATCH 1/2] usb: the big rename 2012-03-09 8:34 ` Paolo Bonzini @ 2012-03-09 8:42 ` Gerd Hoffmann 2012-03-09 8:52 ` Paolo Bonzini 0 siblings, 1 reply; 14+ messages in thread From: Gerd Hoffmann @ 2012-03-09 8:42 UTC (permalink / raw) To: Paolo Bonzini; +Cc: qemu-devel Hi, >> emulations are prefixed with "dev-". Fixup paths Makefile and include >> paths to make it compile. No code changes. > > Let's start using include/usb instead? I think that needs a few more cleanups beforehand, there is a single usb.h now, guess I better should split that into usb-private and external-interfaces first. Also IIRC include/ is (also?) meant for the data structures code generators (qapi, visitors) want look at. cheers, Gerd ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [RfC PATCH 1/2] usb: the big rename 2012-03-09 8:42 ` Gerd Hoffmann @ 2012-03-09 8:52 ` Paolo Bonzini 2012-03-09 9:26 ` Gerd Hoffmann 0 siblings, 1 reply; 14+ messages in thread From: Paolo Bonzini @ 2012-03-09 8:52 UTC (permalink / raw) To: Gerd Hoffmann; +Cc: qemu-devel Il 09/03/2012 09:42, Gerd Hoffmann ha scritto: >>> emulations are prefixed with "dev-". Fixup paths Makefile and include >>> >> paths to make it compile. No code changes. >> > >> > Let's start using include/usb instead? > I think that needs a few more cleanups beforehand, there is a single > usb.h now, guess I better should split that into usb-private and > external-interfaces first. > > Also IIRC include/ is (also?) meant for the data structures code > generators (qapi, visitors) want look at. As I understood it, the idea is to make it simply Linux-like, with public headers in include/ and private headers elsewhere. So even interfaces that are private to the USB layer, but shared among multiple directories would be in include/. I suppose the external interfaces are just to support legacy command-line and the like? Paolo ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [RfC PATCH 1/2] usb: the big rename 2012-03-09 8:52 ` Paolo Bonzini @ 2012-03-09 9:26 ` Gerd Hoffmann 0 siblings, 0 replies; 14+ messages in thread From: Gerd Hoffmann @ 2012-03-09 9:26 UTC (permalink / raw) To: Paolo Bonzini; +Cc: qemu-devel Hi, > As I understood it, the idea is to make it simply Linux-like, with > public headers in include/ and private headers elsewhere. > > So even interfaces that are private to the USB layer, but shared among > multiple directories would be in include/. > > I suppose the external interfaces are just to support legacy > command-line and the like? Yes, I think legacy cmd line is there. Not much else. cheers, Gerd ^ permalink raw reply [flat|nested] 14+ messages in thread
* [Qemu-devel] [RfC PATCH 2/2] usb: zap hw/ush-{ohic, uhci}.h + init wrappers 2012-03-08 9:16 [Qemu-devel] [RfC PATCH 0/2] usb: reorganize source files Gerd Hoffmann 2012-03-08 9:16 ` [Qemu-devel] [RfC PATCH 1/2] usb: the big rename Gerd Hoffmann @ 2012-03-08 9:16 ` Gerd Hoffmann 2012-03-08 21:29 ` [Qemu-devel] [RfC PATCH 0/2] usb: reorganize source files Andreas Färber 2012-03-08 21:37 ` Anthony Liguori 3 siblings, 0 replies; 14+ messages in thread From: Gerd Hoffmann @ 2012-03-08 9:16 UTC (permalink / raw) To: qemu-devel; +Cc: Gerd Hoffmann Remove the uhci and ohci init wrappers, which all wrapped a pci_create_simple() one-liner. Switch callsites to call pci_create_simple directly. Remove the header files where the wrappers where declared. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- hw/alpha_sys.h | 1 - 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/hcd-ohci.c | 6 ------ hw/usb/hcd-uhci.c | 16 ---------------- hw/versatilepb.c | 3 +-- 11 files changed, 6 insertions(+), 55 deletions(-) delete mode 100644 hw/usb-ohci.h delete mode 100644 hw/usb-uhci.h diff --git a/hw/alpha_sys.h b/hw/alpha_sys.h index d54b18f..f9506c6 100644 --- a/hw/alpha_sys.h +++ b/hw/alpha_sys.h @@ -8,7 +8,6 @@ #include "ide.h" #include "net.h" #include "pc.h" -#include "usb-ohci.h" #include "irq.h" diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 6c5c40f..3f99f9a 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -28,8 +28,6 @@ #include "pc.h" #include "apic.h" #include "pci.h" -#include "usb-uhci.h" -#include "usb-ohci.h" #include "net.h" #include "boards.h" #include "ide.h" @@ -284,7 +282,7 @@ static void pc_init1(MemoryRegion *system_memory, floppy, idebus[0], idebus[1], rtc_state); if (pci_enabled && usb_enabled) { - usb_uhci_piix3_init(pci_bus, piix3_devfn + 2); + pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci"); } if (pci_enabled && acpi_enabled) { diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index 506187b..2fec5b4 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -54,7 +54,6 @@ #include "nvram.h" #include "pc.h" #include "pci.h" -#include "usb-ohci.h" #include "net.h" #include "sysemu.h" #include "boards.h" @@ -352,7 +351,7 @@ static void ppc_core99_init (ram_addr_t ram_size, dbdma_mem, cuda_mem, NULL, 3, ide_mem, escc_bar); if (usb_enabled) { - usb_ohci_init_pci(pci_bus, -1); + pci_create_simple(pci_bus, -1, "pci-ohci"); } /* U3 needs to use USB for input because Linux doesn't support via-cuda diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index 9295a34..49c2c97 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c @@ -34,7 +34,6 @@ #include "net.h" #include "isa.h" #include "pci.h" -#include "usb-ohci.h" #include "boards.h" #include "fw_cfg.h" #include "escc.h" @@ -278,7 +277,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, dbdma_mem, cuda_mem, nvr, 2, ide_mem, escc_bar); if (usb_enabled) { - usb_ohci_init_pci(pci_bus, -1); + pci_create_simple(pci_bus, -1, "pci-ohci"); } if (graphic_depth != 15 && graphic_depth != 32 && graphic_depth != 8) diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index eb43fb5..dc9edd7 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -30,7 +30,6 @@ #include "isa.h" #include "pci.h" #include "pci_host.h" -#include "usb-ohci.h" #include "ppc.h" #include "boards.h" #include "qemu-log.h" @@ -688,7 +687,7 @@ static void ppc_prep_init (ram_addr_t ram_size, #endif if (usb_enabled) { - usb_ohci_init_pci(pci_bus, -1); + pci_create_simple(pci_bus, -1, "pci-ohci"); } m48t59 = m48t59_init_isa(isa_bus, 0x0074, NVRAM_SIZE, 59); diff --git a/hw/realview.c b/hw/realview.c index ae1bbcd..50ea67c 100644 --- a/hw/realview.c +++ b/hw/realview.c @@ -12,7 +12,6 @@ #include "primecell.h" #include "devices.h" #include "pci.h" -#include "usb-ohci.h" #include "net.h" #include "sysemu.h" #include "boards.h" @@ -305,7 +304,7 @@ static void realview_init(ram_addr_t ram_size, sysbus_connect_irq(busdev, 3, pic[51]); pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci"); if (usb_enabled) { - usb_ohci_init_pci(pci_bus, -1); + pci_create_simple(pci_bus, -1, "pci-ohci"); } n = drive_get_max_bus(IF_SCSI); while (n >= 0) { diff --git a/hw/usb-ohci.h b/hw/usb-ohci.h deleted file mode 100644 index eefcef3..0000000 --- a/hw/usb-ohci.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef QEMU_USB_OHCI_H -#define QEMU_USB_OHCI_H - -#include "qemu-common.h" - -void usb_ohci_init_pci(struct PCIBus *bus, int devfn); - -#endif - diff --git a/hw/usb-uhci.h b/hw/usb-uhci.h deleted file mode 100644 index 3e4d377..0000000 --- a/hw/usb-uhci.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef QEMU_USB_UHCI_H -#define QEMU_USB_UHCI_H - -#include "qemu-common.h" - -void usb_uhci_piix3_init(PCIBus *bus, int devfn); -void usb_uhci_piix4_init(PCIBus *bus, int devfn); -void usb_uhci_vt82c686b_init(PCIBus *bus, int devfn); - -#endif diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index dd79cef..51fa111 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -30,7 +30,6 @@ #include "qemu-timer.h" #include "hw/usb.h" #include "hw/pci.h" -#include "hw/usb-ohci.h" #include "hw/sysbus.h" #include "hw/qdev-addr.h" @@ -1815,11 +1814,6 @@ static int usb_ohci_initfn_pci(struct PCIDevice *dev) return 0; } -void usb_ohci_init_pci(struct PCIBus *bus, int devfn) -{ - pci_create_simple(bus, devfn, "pci-ohci"); -} - typedef struct { SysBusDevice busdev; OHCIState ohci; diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index 7c2e9b3..5c708cf 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -29,7 +29,6 @@ #include "hw/usb.h" #include "hw/pci.h" #include "qemu-timer.h" -#include "hw/usb-uhci.h" #include "iov.h" #include "dma.h" @@ -1391,18 +1390,3 @@ static void uhci_register_types(void) } type_init(uhci_register_types) - -void usb_uhci_piix3_init(PCIBus *bus, int devfn) -{ - pci_create_simple(bus, devfn, "piix3-usb-uhci"); -} - -void usb_uhci_piix4_init(PCIBus *bus, int devfn) -{ - pci_create_simple(bus, devfn, "piix4-usb-uhci"); -} - -void usb_uhci_vt82c686b_init(PCIBus *bus, int devfn) -{ - pci_create_simple(bus, devfn, "vt82c686b-usb-uhci"); -} diff --git a/hw/versatilepb.c b/hw/versatilepb.c index b9102f4..c1687a5 100644 --- a/hw/versatilepb.c +++ b/hw/versatilepb.c @@ -13,7 +13,6 @@ #include "net.h" #include "sysemu.h" #include "pci.h" -#include "usb-ohci.h" #include "boards.h" #include "blockdev.h" #include "exec-memory.h" @@ -240,7 +239,7 @@ static void versatile_init(ram_addr_t ram_size, } } if (usb_enabled) { - usb_ohci_init_pci(pci_bus, -1); + pci_create_simple(pci_bus, -1, "pci-ohci"); } n = drive_get_max_bus(IF_SCSI); while (n >= 0) { -- 1.7.1 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [RfC PATCH 0/2] usb: reorganize source files. 2012-03-08 9:16 [Qemu-devel] [RfC PATCH 0/2] usb: reorganize source files Gerd Hoffmann 2012-03-08 9:16 ` [Qemu-devel] [RfC PATCH 1/2] usb: the big rename Gerd Hoffmann 2012-03-08 9:16 ` [Qemu-devel] [RfC PATCH 2/2] usb: zap hw/ush-{ohic, uhci}.h + init wrappers Gerd Hoffmann @ 2012-03-08 21:29 ` Andreas Färber 2012-03-09 6:50 ` Gerd Hoffmann 2012-03-08 21:37 ` Anthony Liguori 3 siblings, 1 reply; 14+ messages in thread From: Andreas Färber @ 2012-03-08 21:29 UTC (permalink / raw) To: Gerd Hoffmann, Anthony Liguori; +Cc: qemu-devel Am 08.03.2012 10:16, schrieb Gerd Hoffmann: > Plan is basically to move all usb stuff to hw/usb/ > > Comments? hw/usb/ is fine with me (hw/ide/ is precedence), but I strongly dislike the dev-*.c convention you've used: For one thing, we'd have to rename 90+% of hw/ to be consistent. For another, dev-foo.c is not natural English for a certain type of device - foo-dev.c would be better but I'd prefer without "dev", i.e., hw/usb/{audio,ccid,...}.c. And then of course only devices should go into hw/. Also, Anthony was recently talking about building up a new Linux-like directory structure inside qom/ but I don't see that working yet and renames are cheap in git anyway, so I guess that's no reason against hw/usb/ as an interim improvement. Anthony further said he had a patch to avoid having to create subdirectories in configure for the out-of-tree builds. That would simplify both this and my *-user QOM series. Any update on that? Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [RfC PATCH 0/2] usb: reorganize source files. 2012-03-08 21:29 ` [Qemu-devel] [RfC PATCH 0/2] usb: reorganize source files Andreas Färber @ 2012-03-09 6:50 ` Gerd Hoffmann 2012-03-09 8:35 ` Markus Armbruster 2012-03-09 8:37 ` Paolo Bonzini 0 siblings, 2 replies; 14+ messages in thread From: Gerd Hoffmann @ 2012-03-09 6:50 UTC (permalink / raw) To: Andreas Färber; +Cc: qemu-devel, Anthony Liguori Hi, > For another, dev-foo.c is not natural English for a certain type of > device - foo-dev.c would be better but I'd prefer without "dev", i.e., > hw/usb/{audio,ccid,...}.c. And then of course only devices should go > into hw/. I want a prefix because with prefixing you get the files nicely grouped in directory listings, without creating another directory level, which would IMHO be overkill for the number of files we have here. 'dev-*' is used for emulated usb devices (mouse, stick, ...), 'hcd-*' is used for emulated usb host adapters (uhci, ehci, ...), 'host-*' is used for host device pass-through code. 'dev-' isn't the greated pick as it is somewhat generic indeed. I've also considered 'emu-' (to contrast with host-*), but it has pretty much the same issue. Other suggestions? cheers, Gerd ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [RfC PATCH 0/2] usb: reorganize source files. 2012-03-09 6:50 ` Gerd Hoffmann @ 2012-03-09 8:35 ` Markus Armbruster 2012-03-09 8:46 ` Gerd Hoffmann 2012-03-09 8:37 ` Paolo Bonzini 1 sibling, 1 reply; 14+ messages in thread From: Markus Armbruster @ 2012-03-09 8:35 UTC (permalink / raw) To: Gerd Hoffmann; +Cc: Andreas Färber, Anthony Liguori, qemu-devel Gerd Hoffmann <kraxel@redhat.com> writes: > Hi, > >> For another, dev-foo.c is not natural English for a certain type of >> device - foo-dev.c would be better but I'd prefer without "dev", i.e., >> hw/usb/{audio,ccid,...}.c. And then of course only devices should go >> into hw/. > > I want a prefix because with prefixing you get the files nicely grouped > in directory listings, without creating another directory level, which > would IMHO be overkill for the number of files we have here. > > 'dev-*' is used for emulated usb devices (mouse, stick, ...), 'hcd-*' is > used for emulated usb host adapters (uhci, ehci, ...), 'host-*' is used > for host device pass-through code. Which are also devices, depending on your point of view :) > 'dev-' isn't the greated pick as it is somewhat generic indeed. I've > also considered 'emu-' (to contrast with host-*), but it has pretty much > the same issue. Other suggestions? Looks like all your dev- actually start with dev-usb-. If you drop the dev- prefix and keep the other prefixes, you get the grouping you want. Regardless, collecting the usb devices in one place is an improvement. Let's do it. ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [RfC PATCH 0/2] usb: reorganize source files. 2012-03-09 8:35 ` Markus Armbruster @ 2012-03-09 8:46 ` Gerd Hoffmann 0 siblings, 0 replies; 14+ messages in thread From: Gerd Hoffmann @ 2012-03-09 8:46 UTC (permalink / raw) To: Markus Armbruster; +Cc: Andreas Färber, Anthony Liguori, qemu-devel Hi, >> 'dev-' isn't the greated pick as it is somewhat generic indeed. I've >> also considered 'emu-' (to contrast with host-*), but it has pretty much >> the same issue. Other suggestions? > > Looks like all your dev- actually start with dev-usb-. No, they don't, I've dropped 'usb-' prefix from the filenames with the move into the usb/ directory as it would be redundant. cheers, Gerd ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [RfC PATCH 0/2] usb: reorganize source files. 2012-03-09 6:50 ` Gerd Hoffmann 2012-03-09 8:35 ` Markus Armbruster @ 2012-03-09 8:37 ` Paolo Bonzini 1 sibling, 0 replies; 14+ messages in thread From: Paolo Bonzini @ 2012-03-09 8:37 UTC (permalink / raw) To: qemu-devel Il 09/03/2012 07:50, Gerd Hoffmann ha scritto: > I want a prefix because with prefixing you get the files nicely grouped > in directory listings, without creating another directory level, which > would IMHO be overkill for the number of files we have here. > > 'dev-*' is used for emulated usb devices (mouse, stick, ...), 'hcd-*' is > used for emulated usb host adapters (uhci, ehci, ...), 'host-*' is used > for host device pass-through code. > > 'dev-' isn't the greated pick as it is somewhat generic indeed. I've > also considered 'emu-' (to contrast with host-*), but it has pretty much > the same issue. Other suggestions? Directories? Like hw/usb/devices, hw/usb/host, hw/usb/hcd. Paolo ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Qemu-devel] [RfC PATCH 0/2] usb: reorganize source files. 2012-03-08 9:16 [Qemu-devel] [RfC PATCH 0/2] usb: reorganize source files Gerd Hoffmann ` (2 preceding siblings ...) 2012-03-08 21:29 ` [Qemu-devel] [RfC PATCH 0/2] usb: reorganize source files Andreas Färber @ 2012-03-08 21:37 ` Anthony Liguori 3 siblings, 0 replies; 14+ messages in thread From: Anthony Liguori @ 2012-03-08 21:37 UTC (permalink / raw) To: Gerd Hoffmann; +Cc: qemu-devel On 03/08/2012 03:16 AM, Gerd Hoffmann wrote: > Hi, > > Plan is basically to move all usb stuff to hw/usb/ > > Comments? It's easy to bikeshed something like this but since it's clearly an improvement over what we have right now, I'm all for it. Regards, Anthony Liguori > > cheers, > Gerd > > Gerd Hoffmann (2): > usb: the big rename > usb: zap hw/ush-{ohic,uhci}.h + init wrappers > > Makefile.objs | 22 ++++++++++++---------- > Makefile.target | 2 +- > configure | 4 +++- > hw/alpha_sys.h | 1 - > 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-bus.c => usb/bus.c} | 6 +++--- > hw/{usb.c => usb/core.c} | 2 +- > 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.c} | 0 > hw/{usb-msd.c => usb/dev-storage.c} | 6 +++--- > hw/{usb-wacom.c => usb/dev-wacom.c} | 6 +++--- > hw/{usb-ehci.c => usb/hcd-ehci.c} | 6 +++--- > hw/{usb-musb.c => usb/hcd-musb.c} | 6 +++--- > hw/{usb-ohci.c => usb/hcd-ohci.c} | 16 +++++----------- > hw/{usb-uhci.c => usb/hcd-uhci.c} | 22 +++------------------- > 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 +-- > 35 files changed, 71 insertions(+), 116 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} (99%) > 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.c} (100%) > rename hw/{usb-msd.c => usb/dev-storage.c} (99%) > 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} (99%) > rename hw/{usb-uhci.c => usb/hcd-uhci.c} (98%) > 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%) > > ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2012-03-09 9:27 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-08 9:16 [Qemu-devel] [RfC PATCH 0/2] usb: reorganize source files Gerd Hoffmann
2012-03-08 9:16 ` [Qemu-devel] [RfC PATCH 1/2] usb: the big rename Gerd Hoffmann
2012-03-08 9:37 ` Alon Levy
2012-03-09 8:34 ` Paolo Bonzini
2012-03-09 8:42 ` Gerd Hoffmann
2012-03-09 8:52 ` Paolo Bonzini
2012-03-09 9:26 ` Gerd Hoffmann
2012-03-08 9:16 ` [Qemu-devel] [RfC PATCH 2/2] usb: zap hw/ush-{ohic, uhci}.h + init wrappers Gerd Hoffmann
2012-03-08 21:29 ` [Qemu-devel] [RfC PATCH 0/2] usb: reorganize source files Andreas Färber
2012-03-09 6:50 ` Gerd Hoffmann
2012-03-09 8:35 ` Markus Armbruster
2012-03-09 8:46 ` Gerd Hoffmann
2012-03-09 8:37 ` Paolo Bonzini
2012-03-08 21:37 ` Anthony Liguori
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).