diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 17:06:20 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:10 +0200 |
commit | 0d09e41a51aa0752b1ce525ce084f7cd210e461b (patch) | |
tree | dc92b5b32c1e3182afa9bfd16a46a0a089320102 /hw/usb | |
parent | bb585a784e9ad69207315d694e7dad2c422f6baa (diff) | |
download | qemu-0d09e41a51aa0752b1ce525ce084f7cd210e461b.zip qemu-0d09e41a51aa0752b1ce525ce084f7cd210e461b.tar.gz qemu-0d09e41a51aa0752b1ce525ce084f7cd210e461b.tar.bz2 |
hw: move headers to include/
Many of these should be cleaned up with proper qdev-/QOM-ification.
Right now there are many catch-all headers in include/hw/ARCH depending
on cpu.h, and this makes it necessary to compile these files per-target.
However, fixing this does not belong in these patches.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/usb')
-rw-r--r-- | hw/usb/dev-audio.c | 2 | ||||
-rw-r--r-- | hw/usb/dev-hid.c | 2 | ||||
-rw-r--r-- | hw/usb/dev-storage.c | 2 | ||||
-rw-r--r-- | hw/usb/dev-uas.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index b8c79b8..44fc43f 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -33,7 +33,7 @@ #include "hw/usb.h" #include "hw/usb/desc.h" #include "hw/hw.h" -#include "hw/audiodev.h" +#include "hw/audio/audio.h" #include "audio/audio.h" #define USBAUDIO_VENDOR_NUM 0x46f4 /* CRC16() of "QEMU" */ diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index 9701048..5f3a4b4 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -27,7 +27,7 @@ #include "hw/usb.h" #include "hw/usb/desc.h" #include "qemu/timer.h" -#include "hw/hid.h" +#include "hw/input/hid.h" /* HID interface requests */ #define GET_REPORT 0xa101 diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 21651b3..06f0171 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -12,7 +12,7 @@ #include "qemu/config-file.h" #include "hw/usb.h" #include "hw/usb/desc.h" -#include "hw/scsi.h" +#include "hw/scsi/scsi.h" #include "ui/console.h" #include "monitor/monitor.h" #include "sysemu/sysemu.h" diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index 1ac5117..c8c42ee 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -16,8 +16,8 @@ #include "hw/usb.h" #include "hw/usb/desc.h" -#include "hw/scsi.h" -#include "hw/scsi-defs.h" +#include "hw/scsi/scsi.h" +#include "block/scsi.h" /* --------------------------------------------------------------------- */ |