include: move hw/usb.h to hw/usb/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 63e9ba521bcc5b78e5bb78fe5bc394be94c6cabd..71286729341d95f84e3895d8aaedf18abd95ed34 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2285,7 +2285,7 @@ S: Orphan
 F: hw/usb/*
 F: tests/qtest/usb-*-test.c
 F: docs/system/devices/usb.rst
-F: include/hw/usb.h
+F: include/hw/usb/usb.h
 F: include/hw/usb/
 
 USB (serial adapter)

diff --git a/chardev/baum.c b/chardev/baum.c
index ad6832150416fd319a9338c5b94ef33d998cf32c..157f8b95195e2e16051738291ba670f577c31ce5 100644 (file)
--- a/chardev/baum.c
+++ b/chardev/baum.c
@@ -28,7 +28,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "ui/console.h"
 #include <brlapi.h>
 #include <brlapi_constants.h>

diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
index 2205500a8da945b630aec2fc3f03888814fe8117..3ba69d37d79d3dfa4c849a3740a9ec5a357d06d6 100644 (file)
--- a/hw/arm/sbsa-ref.c
+++ b/hw/arm/sbsa-ref.c
@@ -45,7 +45,7 @@
 #include "hw/loader.h"
 #include "hw/pci-host/gpex.h"
 #include "hw/qdev-properties.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/usb/xhci.h"
 #include "hw/char/pl011.h"
 #include "hw/watchdog/sbsa_gwdt.h"

diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 8c66eed5a269c29a73ef5c6cc3931ced4275862e..acd1c3f005b578b5d3787c11c86f5cd9f40f60d8 100644 (file)
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -24,7 +24,7 @@
 #include "hw/input/lasips2.h"
 #include "hw/net/lasi_82596.h"
 #include "hw/nmi.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci-host/astro.h"

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index f8b919cb6c4789d4bc031543e2b9131128619c9d..0f2a5889022e880a2ec3ff63544d069868e7ab15 100644 (file)
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -52,7 +52,7 @@
 #include "acpi-build.h"
 #include "hw/mem/nvdimm.h"
 #include "hw/cxl/cxl_host.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/i386/intel_iommu.h"
 #include "hw/net/ne2000-isa.h"
 #include "hw/virtio/virtio-iommu.h"

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 7b3611e973cd0cdc8f3cd37448c26e2496ccb2a7..f6b9a1bc40618226bfdccfd00ecb413f362503ae 100644 (file)
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -35,7 +35,7 @@
 #include "hw/display/ramfb.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_ids.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "net/net.h"
 #include "hw/ide/pci.h"
 #include "hw/irq.h"

diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 6015e639d7bc0f6bf393bc2904f3113d2d4027ce..02de7453baa0d0cbad003a2cc245e7c575dd146b 100644 (file)
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -52,7 +52,7 @@
 #include "hw/ide/ahci-pci.h"
 #include "hw/intc/ioapic.h"
 #include "hw/southbridge/ich9.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/usb/hcd-uhci.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c
index 77dc895648f33f6112bd2dfb6d2b62c86ef3e108..4df6cf13b36c6c48c733c3ce3b89b0790c48b5c1 100644 (file)
--- a/hw/mips/loongson3_virt.c
+++ b/hw/mips/loongson3_virt.c
@@ -43,7 +43,7 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci-host/gpex.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "net/net.h"
 #include "system/kvm.h"
 #include "system/qtest.h"

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 951de4bae4b86f4068200c1ee595e45ae4fca826..739f1af3e18d24c5078c2ce6898dd602f04dceb7 100644 (file)
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -72,7 +72,7 @@
 #include "system/kvm.h"
 #include "system/reset.h"
 #include "kvm_ppc.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/sysbus.h"
 #include "trace.h"
 

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 99b843ba2faf2e25c1a15f04ded358e2775e8557..6f2d10330d6735715aa725aa32535d2c8bf5c8ac 100644 (file)
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -78,7 +78,7 @@
 #include "hw/virtio/vhost-scsi-common.h"
 
 #include "system/confidential-guest-support.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "trace.h"

diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 010be6d53943f260243f5a4c954aa6eabeae418f..c29ee690690e526c53282a73ed27777df6bf20f7 100644 (file)
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -41,7 +41,7 @@
 #include "hw/ide/mmio.h"
 #include "hw/irq.h"
 #include "hw/loader.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/block/flash.h"
 #include "exec/tswap.h"
 

diff --git a/hw/usb/bus-stub.c b/hw/usb/bus-stub.c
index cd0c317b7186537dead63ff27b56d7d19cf393ef..a7c3909e967e4b06c2f45aaf2f0b53c4d9d45167 100644 (file)
--- a/hw/usb/bus-stub.c
+++ b/hw/usb/bus-stub.c
@@ -12,7 +12,7 @@
 #include "qapi/qapi-commands-machine.h"
 #include "system/system.h"
 #include "monitor/monitor.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 
 USBDevice *usbdevice_create(const char *driver)
 {

diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 714e33989f458fd4620972d86518a57feaf05cbd..c1dd142965886fca040e88aa955dfb47337f4c75 100644 (file)
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -1,6 +1,6 @@
 #include "qemu/osdep.h"
 #include "hw/qdev-properties.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-machine.h"
 #include "qapi/type-helpers.h"

diff --git a/hw/usb/canokey.c b/hw/usb/canokey.c
index cbefbb5daf838b1a7b703c6ce044cfa802ea6486..acd4ea30d981b978f0ca2701f3ad12fb724b63fb 100644 (file)
--- a/hw/usb/canokey.c
+++ b/hw/usb/canokey.c
@@ -12,7 +12,7 @@
 
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/qdev-properties.h"
 #include "trace.h"
 #include "desc.h"

diff --git a/hw/usb/combined-packet.c b/hw/usb/combined-packet.c
index e56802f89a32f44bc94f3b3dbda249d23406d4a8..f18e53b788526312b20769b30c4881df31ededaa 100644 (file)
--- a/hw/usb/combined-packet.c
+++ b/hw/usb/combined-packet.c
@@ -21,7 +21,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "qemu/iov.h"
 #include "trace.h"
 

diff --git a/hw/usb/core.c b/hw/usb/core.c
index 975f76250a1a34b79252975b13724368577240f4..b3f811c513b58cb2c3cc8aebf01bf931bd0260d1 100644 (file)
--- a/hw/usb/core.c
+++ b/hw/usb/core.c
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "qemu/iov.h"
 #include "trace.h"
 

diff --git a/hw/usb/desc-msos.c b/hw/usb/desc-msos.c
index c72c65b650c7f1a129e42020cefd26420016ce6b..3f53d4943d225a11cca54c7d54949572840cf451 100644 (file)
--- a/hw/usb/desc-msos.c
+++ b/hw/usb/desc-msos.c
@@ -1,5 +1,5 @@
 #include "qemu/osdep.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "desc.h"
 
 /*

diff --git a/hw/usb/desc.c b/hw/usb/desc.c
index f2bdc05a95394c6c5f942dd2aad67dc124ede069..268eaf06994c805c731a725478279a55383f5d7f 100644 (file)
--- a/hw/usb/desc.c
+++ b/hw/usb/desc.c
@@ -1,6 +1,6 @@
 #include "qemu/osdep.h"
 
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "desc.h"
 #include "trace.h"
 

diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
index 8dd9d2659967017b5c3a933342bfe8d4aaf05f5f..988824ea750bd198baa24d611c250fb15e6530d6 100644 (file)
--- a/hw/usb/dev-audio.c
+++ b/hw/usb/dev-audio.c
@@ -32,7 +32,7 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "hw/qdev-properties.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"
 #include "qemu/audio.h"

diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
index 96623aa32238f0ba5fc573460206a538bc69e41b..296e9d0d856f821dfad70d374e80a0a8e6b9e614 100644 (file)
--- a/hw/usb/dev-hid.c
+++ b/hw/usb/dev-hid.c
@@ -25,7 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "ui/console.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"
 #include "qapi/error.h"

diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
index a19350d9c42aeb05cd4e46ae944817a9a3603ad4..f418da14094a22908242054a97ee1008b8c78707 100644 (file)
--- a/hw/usb/dev-hub.c
+++ b/hw/usb/dev-hub.c
@@ -27,7 +27,7 @@
 #include "qemu/timer.h"
 #include "trace.h"
 #include "hw/qdev-properties.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"
 #include "qemu/error-report.h"

diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index afd7944b737e41c9cd725ec411fa37c903784509..04e8eedbf614443ea179ebc66047bf4f62e8fddc 100644 (file)
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -23,7 +23,7 @@
 #include "qemu/filemonitor.h"
 #include "trace.h"
 #include "hw/qdev-properties.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"
 #include "qemu/units.h"

diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index 1df24541814c2278d046e1c4d3ee8b38cc4123c5..34cd906d6cc1783b75e47cef5e8ec59e2877aa7e 100644 (file)
--- a/hw/usb/dev-network.c
+++ b/hw/usb/dev-network.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/qdev-properties.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"
 #include "net/net.h"

diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index 2eb52b2e01e9f973b143642601e7a3caeb43f539..17bdff9e820c438bdd6ef4dae7129e32159eb9e0 100644 (file)
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -15,7 +15,7 @@
 #include "qemu/module.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"
 #include "chardev/char-serial.h"

diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index 6ce7154feedf911775009372879fee7356c720e2..a1081e545aa451a6337c69c1adc29c4dcf9dd590 100644 (file)
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -41,7 +41,7 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "hw/qdev-properties.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"
 

diff --git a/hw/usb/dev-storage-bot.c b/hw/usb/dev-storage-bot.c
index df6ab7f656b4b93772dde83085d006d7c6db7c66..a7f8d80c17aab36fc323b7ec8ec1a35d8831388f 100644 (file)
--- a/hw/usb/dev-storage-bot.c
+++ b/hw/usb/dev-storage-bot.c
@@ -9,7 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/usb/desc.h"
 #include "hw/usb/msd.h"
 

diff --git a/hw/usb/dev-storage-classic.c b/hw/usb/dev-storage-classic.c
index dabe1563593387515a67b670daccccf1a8007e90..977151c4a087808aae8cdd0520a0007cb5c40e13 100644 (file)
--- a/hw/usb/dev-storage-classic.c
+++ b/hw/usb/dev-storage-classic.c
@@ -10,7 +10,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/usb/desc.h"
 #include "hw/usb/msd.h"
 #include "system/system.h"

diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index b13fe345c45603ec3a5cbeff6063513fd29c97e9..bbd97406f00573de3504de7fb370e5a9418bce99 100644 (file)
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -13,7 +13,7 @@
 #include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/usb/msd.h"
 #include "desc.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c
index 18ebe15d0c4024e343352096e8042633c7d73735..75f01c74038758960d083ac9ea492ca418606965 100644 (file)
--- a/hw/usb/dev-uas.c
+++ b/hw/usb/dev-uas.c
@@ -18,7 +18,7 @@
 #include "qemu/module.h"
 #include "qemu/log.h"
 
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 #include "desc.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c
index f4b71a214721bc887ae67aee33aee75d24fc160d..14d07e812810f7af45c24db72e74cad7ec2e2c8f 100644 (file)
--- a/hw/usb/dev-wacom.c
+++ b/hw/usb/dev-wacom.c
@@ -28,7 +28,7 @@
 
 #include "qemu/osdep.h"
 #include "ui/console.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/usb/hid.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"

diff --git a/hw/usb/hcd-dwc2.h b/hw/usb/hcd-dwc2.h
index 2d5a5690fc2d68b2e0f79376ec224dbc97b9b0ac..0c02392ade093aa1153f3189c2db2a612769b117 100644 (file)
--- a/hw/usb/hcd-dwc2.h
+++ b/hw/usb/hcd-dwc2.h
@@ -22,7 +22,7 @@
 #include "qemu/timer.h"
 #include "hw/irq.h"
 #include "hw/sysbus.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "system/dma.h"
 #include "qom/object.h"
 

diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h
index ffd6c5108eb2721d5c03f174d917d3ca385308f5..c16717294d373c47dcca45cb67c309049097a010 100644 (file)
--- a/hw/usb/hcd-ehci.h
+++ b/hw/usb/hcd-ehci.h
@@ -19,7 +19,7 @@
 #define HW_USB_HCD_EHCI_H
 
 #include "qemu/timer.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "system/dma.h"
 #include "hw/pci/pci_device.h"
 #include "hw/sysbus.h"

diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c
index 94d1077eb9e74976881881144b721f50bcaebe57..e180e96b5f1a441df38b4b4ce2aed57dbd4e9716 100644 (file)
--- a/hw/usb/hcd-ohci-pci.c
+++ b/hw/usb/hcd-ohci-pci.c
@@ -21,7 +21,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 #include "hw/pci/pci_device.h"
 #include "hw/sysbus.h"

diff --git a/hw/usb/hcd-ohci-sysbus.c b/hw/usb/hcd-ohci-sysbus.c
index 3fc6cce44b05b542f3bfc3082a82167f21dd8c3c..2d3c770b1178946876956e8216dfd917926003d8 100644 (file)
--- a/hw/usb/hcd-ohci-sysbus.c
+++ b/hw/usb/hcd-ohci-sysbus.c
@@ -23,7 +23,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 #include "hw/sysbus.h"
 #include "hw/qdev-dma.h"

diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
index 72a9f9f4749816a32172ebd997bc9263a8296839..c48f07f7e3987c66887c57f26dcdec2dfe32f275 100644 (file)
--- a/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@ -30,7 +30,7 @@
 #include "qapi/error.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 #include "hw/sysbus.h"
 #include "hw/qdev-dma.h"

diff --git a/hw/usb/hcd-ohci.h b/hw/usb/hcd-ohci.h
index 3cc35a5cdc5c2afc68e9386f9757de728164cb42..75e266de90b4b961ee01258d26dfad12260bd30f 100644 (file)
--- a/hw/usb/hcd-ohci.h
+++ b/hw/usb/hcd-ohci.h
@@ -23,7 +23,7 @@
 
 #include "hw/sysbus.h"
 #include "system/dma.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "qom/object.h"
 
 /* Number of Downstream Ports on the root hub: */

diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index e207d0587a11747b17d351f3e3f93a64b7be6647..124ac4faec01e43226248dcc02b427ac5250e476 100644 (file)
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -27,7 +27,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/usb/uhci-regs.h"
 #include "migration/vmstate.h"
 #include "hw/pci/pci.h"

diff --git a/hw/usb/hcd-uhci.h b/hw/usb/hcd-uhci.h
index e0a6525505cf7779ee67c614855ac2f79d597d7f..3154837f1d1fc253a5ff8ed0069b4e6ea4483635 100644 (file)
--- a/hw/usb/hcd-uhci.h
+++ b/hw/usb/hcd-uhci.h
@@ -31,7 +31,7 @@
 #include "system/memory.h"
 #include "qemu/timer.h"
 #include "hw/pci/pci_device.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 
 typedef struct UHCIQueue UHCIQueue;
 

diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c
index 9e0fea26f40304a2071a3cb48d3fe8bb02a514fa..5fc853eb33067d60fb7f548ec955111ee4d2c08e 100644 (file)
--- a/hw/usb/hcd-xhci-nec.c
+++ b/hw/usb/hcd-xhci-nec.c
@@ -20,7 +20,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "qemu/module.h"
 #include "hw/pci/pci.h"
 #include "hw/qdev-properties.h"

diff --git a/hw/usb/hcd-xhci-pci.h b/hw/usb/hcd-xhci-pci.h
index 5b61ae84555309a6ea02637c2b09d54793f433ae..c9359f1bd90cfaeda962faf23af956bf084a5baf 100644 (file)
--- a/hw/usb/hcd-xhci-pci.h
+++ b/hw/usb/hcd-xhci-pci.h
@@ -25,7 +25,7 @@
 #define HW_USB_HCD_XHCI_PCI_H
 
 #include "hw/pci/pci_device.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hcd-xhci.h"
 
 #define TYPE_XHCI_PCI "pci-xhci"

diff --git a/hw/usb/hcd-xhci-sysbus.h b/hw/usb/hcd-xhci-sysbus.h
index fdfcbbee3bf4cbe1cfbc91713c9ba6941422a35f..f8175470bab7f324734b8589b93938290fcde3bc 100644 (file)
--- a/hw/usb/hcd-xhci-sysbus.h
+++ b/hw/usb/hcd-xhci-sysbus.h
@@ -11,7 +11,7 @@
 #ifndef HW_USB_HCD_XHCI_SYSBUS_H
 #define HW_USB_HCD_XHCI_SYSBUS_H
 
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hcd-xhci.h"
 #include "hw/sysbus.h"
 

diff --git a/hw/usb/hcd-xhci.h b/hw/usb/hcd-xhci.h
index 9c3974f1489c03cf8c4990eae492875f2f0cd2f9..5cb9e06d1d65b24e6e3cf95ad517fd45447bc15f 100644 (file)
--- a/hw/usb/hcd-xhci.h
+++ b/hw/usb/hcd-xhci.h
@@ -23,7 +23,7 @@
 #define HW_USB_HCD_XHCI_H
 #include "qom/object.h"
 
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/usb/xhci.h"
 #include "system/dma.h"
 

diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index b74670ae25696b5252f0d034cb9b759e338a050f..38893b5e68070e3dac8a8b8e51f7db31bcb9632c 100644 (file)
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -56,7 +56,7 @@
 #include "trace.h"
 
 #include "hw/qdev-properties.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 
 /* ------------------------------------------------------------------------ */
 

diff --git a/hw/usb/libhw.c b/hw/usb/libhw.c
index 4f03ef4ba9a07b40ef82eab8ef206b0bcddf43db..e108be054c972fc20727b1c1eb0cb1bb50d8505a 100644 (file)
--- a/hw/usb/libhw.c
+++ b/hw/usb/libhw.c
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "system/dma.h"
 
 int usb_packet_map(USBPacket *p, QEMUSGList *sgl)

diff --git a/hw/usb/pcap.c b/hw/usb/pcap.c
index dbff00be252e2d73a8b0399d885ce282969640fb..bb74d046a59e841dbf67a0227f89246efa3aeab8 100644 (file)
--- a/hw/usb/pcap.c
+++ b/hw/usb/pcap.c
@@ -8,7 +8,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 
 #define PCAP_MAGIC                   0xa1b2c3d4
 #define PCAP_MAJOR                   2

diff --git a/hw/usb/quirks.c b/hw/usb/quirks.c
index 23ea7a23ea1efbf292b7cae6edbcaa86f484695c..44007f8de7a610ecfb1e1118bf549147cc95b26f 100644 (file)
--- a/hw/usb/quirks.c
+++ b/hw/usb/quirks.c
@@ -14,7 +14,7 @@
 
 #include "qemu/osdep.h"
 #include "quirks.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 
 static bool usb_id_match(const struct usb_device_id *ids,
                          uint16_t vendor_id, uint16_t product_id,

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index d603a4a6f967ec33b1af46a8cd9715a799104de8..1a73db68f26793f4faab135ee2acca0eb67cfe0b 100644 (file)
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -43,7 +43,7 @@
 
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "migration/qemu-file-types.h"
 #include "migration/vmstate.h"
 #include "qom/object.h"

diff --git a/hw/usb/u2f-emulated.c b/hw/usb/u2f-emulated.c
index ace5eceadd9ccc489cbb1fdf8132416aa7e70b34..783e7f1af0b095076726903793d20a345ac8558e 100644 (file)
--- a/hw/usb/u2f-emulated.c
+++ b/hw/usb/u2f-emulated.c
@@ -28,7 +28,7 @@
 #include "qemu/thread.h"
 #include "qemu/main-loop.h"
 #include "qapi/error.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/qdev-properties.h"
 
 #include <u2f-emu/u2f-emu.h>

diff --git a/hw/usb/u2f-passthru.c b/hw/usb/u2f-passthru.c
index fa8d9cdda892214f9cad609136c858a65549a71e..b3206fb7fe43ab10ac8e682e58080d9c78245927 100644 (file)
--- a/hw/usb/u2f-passthru.c
+++ b/hw/usb/u2f-passthru.c
@@ -29,7 +29,7 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "hw/qdev-properties.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "migration/vmstate.h"
 
 #include "u2f.h"

diff --git a/hw/usb/u2f.c b/hw/usb/u2f.c
index b051a999d3ada9bc052bc8b1a455a17af0cdd68e..d6291852f6311fbbd49c30a3b8fd433ae30b4c6c 100644 (file)
--- a/hw/usb/u2f.c
+++ b/hw/usb/u2f.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "qapi/error.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/usb/hid.h"
 #include "migration/vmstate.h"
 #include "desc.h"

diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c
index fa46a7da01c1cedaa7477a82f28f71197e32c026..caf9efbb77c7e51e010baecf37984cc490e9473d 100644 (file)
--- a/hw/usb/xen-usb.c
+++ b/hw/usb/xen-usb.c
@@ -26,7 +26,7 @@
 #include "qemu/config-file.h"
 #include "qemu/main-loop.h"
 #include "qemu/option.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/xen/xen-legacy-backend.h"
 #include "monitor/qdev.h"
 #include "qapi/error.h"

diff --git a/hw/vmapple/vmapple.c b/hw/vmapple/vmapple.c
index f3cff32924400a8a71d9fbe098107149de1f7f1d..62d33525babeaef939f0e37aeadcec3f9cf3a7ce 100644 (file)
--- a/hw/vmapple/vmapple.c
+++ b/hw/vmapple/vmapple.c
@@ -30,7 +30,7 @@
 #include "hw/loader.h"
 #include "hw/qdev-properties.h"
 #include "hw/sysbus.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/primecell.h"
 #include "hw/char/pl011.h"

diff --git a/include/hw/usb/msd.h b/include/hw/usb/msd.h
index f9fd862b529a70cb4a3c97bdb2a17d4a378913ab..125d2c218f6d173a3757ba50358887e429476d81 100644 (file)
--- a/include/hw/usb/msd.h
+++ b/include/hw/usb/msd.h
@@ -7,7 +7,7 @@
  * This code is licensed under the LGPL.
  */
 
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/scsi/scsi.h"
 
 enum USBMSDMode {

diff --git a/include/hw/usb.h b/include/hw/usb/usb.h
similarity index 100%
rename from include/hw/usb.h
rename to include/hw/usb/usb.h

diff --git a/system/vl.c b/system/vl.c
index 5091fe52d925395ad1941df82bf32b31b6ffc384..cdf32c119b2b0178f7f68c7eebeb9d22c5da9289 100644 (file)
--- a/system/vl.c
+++ b/system/vl.c
@@ -54,7 +54,7 @@
 #include "qemu/accel.h"
 #include "qemu/async-teardown.h"
 #include "qemu/exit-with-parent.h"
-#include "hw/usb.h"
+#include "hw/usb/usb.h"
 #include "hw/isa/isa.h"
 #include "hw/scsi/scsi.h"
 #include "hw/sd/sd.h"