Commit 9c17d615 authored by Paolo Bonzini's avatar Paolo Bonzini

softmmu: move include files to include/sysemu/

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1de7afc9
......@@ -30,15 +30,15 @@
#endif
#include "config.h"
#include "monitor/monitor.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "qemu/bitops.h"
#include "qemu/bitmap.h"
#include "arch_init.h"
#include "sysemu/arch_init.h"
#include "audio/audio.h"
#include "hw/pc.h"
#include "hw/pci/pci.h"
#include "hw/audiodev.h"
#include "kvm.h"
#include "sysemu/kvm.h"
#include "migration/migration.h"
#include "exec/gdbstub.h"
#include "hw/smbios.h"
......
......@@ -25,7 +25,7 @@
#include "audio.h"
#include "monitor/monitor.h"
#include "qemu/timer.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#define AUDIO_CAP "audio"
#include "audio_int.h"
......
/* public domain */
#include "qemu-common.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "audio.h"
#define AUDIO_CAP "winwave"
......
......@@ -26,8 +26,8 @@
#include "monitor/monitor.h"
#include "exec/cpu-common.h"
#include "kvm.h"
#include "balloon.h"
#include "sysemu/kvm.h"
#include "sysemu/balloon.h"
#include "trace.h"
#include "qmp-commands.h"
#include "qapi/qmp/qjson.h"
......
......@@ -20,7 +20,7 @@
#include "qemu/timer.h"
#include "migration/block.h"
#include "migration/migration.h"
#include "blockdev.h"
#include "sysemu/blockdev.h"
#include <assert.h>
#define BLOCK_SIZE (BDRV_SECTORS_PER_DIRTY_CHUNK << BDRV_SECTOR_BITS)
......
......@@ -29,7 +29,7 @@
#include "block/blockjob.h"
#include "qemu/module.h"
#include "qapi/qmp/qjson.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "qemu/notify.h"
#include "block/coroutine.h"
#include "qmp-commands.h"
......
......@@ -58,7 +58,7 @@
#include <uuid/uuid.h>
#else
/* TODO: move uuid emulation to some central place in QEMU. */
#include "sysemu.h" /* UUID_FMT */
#include "sysemu/sysemu.h" /* UUID_FMT */
typedef unsigned char uuid_t[16];
#endif
......
......@@ -9,11 +9,11 @@
* later. See the COPYING file in the top-level directory.
*/
#include "blockdev.h"
#include "sysemu/blockdev.h"
#include "hw/block-common.h"
#include "monitor/monitor.h"
#include "qapi/qmp/qerror.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "qmp-commands.h"
#include "trace.h"
#include "block/nbd.h"
......
......@@ -7,7 +7,7 @@
* later. See the COPYING file in the top-level directory.
*/
#include "blockdev.h"
#include "sysemu/blockdev.h"
#include "hw/block-common.h"
#include "block/blockjob.h"
#include "monitor/monitor.h"
......@@ -15,11 +15,11 @@
#include "qemu/option.h"
#include "qemu/config-file.h"
#include "qapi/qmp/types.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "block/block_int.h"
#include "qmp-commands.h"
#include "trace.h"
#include "arch_init.h"
#include "sysemu/arch_init.h"
static QTAILQ_HEAD(drivelist, DriveInfo) drives = QTAILQ_HEAD_INITIALIZER(drives);
......
......@@ -21,7 +21,7 @@
#include "disas/disas.h"
#include "tcg.h"
#include "qemu/atomic.h"
#include "qtest.h"
#include "sysemu/qtest.h"
int tb_invalidated_flag;
......
......@@ -26,15 +26,15 @@
#include "config-host.h"
#include "monitor/monitor.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "exec/gdbstub.h"
#include "dma.h"
#include "kvm.h"
#include "sysemu/dma.h"
#include "sysemu/kvm.h"
#include "qmp-commands.h"
#include "qemu/thread.h"
#include "cpus.h"
#include "qtest.h"
#include "sysemu/cpus.h"
#include "sysemu/qtest.h"
#include "qemu/main-loop.h"
#include "qemu/bitmap.h"
......
......@@ -20,7 +20,7 @@
#include "config.h"
#include "qemu-common.h"
#include "device_tree.h"
#include "sysemu/device_tree.h"
#include "hw/loader.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
......
......@@ -7,7 +7,7 @@
* (GNU GPL), version 2 or later.
*/
#include "dma.h"
#include "sysemu/dma.h"
#include "trace.h"
#include "qemu/range.h"
#include "qemu/thread.h"
......
......@@ -12,7 +12,7 @@
*/
#include "qemu-common.h"
#include "dump.h"
#include "sysemu/dump.h"
#include "qapi/qmp/qerror.h"
#include "qmp-commands.h"
......
......@@ -17,10 +17,10 @@
#include "exec/cpu-all.h"
#include "exec/hwaddr.h"
#include "monitor/monitor.h"
#include "kvm.h"
#include "dump.h"
#include "sysemu.h"
#include "memory_mapping.h"
#include "sysemu/kvm.h"
#include "sysemu/dump.h"
#include "sysemu/sysemu.h"
#include "sysemu/memory_mapping.h"
#include "qapi/error.h"
#include "qmp-commands.h"
#include "exec/gdbstub.h"
......
......@@ -30,17 +30,17 @@
#include "hw/hw.h"
#include "hw/qdev.h"
#include "qemu/osdep.h"
#include "kvm.h"
#include "sysemu/kvm.h"
#include "hw/xen.h"
#include "qemu/timer.h"
#include "qemu/config-file.h"
#include "exec/memory.h"
#include "dma.h"
#include "sysemu/dma.h"
#include "exec/address-spaces.h"
#if defined(CONFIG_USER_ONLY)
#include <qemu.h>
#else /* !CONFIG_USER_ONLY */
#include "xen-mapcache.h"
#include "sysemu/xen-mapcache.h"
#include "trace.h"
#endif
......
......@@ -31,7 +31,7 @@
#else
#include "monitor/monitor.h"
#include "qemu-char.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "exec/gdbstub.h"
#endif
......@@ -39,7 +39,7 @@
#include "cpu.h"
#include "qemu/sockets.h"
#include "kvm.h"
#include "sysemu/kvm.h"
#ifndef TARGET_CPU_MEMORY_RW_DEBUG
static inline int target_memory_rw_debug(CPUArchState *env, target_ulong addr,
......
......@@ -21,7 +21,7 @@
#include "audiodev.h"
#include "audio/audio.h"
#include "pci/pci.h"
#include "dma.h"
#include "sysemu/dma.h"
enum {
AC97_Reset = 0x00,
......
......@@ -18,7 +18,7 @@
* Contributions after 2012-01-13 are licensed under the terms of the
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "hw.h"
#include "pc.h"
#include "acpi.h"
......
......@@ -27,9 +27,9 @@
#include "pc.h"
#include "pci/pci.h"
#include "qemu/timer.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "acpi.h"
#include "kvm.h"
#include "sysemu/kvm.h"
#include "exec/address-spaces.h"
#include "ich9.h"
......
......@@ -24,7 +24,7 @@
#include "pm_smbus.h"
#include "pci/pci.h"
#include "acpi.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "qemu/range.h"
#include "exec/ioport.h"
#include "fw_cfg.h"
......
......@@ -11,7 +11,7 @@
#include "loader.h"
#include "boards.h"
#include "alpha_sys.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "mc146818rtc.h"
#include "ide.h"
#include "i8254.h"
......
......@@ -9,7 +9,7 @@
#include "config.h"
#include "alpha_sys.h"
#include "qemu/log.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
/* PCI IO reads/writes, to byte-word addressable memory. */
......
......@@ -10,7 +10,7 @@
#include "exec/exec-all.h"
#include "hw.h"
#include "devices.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "alpha_sys.h"
#include "exec/address-spaces.h"
......
......@@ -32,7 +32,7 @@
#include "pci/pci_bridge.h"
#include "pci/pci_bus.h"
#include "apb_pci.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "exec/address-spaces.h"
/* debug APB */
......
......@@ -20,7 +20,7 @@
#include "apic.h"
#include "apic_internal.h"
#include "trace.h"
#include "kvm.h"
#include "sysemu/kvm.h"
static int apic_irq_delivered;
bool apic_report_tpr_access;
......
......@@ -10,11 +10,11 @@
#include "config.h"
#include "hw.h"
#include "arm-misc.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "boards.h"
#include "loader.h"
#include "elf.h"
#include "device_tree.h"
#include "sysemu/device_tree.h"
#include "qemu/config-file.h"
#define KERNEL_ARGS_ADDR 0x100
......
......@@ -11,7 +11,7 @@
#include "qemu/timer.h"
#include "sysbus.h"
#include "primecell.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#define LOCK_VALUE 0xa05f
......
......@@ -30,7 +30,7 @@
#include "loader.h"
#include "elf.h"
#include "cris-boot.h"
#include "blockdev.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
#define D(x)
......
......@@ -7,7 +7,7 @@
* later. See the COPYING file in the top-level directory.
*/
#include "blockdev.h"
#include "sysemu/blockdev.h"
#include "hw/block-common.h"
#include "qemu/error-report.h"
......
......@@ -3,7 +3,7 @@
#ifndef HW_BOARDS_H
#define HW_BOARDS_H
#include "blockdev.h"
#include "sysemu/blockdev.h"
#include "qdev.h"
typedef struct QEMUMachineInitArgs {
......
......@@ -44,7 +44,7 @@
#include "pc.h"
#include "mips.h"
#include "pci/pci_host.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "exec/address-spaces.h"
//#define DEBUG_BONITO
......
......@@ -23,7 +23,7 @@
#include "qemu-common.h"
#include "irq.h"
#include "devices.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
//#define DEBUG
......
......@@ -15,7 +15,7 @@
#include "strongarm.h"
#include "arm-misc.h"
#include "flash.h"
#include "blockdev.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
static struct arm_boot_info collie_binfo = {
......
......@@ -26,7 +26,7 @@
#include "ppc_mac.h"
#include "adb.h"
#include "qemu/timer.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
/* XXX: implement all timer modes */
......
......@@ -24,9 +24,9 @@
#include "hw.h"
#include "boards.h"
#include "blockdev.h"
#include "sysemu/blockdev.h"
#include "qemu/config-file.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
DriveInfo *add_init_drive(const char *optstr)
......
......@@ -30,8 +30,8 @@
#include "net/net.h"
#include "net/checksum.h"
#include "loader.h"
#include "sysemu.h"
#include "dma.h"
#include "sysemu/sysemu.h"
#include "sysemu/dma.h"
#include "e1000_hw.h"
......
......@@ -45,8 +45,8 @@
#include "pci/pci.h"
#include "net/net.h"
#include "eeprom93xx.h"
#include "sysemu.h"
#include "dma.h"
#include "sysemu/sysemu.h"
#include "sysemu/dma.h"
/* QEMU sends frames smaller than 60 bytes to ethernet nics.
* Such frames are rejected by real nics and their emulations.
......
......@@ -30,7 +30,7 @@
#include "audiodev.h"
#include "audio/audio.h"
#include "pci/pci.h"
#include "dma.h"
#include "sysemu/dma.h"
/* Missing stuff:
SCTRL_P[12](END|ST)INC
......
......@@ -26,7 +26,7 @@
#include "hw.h"
#include "exec/address-spaces.h"
#include "qemu-common.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "etraxfs_dma.h"
......
......@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "sysbus.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
#include "ptimer.h"
......
......@@ -22,7 +22,7 @@
*/
#include "boards.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "sysbus.h"
#include "arm-misc.h"
#include "loader.h"
......
......@@ -32,7 +32,7 @@
#include "hw.h"
#include "qemu/timer.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "exynos4210.h"
......
......@@ -20,7 +20,7 @@
*/
#include "sysbus.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "qemu-char.h"
#include "exynos4210.h"
......
......@@ -21,7 +21,7 @@
*
*/
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "sysbus.h"
#include "net/net.h"
#include "arm-misc.h"
......
......@@ -34,8 +34,8 @@
#include "isa.h"
#include "sysbus.h"
#include "qdev-addr.h"
#include "blockdev.h"
#include "sysemu.h"
#include "sysemu/blockdev.h"
#include "sysemu/sysemu.h"
#include "qemu/log.h"
/********************************************************/
......
......@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "hw.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "isa.h"
#include "fw_cfg.h"
#include "sysbus.h"
......
......@@ -40,7 +40,7 @@
#include "flash.h"
#include "devices.h"
#include "boards.h"
#include "blockdev.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
static const int sector_len = 128 * 1024;
......
......@@ -22,10 +22,10 @@
#include "devices.h"
#include "loader.h"
#include "net/net.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "boards.h"
#include "sysbus.h"
#include "blockdev.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
#define SMP_BOOT_ADDR 0x100
......
......@@ -28,7 +28,7 @@
#include <hw/sysbus.h>
#include "monitor/monitor.h"
#include "dma.h"
#include "sysemu/dma.h"
#include "exec/cpu-common.h"
#include "internal.h"
#include <hw/ide/pci.h>
......
......@@ -27,8 +27,8 @@
#include <hw/pci/pci.h>
#include <hw/isa.h>
#include "block/block.h"
#include "sysemu.h"
#include "dma.h"
#include "sysemu/sysemu.h"
#include "sysemu/dma.h"
#include <hw/ide/pci.h>
......
......@@ -28,10 +28,10 @@
#include <hw/isa.h>
#include "qemu/error-report.h"
#include "qemu/timer.h"
#include "sysemu.h"
#include "dma.h"
#include "sysemu/sysemu.h"
#include "sysemu/dma.h"
#include "hw/block-common.h"
#include "blockdev.h"
#include "sysemu/blockdev.h"
#include <hw/ide/internal.h>
......
......@@ -66,7 +66,7 @@
#include <hw/pci/pci.h>
#include <hw/isa.h>
#include "block/block.h"
#include "dma.h"
#include "sysemu/dma.h"
#include <hw/ide/pci.h>
#include <hw/ide/ahci.h>
......
......@@ -9,8 +9,8 @@
#include <hw/ide.h>
#include <hw/isa.h>
#include "exec/iorange.h"
#include "dma.h"
#include "sysemu.h"
#include "sysemu/dma.h"
#include "sysemu/sysemu.h"
#include "hw/block-common.h"
#include "hw/scsi-defs.h"
......
......@@ -26,7 +26,7 @@
#include <hw/pc.h>
#include <hw/isa.h>
#include "block/block.h"
#include "dma.h"
#include "sysemu/dma.h"
#include <hw/ide/internal.h>
......
......@@ -26,7 +26,7 @@
#include <hw/ppc_mac.h>
#include <hw/mac_dbdma.h>
#include "block/block.h"
#include "dma.h"
#include "sysemu/dma.h"
#include <hw/ide/internal.h>
......
......@@ -26,7 +26,7 @@
#include <hw/pc.h>
#include <hw/pcmcia.h>
#include "block/block.h"
#include "dma.h"
#include "sysemu/dma.h"
#include <hw/ide/internal.h>
......
......@@ -24,7 +24,7 @@
*/
#include <hw/hw.h>
#include "block/block.h"
#include "dma.h"
#include "sysemu/dma.h"
#include <hw/ide/internal.h>
......