Commit 0d09e41a authored by Paolo Bonzini's avatar Paolo Bonzini

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: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent bb585a78
......@@ -35,15 +35,15 @@
#include "qemu/bitmap.h"
#include "sysemu/arch_init.h"
#include "audio/audio.h"
#include "hw/pc.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci.h"
#include "hw/audiodev.h"
#include "hw/audio/audio.h"
#include "sysemu/kvm.h"
#include "migration/migration.h"
#include "exec/gdbstub.h"
#include "hw/smbios.h"
#include "hw/i386/smbios.h"
#include "exec/address-spaces.h"
#include "hw/pcspk.h"
#include "hw/audio/pcspk.h"
#include "migration/page_cache.h"
#include "qemu/config-file.h"
#include "qmp-commands.h"
......
......@@ -31,14 +31,14 @@
#include "qemu/error-report.h"
#include "block/block_int.h"
#include "trace.h"
#include "hw/scsi-defs.h"
#include "block/scsi.h"
#include <iscsi/iscsi.h>
#include <iscsi/scsi-lowlevel.h>
#ifdef __linux__
#include <scsi/sg.h>
#include <hw/scsi-defs.h>
#include <block/scsi.h>
#endif
typedef struct IscsiLun {
......
......@@ -10,7 +10,7 @@
*/
#include "sysemu/blockdev.h"
#include "hw/block-common.h"
#include "hw/block/block.h"
#include "monitor/monitor.h"
#include "qapi/qmp/qerror.h"
#include "sysemu/sysemu.h"
......
......@@ -31,7 +31,7 @@
*/
#include "sysemu/blockdev.h"
#include "hw/block-common.h"
#include "hw/block/block.h"
#include "block/blockjob.h"
#include "monitor/monitor.h"
#include "qapi/qmp/qerror.h"
......
......@@ -31,7 +31,7 @@
#include "hw/qdev.h"
#include "qemu/osdep.h"
#include "sysemu/kvm.h"
#include "hw/xen.h"
#include "hw/xen/xen.h"
#include "qemu/timer.h"
#include "qemu/config-file.h"
#include "exec/memory.h"
......
......@@ -1607,7 +1607,7 @@ static int cpu_gdb_write_register(CPUS390XState *env, uint8_t *mem_buf, int n)
}
#elif defined (TARGET_LM32)
#include "hw/lm32_pic.h"
#include "hw/lm32/lm32_pic.h"
#define NUM_CORE_REGS (32 + 7)
static int cpu_gdb_read_register(CPULM32State *env, uint8_t *mem_buf, int n)
......
......@@ -11,8 +11,8 @@
*
*/
#include "hw/virtio.h"
#include "hw/pc.h"
#include "hw/virtio/virtio.h"
#include "hw/i386/pc.h"
#include "qemu/sockets.h"
#include "virtio-9p.h"
#include "fsdev/qemu-fsdev.h"
......
......@@ -11,7 +11,7 @@
*
*/
#include "hw/virtio.h"
#include "hw/virtio/virtio.h"
#include "virtio-9p.h"
#include "virtio-9p-xattr.h"
#include <arpa/inet.h>
......
......@@ -11,7 +11,7 @@
*
*/
#include "hw/virtio.h"
#include "hw/virtio/virtio.h"
#include "virtio-9p.h"
#include "virtio-9p-xattr.h"
#include <arpa/inet.h>
......
......@@ -13,7 +13,7 @@
#include <sys/types.h>
#include "qemu/xattr.h"
#include "hw/virtio.h"
#include "hw/virtio/virtio.h"
#include "virtio-9p.h"
#include "fsdev/file-op-9p.h"
#include "virtio-9p-xattr.h"
......
......@@ -11,7 +11,7 @@
*/
#include <sys/socket.h>
#include <sys/un.h>
#include "hw/virtio.h"
#include "hw/virtio/virtio.h"
#include "virtio-9p.h"
#include "qemu/error-report.h"
#include "fsdev/qemu-fsdev.h"
......
......@@ -12,7 +12,7 @@
*
*/
#include "hw/virtio.h"
#include "hw/virtio/virtio.h"
#include "virtio-9p.h"
#include "virtio-9p-xattr.h"
#include "fsdev/qemu-fsdev.h"
......
......@@ -12,7 +12,7 @@
*/
#include <sys/types.h>
#include "hw/virtio.h"
#include "hw/virtio/virtio.h"
#include "virtio-9p.h"
#include "fsdev/file-op-9p.h"
#include "virtio-9p-xattr.h"
......
......@@ -11,7 +11,7 @@
*
*/
#include "hw/virtio.h"
#include "hw/virtio/virtio.h"
#include "virtio-9p.h"
#include "fsdev/file-op-9p.h"
#include "virtio-9p-xattr.h"
......
......@@ -11,8 +11,8 @@
*
*/
#include "hw/virtio.h"
#include "hw/pc.h"
#include "hw/virtio/virtio.h"
#include "hw/i386/pc.h"
#include "qemu/sockets.h"
#include "virtio-9p.h"
#include "fsdev/qemu-fsdev.h"
......
......@@ -6,7 +6,7 @@
#include <sys/time.h>
#include <utime.h>
#include <sys/resource.h>
#include "hw/virtio.h"
#include "hw/virtio/virtio.h"
#include "fsdev/file-op-9p.h"
#include "fsdev/virtio-9p-marshal.h"
#include "qemu/thread.h"
......
......@@ -18,7 +18,7 @@
*/
#include "hw/hw.h"
#include "hw/audiodev.h"
#include "hw/audio/audio.h"
#include "audio/audio.h"
#include "hw/pci/pci.h"
#include "sysemu/dma.h"
......
......@@ -20,8 +20,8 @@
*/
#include "sysemu/sysemu.h"
#include "hw/hw.h"
#include "hw/pc.h"
#include "hw/acpi.h"
#include "hw/i386/pc.h"
#include "hw/acpi/acpi.h"
#include "monitor/monitor.h"
#include "qemu/config-file.h"
#include "qapi/opts-visitor.h"
......
......@@ -24,15 +24,15 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw/hw.h"
#include "hw/pc.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci.h"
#include "qemu/timer.h"
#include "sysemu/sysemu.h"
#include "hw/acpi.h"
#include "hw/acpi/acpi.h"
#include "sysemu/kvm.h"
#include "exec/address-spaces.h"
#include "hw/ich9.h"
#include "hw/i386/ich9.h"
//#define DEBUG
......
......@@ -19,15 +19,15 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw/hw.h"
#include "hw/pc.h"
#include "hw/apm.h"
#include "hw/pm_smbus.h"
#include "hw/i386/pc.h"
#include "hw/isa/apm.h"
#include "hw/i2c/pm_smbus.h"
#include "hw/pci/pci.h"
#include "hw/acpi.h"
#include "hw/acpi/acpi.h"
#include "sysemu/sysemu.h"
#include "qemu/range.h"
#include "exec/ioport.h"
#include "hw/fw_cfg.h"
#include "hw/nvram/fw_cfg.h"
#include "exec/address-spaces.h"
//#define DEBUG
......
......@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "hw/hw.h"
#include "hw/adb.h"
#include "hw/input/adb.h"
#include "ui/console.h"
/* debug ADB */
......
......@@ -23,9 +23,9 @@
*/
#include "hw/hw.h"
#include "hw/audiodev.h"
#include "hw/audio/audio.h"
#include "audio/audio.h"
#include "hw/isa.h"
#include "hw/isa/isa.h"
//#define DEBUG
......
......@@ -12,10 +12,10 @@
#include "hw/boards.h"
#include "hw/alpha_sys.h"
#include "sysemu/sysemu.h"
#include "hw/mc146818rtc.h"
#include "hw/timer/mc146818rtc.h"
#include "hw/ide.h"
#include "hw/i8254.h"
#include "hw/serial.h"
#include "hw/timer/i8254.h"
#include "hw/char/serial.h"
#define MAX_IDE_BUS 2
......
......@@ -6,7 +6,7 @@
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
#include "hw/ide.h"
#include "hw/pc.h"
#include "hw/i386/pc.h"
#include "hw/irq.h"
......
......@@ -9,7 +9,7 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "hw/hw.h"
#include "hw/devices.h"
#include "hw/arm/devices.h"
#include "sysemu/sysemu.h"
#include "hw/alpha_sys.h"
#include "exec/address-spaces.h"
......
......@@ -31,7 +31,7 @@
#include "hw/pci/pci_host.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pci_bus.h"
#include "hw/apb_pci.h"
#include "hw/pci-host/apb.h"
#include "sysemu/sysemu.h"
#include "exec/address-spaces.h"
......
......@@ -17,14 +17,14 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>
*/
#include "qemu/thread.h"
#include "hw/apic_internal.h"
#include "hw/apic.h"
#include "hw/ioapic.h"
#include "hw/i386/apic_internal.h"
#include "hw/i386/apic.h"
#include "hw/i386/ioapic.h"
#include "hw/pci/msi.h"
#include "qemu/host-utils.h"
#include "trace.h"
#include "hw/pc.h"
#include "hw/apic-msidef.h"
#include "hw/i386/pc.h"
#include "hw/i386/apic-msidef.h"
#define MAX_APIC_WORDS 8
......
......@@ -17,8 +17,8 @@
* 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/apic.h"
#include "hw/apic_internal.h"
#include "hw/i386/apic.h"
#include "hw/i386/apic_internal.h"
#include "trace.h"
#include "sysemu/kvm.h"
......
......@@ -20,7 +20,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw/apm.h"
#include "hw/isa/apm.h"
#include "hw/hw.h"
#include "hw/pci/pci.h"
......
......@@ -31,7 +31,7 @@
*/
#include "hw/hw.h"
#include "hw/isa.h"
#include "hw/isa/isa.h"
#include "ui/console.h"
#include "qemu/timer.h"
......
......@@ -8,7 +8,7 @@
*/
#include "hw/sysbus.h"
#include "hw/arm-misc.h"
#include "hw/arm.h"
#include "hw/loader.h"
#include "elf.h"
......
......@@ -9,7 +9,7 @@
#include "config.h"
#include "hw/hw.h"
#include "hw/arm-misc.h"
#include "hw/arm.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/loader.h"
......
......@@ -11,10 +11,10 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/boards.h"
#include "hw/devices.h"
#include "hw/arm/devices.h"
#include "hw/strongarm.h"
#include "hw/arm-misc.h"
#include "hw/flash.h"
#include "hw/arm.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
......
......@@ -24,9 +24,9 @@
#include "hw/boards.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "hw/arm-misc.h"
#include "hw/arm.h"
#include "hw/loader.h"
#include "hw/exynos4210.h"
#include "hw/arm/exynos4210.h"
#include "hw/usb/hcd-ehci.h"
#define EXYNOS4210_CHIPID_ADDR 0x10000000
......
......@@ -24,9 +24,9 @@
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/arm-misc.h"
#include "hw/arm.h"
#include "exec/address-spaces.h"
#include "hw/exynos4210.h"
#include "hw/arm/exynos4210.h"
#include "hw/boards.h"
#undef DEBUG
......
......@@ -35,10 +35,10 @@
*/
#include "hw/hw.h"
#include "hw/pxa.h"
#include "hw/arm/pxa.h"
#include "net/net.h"
#include "hw/flash.h"
#include "hw/devices.h"
#include "hw/block/flash.h"
#include "hw/arm/devices.h"
#include "hw/boards.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
......
......@@ -18,8 +18,8 @@
*/
#include "hw/sysbus.h"
#include "hw/arm-misc.h"
#include "hw/devices.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "hw/loader.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
......
......@@ -8,9 +8,9 @@
*/
#include "hw/sysbus.h"
#include "hw/devices.h"
#include "hw/arm/devices.h"
#include "hw/boards.h"
#include "hw/arm-misc.h"
#include "hw/arm.h"
#include "net/net.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
......
......@@ -16,13 +16,13 @@
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
#include "hw/hw.h"
#include "hw/arm-misc.h"
#include "hw/devices.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/serial.h"
#include "hw/imx.h"
#include "hw/char/serial.h"
#include "hw/arm/imx.h"
/* Memory map for Kzm Emulation Baseboard:
* 0x00000000-0x00003fff 16k secure ROM IGNORED
......
......@@ -12,12 +12,12 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw/hw.h"
#include "hw/pxa.h"
#include "hw/arm-misc.h"
#include "hw/arm/pxa.h"
#include "hw/arm.h"
#include "net/net.h"
#include "hw/devices.h"
#include "hw/arm/devices.h"
#include "hw/boards.h"
#include "hw/flash.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
......
......@@ -10,18 +10,18 @@
*/
#include "hw/sysbus.h"
#include "hw/arm-misc.h"
#include "hw/devices.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/serial.h"
#include "hw/char/serial.h"
#include "qemu/timer.h"
#include "hw/ptimer.h"
#include "block/block.h"
#include "hw/flash.h"
#include "hw/block/flash.h"
#include "ui/console.h"
#include "hw/i2c.h"
#include "hw/i2c/i2c.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
#include "ui/pixel_ops.h"
......
......@@ -20,14 +20,14 @@
#include "qemu-common.h"
#include "sysemu/sysemu.h"
#include "hw/omap.h"
#include "hw/arm-misc.h"
#include "hw/arm/omap.h"
#include "hw/arm.h"
#include "hw/irq.h"
#include "ui/console.h"
#include "hw/boards.h"
#include "hw/i2c.h"
#include "hw/devices.h"
#include "hw/flash.h"
#include "hw/i2c/i2c.h"
#include "hw/arm/devices.h"
#include "hw/block/flash.h"
#include "hw/hw.h"
#include "hw/bt.h"
#include "hw/loader.h"
......
......@@ -17,10 +17,10 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw/hw.h"
#include "hw/arm-misc.h"
#include "hw/omap.h"
#include "hw/arm.h"
#include "hw/arm/omap.h"
#include "sysemu/sysemu.h"
#include "hw/soc_dma.h"
#include "hw/arm/soc_dma.h"
#include "sysemu/blockdev.h"