Commit 022c62cb authored by Paolo Bonzini's avatar Paolo Bonzini

exec: move include files to include/exec/

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 737e150e
......@@ -40,9 +40,9 @@
#include "hw/audiodev.h"
#include "kvm.h"
#include "migration.h"
#include "gdbstub.h"
#include "exec/gdbstub.h"
#include "hw/smbios.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#include "hw/pcspk.h"
#include "qemu/page_cache.h"
#include "qemu-config.h"
......
......@@ -25,7 +25,7 @@
*/
#include "monitor.h"
#include "cpu-common.h"
#include "exec/cpu-common.h"
#include "kvm.h"
#include "balloon.h"
#include "trace.h"
......
......@@ -11,7 +11,7 @@
#include <stdlib.h>
#endif /* DEBUG_REMAP */
#include "qemu-user-types.h"
#include "exec/user/abitypes.h"
enum BSDType {
target_freebsd,
......@@ -23,7 +23,7 @@ extern enum BSDType bsd_type;
#include "syscall_defs.h"
#include "syscall.h"
#include "target_signal.h"
#include "gdbstub.h"
#include "exec/gdbstub.h"
#if defined(CONFIG_USE_NPTL)
#define THREAD __thread
......
......@@ -27,7 +27,7 @@
#include "monitor.h"
#include "sysemu.h"
#include "gdbstub.h"
#include "exec/gdbstub.h"
#include "dma.h"
#include "kvm.h"
#include "qmp-commands.h"
......
......@@ -19,13 +19,13 @@
#include "config.h"
#include "cpu.h"
#include "exec-all.h"
#include "memory.h"
#include "exec-memory.h"
#include "exec/exec-all.h"
#include "exec/memory.h"
#include "exec/address-spaces.h"
#include "cputlb.h"
#include "exec/cputlb.h"
#include "memory-internal.h"
#include "exec/memory-internal.h"
//#define DEBUG_TLB
//#define DEBUG_TLB_CHECK
......@@ -347,15 +347,15 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr)
#define SOFTMMU_CODE_ACCESS
#define SHIFT 0
#include "softmmu_template.h"
#include "exec/softmmu_template.h"
#define SHIFT 1
#include "softmmu_template.h"
#include "exec/softmmu_template.h"
#define SHIFT 2
#include "softmmu_template.h"
#include "exec/softmmu_template.h"
#define SHIFT 3
#include "softmmu_template.h"
#include "exec/softmmu_template.h"
#undef env
......@@ -11,7 +11,7 @@
#define DMA_H
#include <stdio.h>
#include "memory.h"
#include "exec/memory.h"
#include "hw/hw.h"
#include "block/block.h"
#include "kvm.h"
......
......@@ -14,8 +14,8 @@
#include "qemu-common.h"
#include "elf.h"
#include "cpu.h"
#include "cpu-all.h"
#include "hwaddr.h"
#include "exec/cpu-all.h"
#include "exec/hwaddr.h"
#include "monitor.h"
#include "kvm.h"
#include "dump.h"
......@@ -23,7 +23,7 @@
#include "memory_mapping.h"
#include "qapi/error.h"
#include "qmp-commands.h"
#include "gdbstub.h"
#include "exec/gdbstub.h"
static uint16_t cpu_convert_to_target16(uint16_t val, int endian)
{
......
......@@ -34,9 +34,9 @@
#include "hw/xen.h"
#include "qemu-timer.h"
#include "qemu-config.h"
#include "memory.h"
#include "exec/memory.h"
#include "dma.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#if defined(CONFIG_USER_ONLY)
#include <qemu.h>
#else /* !CONFIG_USER_ONLY */
......@@ -44,10 +44,10 @@
#include "trace.h"
#endif
#include "cputlb.h"
#include "exec/cputlb.h"
#include "translate-all.h"
#include "memory-internal.h"
#include "exec/memory-internal.h"
//#define DEBUG_UNASSIGNED
//#define DEBUG_SUBPAGE
......
......@@ -32,7 +32,7 @@
#include "monitor.h"
#include "qemu-char.h"
#include "sysemu.h"
#include "gdbstub.h"
#include "exec/gdbstub.h"
#endif
#define MAX_PACKET_LENGTH 4096
......
......@@ -30,7 +30,7 @@
#include "sysemu.h"
#include "acpi.h"
#include "kvm.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#include "ich9.h"
......
......@@ -26,9 +26,9 @@
#include "acpi.h"
#include "sysemu.h"
#include "range.h"
#include "ioport.h"
#include "exec/ioport.h"
#include "fw_cfg.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
//#define DEBUG
......
......@@ -7,12 +7,12 @@
*/
#include "cpu.h"
#include "exec-all.h"
#include "exec/exec-all.h"
#include "hw.h"
#include "devices.h"
#include "sysemu.h"
#include "alpha_sys.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#define TYPE_TYPHOON_PCI_HOST_BRIDGE "typhoon-pcihost"
......
......@@ -11,7 +11,7 @@
#include "boards.h"
#include "loader.h"
#include "elf.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#define KERNEL_LOAD_ADDR 0x10000
#define AN5206_MBAR_ADDR 0x10000000
......
......@@ -33,7 +33,7 @@
#include "pci/pci_bus.h"
#include "apb_pci.h"
#include "sysemu.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
/* debug APB */
//#define DEBUG_APB
......
......@@ -20,7 +20,7 @@
#ifndef QEMU_APIC_INTERNAL_H
#define QEMU_APIC_INTERNAL_H
#include "memory.h"
#include "exec/memory.h"
#include "sysbus.h"
#include "qemu-timer.h"
......
......@@ -4,7 +4,7 @@
#include <stdint.h>
#include "qemu-common.h"
#include "hw.h"
#include "memory.h"
#include "exec/memory.h"
typedef void (*apm_ctrl_changed_t)(uint32_t val, void *arg);
......
......@@ -11,7 +11,7 @@
#ifndef ARM_MISC_H
#define ARM_MISC_H 1
#include "memory.h"
#include "exec/memory.h"
#include "hw/irq.h"
/* The CPU is also modeled as an interrupt controller. */
......
......@@ -13,7 +13,7 @@
#include "sysbus.h"
#include "qemu-timer.h"
#include "arm-misc.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#include "arm_gic_internal.h"
typedef struct {
......
......@@ -31,7 +31,7 @@
#include "elf.h"
#include "cris-boot.h"
#include "blockdev.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#define D(x)
#define DNAND(x)
......
......@@ -45,7 +45,7 @@
#include "mips.h"
#include "pci/pci_host.h"
#include "sysemu.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
//#define DEBUG_BONITO
......
......@@ -16,7 +16,7 @@
#include "arm-misc.h"
#include "flash.h"
#include "blockdev.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
static struct arm_boot_info collie_binfo = {
.loader_start = SA_SDCS0,
......
......@@ -10,7 +10,7 @@
#include "boards.h"
#include "loader.h"
#include "elf.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#define KERNEL_LOAD_ADDR 0x10000
......
......@@ -24,7 +24,7 @@
#include <stdio.h>
#include <sys/time.h>
#include "hw.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#include "qemu-common.h"
#include "sysemu.h"
......
......@@ -27,7 +27,7 @@
#define EXYNOS4210_H_
#include "qemu-common.h"
#include "memory.h"
#include "exec/memory.h"
#define EXYNOS4210_NCPUS 2
......
......@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "cpu-all.h"
#include "exec/cpu-all.h"
#include "sysbus.h"
#include "ui/console.h"
#include "ui/pixel_ops.h"
......
......@@ -25,7 +25,7 @@
#include "sysbus.h"
#include "net/net.h"
#include "arm-misc.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#include "exynos4210.h"
#include "boards.h"
......
......@@ -3,7 +3,7 @@
/* NOR flash devices */
#include "memory.h"
#include "exec/memory.h"
typedef struct pflash_t pflash_t;
......
#ifndef QEMU_FRAMEBUFFER_H
#define QEMU_FRAMEBUFFER_H
#include "memory.h"
#include "exec/memory.h"
/* Framebuffer device helper routines. */
......
......@@ -27,7 +27,7 @@
#include "pci/pci.h"
#include "pci/pci_host.h"
#include "pc.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
//#define DEBUG
......
......@@ -41,7 +41,7 @@
#include "devices.h"
#include "boards.h"
#include "blockdev.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
static const int sector_len = 128 * 1024;
......
......@@ -26,7 +26,7 @@
#include "boards.h"
#include "sysbus.h"
#include "blockdev.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#define SMP_BOOT_ADDR 0x100
#define SMP_BOOT_REG 0x40
......
......@@ -5,10 +5,10 @@
#include "qemu-common.h"
#if !defined(CONFIG_USER_ONLY) && !defined(NEED_CPU_H)
#include "cpu-common.h"
#include "exec/cpu-common.h"
#endif
#include "ioport.h"
#include "exec/ioport.h"
#include "irq.h"
#include "block/aio.h"
#include "qemu-file.h"
......
......@@ -3,7 +3,7 @@
#include "isa.h"
#include "pci/pci.h"
#include "memory.h"
#include "exec/memory.h"
#define MAX_IDE_DEVS 2
......
......@@ -29,7 +29,7 @@
#include "monitor.h"
#include "dma.h"
#include "cpu-common.h"
#include "exec/cpu-common.h"
#include "internal.h"
#include <hw/ide/pci.h>
#include <hw/ide/ahci.h>
......
......@@ -8,7 +8,7 @@
*/
#include <hw/ide.h>
#include <hw/isa.h>
#include "iorange.h"
#include "exec/iorange.h"
#include "dma.h"
#include "sysemu.h"
#include "hw/block-common.h"
......
......@@ -12,7 +12,7 @@
#include "boards.h"
#include "arm-misc.h"
#include "net/net.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#include "sysemu.h"
typedef struct {
......
......@@ -23,7 +23,7 @@
#define QEMU_IOAPIC_INTERNAL_H
#include "hw.h"
#include "memory.h"
#include "exec/memory.h"
#include "sysbus.h"
#define MAX_IOAPICS 1
......
......@@ -21,7 +21,7 @@
#include "sysbus.h"
#include "sysemu.h"
#include "isa.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
static ISABus *isabus;
hwaddr isa_mem_base = 0;
......
......@@ -3,8 +3,8 @@
/* ISA bus */
#include "ioport.h"
#include "memory.h"
#include "exec/ioport.h"
#include "exec/memory.h"
#include "qdev.h"
#define ISA_NUM_IRQS 16
......
......@@ -24,7 +24,7 @@
#include "hw.h"
#include "isa.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
static void isa_mmio_writeb (void *opaque, hwaddr addr,
uint32_t val)
......
......@@ -14,7 +14,7 @@
*/
#include "sysbus.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#include "hw.h"
#include "arm-misc.h"
#include "devices.h"
......
......@@ -30,7 +30,7 @@
#include "loader.h"
#include "elf.h"
#include "trace.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#include "grlib.h"
......
......@@ -27,7 +27,7 @@
#include "elf.h"
#include "lm32_hwsetup.h"
#include "lm32.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
typedef struct {
LM32CPU *cpu;
......
......@@ -49,8 +49,8 @@
#include "uboot_image.h"
#include "loader.h"
#include "fw_cfg.h"
#include "memory.h"
#include "exec-memory.h"
#include "exec/memory.h"
#include "exec/address-spaces.h"
#include <zlib.h>
......
......@@ -43,7 +43,7 @@
#include "acpi_ich9.h"
#include "pam.h"
#include "pci/pci_bus.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#include "sysemu.h"
static int ich9_lpc_sci_irq(ICH9LPCState *lpc);
......
......@@ -27,7 +27,7 @@
#include "sysemu.h"
#include "sysbus.h"
#include "isa.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
//#define DEBUG_NVRAM
......
......@@ -22,7 +22,7 @@
#ifndef HW_MAC_DBDMA_H
#define HW_MAC_DBDMA_H 1
#include "memory.h"
#include "exec/memory.h"
typedef struct DBDMA_io DBDMA_io;
......
......@@ -20,7 +20,7 @@
#include "flash.h"
#include "blockdev.h"
#include "sysbus.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
/* Device addresses */
#define MST_FPGA_PHYS 0x08000000
......
......@@ -10,7 +10,7 @@
#include "qemu-timer.h"
#include "ptimer.h"
#include "sysemu.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
/* General purpose timer module. */
typedef struct {
......
......@@ -14,7 +14,7 @@
#include "boards.h"
#include "loader.h"
#include "elf.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#define SYS_FREQ 66000000
......
......@@ -10,7 +10,7 @@
#include "mcf.h"
/* For crc32 */
#include <zlib.h>
#include "exec-memory.h"
#include "exec/address-spaces.h"
//#define DEBUG_FEC 1
......
......@@ -7,7 +7,7 @@
*/
#include "hw.h"
#include "mcf.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
typedef struct {
MemoryRegion iomem;
......
......@@ -8,7 +8,7 @@
#include "hw.h"
#include "mcf.h"
#include "qemu-char.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
typedef struct {
MemoryRegion iomem;
......
......@@ -28,7 +28,7 @@
#include "blockdev.h"
#include "milkymist-hw.h"
#include "lm32.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#define BIOS_FILENAME "mmone-bios.bin"
#define BIOS_OFFSET 0x00860000
......
......@@ -2,7 +2,7 @@
#define HW_MIPS_H
/* Definitions for mips board emulation. */
#include "memory.h"
#include "exec/memory.h"
/* gt64xxx.c */
PCIBus *gt64120_register(qemu_irq *pic);
......
......@@ -42,7 +42,7 @@
#include "mc146818rtc.h"
#include "i8254.h"
#include "blockdev.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#define DEBUG_FULONG2E_INIT
......
......@@ -41,7 +41,7 @@
#include "pcspk.h"
#include "blockdev.h"
#include "sysbus.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
enum jazz_model_e
{
......
......@@ -46,7 +46,7 @@
#include "mc146818rtc.h"
#include "i8254.h"
#include "blockdev.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#include "sysbus.h" /* SysBusDevice */
//#define DEBUG_BOARD_INIT
......
......@@ -36,7 +36,7 @@
#include "loader.h"
#include "elf.h"
#include "sysbus.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
static struct _loaderparams {
int ram_size;
......
......@@ -25,7 +25,7 @@
#include "mc146818rtc.h"
#include "i8254.h"
#include "blockdev.h"
#include "exec-memory.h"
#include "exec/address-spaces.h"
#define MAX_IDE_BUS 2
......
......@@ -23,7 +23,7 @@
#include "ui/console.h"
#include "i2c.h"
#include "blockdev.h"
#include "exec-memory.h"
#include "exec/address-