qemu-common: push cpu.h inclusion out of qemu-common.h

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

diff --git a/arch_init.c b/arch_init.c
index e3bb1b3ac4195c5863edba54fc20e3121dd05f8f..07f047fad46c56d26bde4c8cfaa3ed7dc4e65d63 100644 (file)
--- a/arch_init.c
+++ b/arch_init.c
@@ -22,6 +22,8 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/arch_init.h"
 #include "hw/pci/pci.h"

diff --git a/cpus.c b/cpus.c
index cbeb1f6139ea35de86b7684b5a527ae72bf306d4..7b6ebebde796c2a71051d1966f50c9d3bf7ed8c9 100644 (file)
--- a/cpus.c
+++ b/cpus.c
@@ -24,7 +24,8 @@
 
 /* Needed early for CONFIG_BSD etc. */
 #include "qemu/osdep.h"
-
+#include "qemu-common.h"
+#include "cpu.h"
 #include "monitor/monitor.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"

diff --git a/exec.c b/exec.c
index ed10ba1af1c19e58abe145d09f258cd21c474396..d26df5570684747ada4f1543f14135a60afa652b 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -28,10 +28,10 @@
 #include "hw/qdev-core.h"
 #if !defined(CONFIG_USER_ONLY)
 #include "hw/boards.h"
+#include "hw/xen/xen.h"
 #endif
 #include "sysemu/kvm.h"
 #include "sysemu/sysemu.h"
-#include "hw/xen/xen.h"
 #include "qemu/timer.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"

diff --git a/gdbstub.c b/gdbstub.c
index 0e431fd4dfcd22f7a89fede84fc6f0ac1f5f0f36..c19ce39bdcbe29c68a43e3e9c274ef3a8acef843 100644 (file)
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -19,7 +19,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/cutils.h"
-
+#include "cpu.h"
 #ifdef CONFIG_USER_ONLY
 #include "qemu.h"
 #else

diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index f3a9b1a82615209a5b8ea55c758465b317a84b9b..6131c345b1732dde80b983268567a1a2463b640c 100644 (file)
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "cpu.h"
 #include "qemu/cutils.h"
 #include "qemu/bswap.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/arm/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c
index 67e7e70943b0f86c7d3c8dc24ae367e92f3c7e77..8c9626e9f241001254dc5884b2433d99fed7efad 100644 (file)
--- a/hw/arm/pxa2xx_gpio.c
+++ b/hw/arm/pxa2xx_gpio.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "cpu.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/arm/pxa.h"

diff --git a/hw/core/nmi.c b/hw/core/nmi.c
index e8bcc4177bcbd099587af607030fdcc1991aa700..f616a7931280f396221d5072c4f87435ce8f28b3 100644 (file)
--- a/hw/core/nmi.c
+++ b/hw/core/nmi.c
@@ -20,11 +20,16 @@
  */
 
 #include "qemu/osdep.h"
+#include "qom/cpu.h"
 #include "hw/nmi.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "monitor/monitor.h"
 
+#if defined(TARGET_I386)
+#include "cpu.h"
+#endif
+
 struct do_nmi_s {
     int cpu_index;
     Error *err;

diff --git a/hw/display/cg3.c b/hw/display/cg3.c
index fc0d97fa4b95c46cfe1df329ae41b126f7498f1a..eb0e71a90ab87a9b1e450caab1f79e8cd2e0e2e0 100644 (file)
--- a/hw/display/cg3.c
+++ b/hw/display/cg3.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "qemu/error-report.h"
 #include "ui/console.h"
 #include "hw/sysbus.h"

diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c
index 3c7c8fa00709e30d9c3c0843f812497bc6779d89..c5983c79be47f6925f3480e00cbeadc81959eda8 100644 (file)
--- a/hw/i386/kvm/apic.c
+++ b/hw/i386/kvm/apic.c
@@ -10,6 +10,8 @@
  * See the COPYING file in the top-level directory.
  */
 #include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "hw/i386/apic_internal.h"
 #include "hw/pci/msi.h"
 #include "sysemu/kvm.h"

diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
index a3b300cadf8443f53a8b26f6a60780ea83ed66bc..0f75dd385a465b8be2c953cf29836bb2a683cb29 100644 (file)
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
@@ -15,6 +15,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "qemu/host-utils.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/kvm.h"

diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index f14445d4fb4bb44bc2da406160a082a73afce0e2..466c3c4cd77491798cba14c6ba33f276a88fe246 100644 (file)
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@@ -9,6 +9,8 @@
  * top-level directory.
  */
 #include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/cpus.h"
 #include "sysemu/kvm.h"

diff --git a/hw/intc/apic.c b/hw/intc/apic.c
index 28c2ea540608aa179d4207ebb9138daea89d585a..e1ab9354c69ccbcc7b319566dd540ce546b34a37 100644 (file)
--- a/hw/intc/apic.c
+++ b/hw/intc/apic.c
@@ -17,6 +17,8 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>
  */
 #include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "qemu/thread.h"
 #include "hw/i386/apic_internal.h"
 #include "hw/i386/apic.h"

diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index 4abe145c68ea2561b37d9e1897810a86eb59fc1d..e6eb694de001546a63837b3d1cd5bafac3bcdc2c 100644 (file)
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -19,6 +19,8 @@
  */
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "hw/i386/apic.h"
 #include "hw/i386/apic_internal.h"
 #include "trace.h"

diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c
index bc85ab769f90ee0b301c68fdc3e26e57b8f2a78f..5593cdb3e43a26ad89501ab400e77210a792d0ed 100644 (file)
--- a/hw/intc/arm_gic_kvm.c
+++ b/hw/intc/arm_gic_kvm.c
@@ -21,6 +21,8 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "hw/sysbus.h"
 #include "migration/migration.h"
 #include "sysemu/kvm.h"

diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
index 669e82adfc187eefc60da1b2e370c67a4b1cd1f9..4d584ef74c162c5220ebcfbdeb4fa0f02ca5f18f 100644 (file)
--- a/hw/intc/armv7m_nvic.c
+++ b/hw/intc/armv7m_nvic.c
@@ -13,6 +13,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "hw/arm/arm.h"

diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
index e47e94f2cf02daba74e31062f6683bd2c29733b4..0518e017c49f8705bfcbe7140c38f1bd3b3d1a46 100644 (file)
--- a/hw/intc/openpic_kvm.c
+++ b/hw/intc/openpic_kvm.c
@@ -24,6 +24,8 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include <sys/ioctl.h>
 #include "exec/address-spaces.h"
 #include "hw/hw.h"

diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
index 02449b390e27a07ad4bd7c412a504fc49aa410de..eed6325cdecbfb2315c746c7c46f24ad43902017 100644 (file)
--- a/hw/intc/s390_flic_kvm.c
+++ b/hw/intc/s390_flic_kvm.c
@@ -11,6 +11,8 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include <sys/ioctl.h>
 #include "qemu/error-report.h"
 #include "hw/sysbus.h"

diff --git a/hw/misc/mips_cpc.c b/hw/misc/mips_cpc.c
index d2b8e42da7b6fb425b26c22446de96726ec94d94..05688b7c4bf0f2949d5d01ef190b9e085a033368 100644 (file)
--- a/hw/misc/mips_cpc.c
+++ b/hw/misc/mips_cpc.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "cpu.h"
 #include "hw/sysbus.h"
 
 #include "hw/misc/mips_cpc.h"

diff --git a/hw/misc/mips_itu.c b/hw/misc/mips_itu.c
index da5455062db371338704fbcda495a15bcaac684b..c1a44537a3ad69ea70035d0688e13d7700eee91c 100644 (file)
--- a/hw/misc/mips_itu.c
+++ b/hw/misc/mips_itu.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "cpu.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c
index 7d59018fc2b84518fc2cfc742cd92570e308b6dc..e7f413e49d083f569e5ac6e33396d6317ff7b081 100644 (file)
--- a/hw/ppc/ppc4xx_devs.c
+++ b/hw/ppc/ppc4xx_devs.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "cpu.h"
 #include "hw/hw.h"
 #include "hw/ppc/ppc.h"
 #include "hw/ppc/ppc4xx.h"

diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 3ffb85e601c0425a15efb9556ef76cd6c064b3a0..07ffe72de1d062b550503222fb3c06cb189419b1 100644 (file)
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "cpu.h"
 #include "hw/hw.h"
 #include "hw/timer/m48t59.h"
 #include "hw/i386/pc.h"

diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index b807a08c285a370b7da668db780023f36bd3d0f6..b97d96685cf1f74b610898238bef879767113516 100644 (file)
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "cpu.h"
 #include "hw/sysbus.h"
 #include "hw/hw.h"
 #include "hw/char/serial.h"

diff --git a/hw/xtensa/pic_cpu.c b/hw/xtensa/pic_cpu.c
index c835bd00961bc2376bb9db411ea314813eae8cd6..ccf65fd8ad6e755012a407ac10aa878f577d18bc 100644 (file)
--- a/hw/xtensa/pic_cpu.c
+++ b/hw/xtensa/pic_cpu.c
@@ -26,6 +26,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "cpu.h"
 #include "hw/hw.h"
 #include "qemu/log.h"
 #include "qemu/timer.h"

diff --git a/include/disas/disas.h b/include/disas/disas.h
index 2b9293b62acd9301a729c3eded5a7a512606e23b..4930d78ac4edf9eb73af8a9582d01ff0befc0077 100644 (file)
--- a/include/disas/disas.h
+++ b/include/disas/disas.h
@@ -4,6 +4,8 @@
 #include "qemu-common.h"
 
 #ifdef NEED_CPU_H
+#include "cpu.h"
+
 /* Disassemble this for me please... (debugging). */
 void disas(FILE *out, void *code, unsigned long size);
 void target_disas(FILE *out, CPUState *cpu, target_ulong code,

diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h
index d9e8cf7715c5c613ac4b87fadeaddf43e1bbbacf..8e3f8d8176d95ff503b6aecb10ada6b199992655 100644 (file)
--- a/include/exec/gdbstub.h
+++ b/include/exec/gdbstub.h
@@ -11,6 +11,8 @@
 #define GDB_WATCHPOINT_ACCESS    4
 
 #ifdef NEED_CPU_H
+#include "cpu.h"
+
 typedef void (*gdb_syscall_complete_cb)(CPUState *cpu,
                                         target_ulong ret, target_ulong err);
 

diff --git a/include/exec/hwaddr.h b/include/exec/hwaddr.h
index c9eb78fba18f047cb0369be066fb5667b26f325b..bb41588b9df7b2c4a71bcb92ec79b047523f795d 100644 (file)
--- a/include/exec/hwaddr.h
+++ b/include/exec/hwaddr.h
@@ -3,6 +3,8 @@
 #ifndef HWADDR_H
 #define HWADDR_H
 
+#include <inttypes.h>
+
 #define HWADDR_BITS 64
 /* hwaddr is the type of a physical address (its size can
    be different from 'target_ulong').  */

diff --git a/include/hw/arm/digic.h b/include/hw/arm/digic.h
index aaefe0b470608e367736067bbdf0d16734819fbb..63785baaa87f2b042147511e625c61bfd612c8bc 100644 (file)
--- a/include/hw/arm/digic.h
+++ b/include/hw/arm/digic.h
@@ -18,6 +18,7 @@
 #ifndef HW_ARM_DIGIC_H
 #define HW_ARM_DIGIC_H
 
+#include "cpu.h"
 #include "hw/timer/digic-timer.h"
 #include "hw/char/digic-uart.h"
 

diff --git a/include/hw/arm/fsl-imx6.h b/include/hw/arm/fsl-imx6.h
index d24aaee1c16c566bc08463bb48bd6f4dce509d0c..e9157ea4b35cbad1d4d7aaa8eaa7c7b05fa37bb9 100644 (file)
--- a/include/hw/arm/fsl-imx6.h
+++ b/include/hw/arm/fsl-imx6.h
@@ -29,6 +29,7 @@
 #include "hw/sd/sdhci.h"
 #include "hw/ssi/imx_spi.h"
 #include "exec/memory.h"
+#include "cpu.h"
 
 #define TYPE_FSL_IMX6 "fsl,imx6"
 #define FSL_IMX6(obj) OBJECT_CHECK(FslIMX6State, (obj), TYPE_FSL_IMX6)

diff --git a/include/hw/arm/virt-acpi-build.h b/include/hw/arm/virt-acpi-build.h
index 7d3700ebf6250f642dea639a72c9fd8662a653f5..e43330ad659b0dc6e8ec5b4c5d54e2922e850378 100644 (file)
--- a/include/hw/arm/virt-acpi-build.h
+++ b/include/hw/arm/virt-acpi-build.h
@@ -22,6 +22,7 @@
 
 #include "qemu-common.h"
 #include "hw/arm/virt.h"
+#include "qemu/notify.h"
 
 #define ACPI_GICC_ENABLED 1
 

diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index ecd8589603926027c1035d1b075ed38a55de906f..82703d2ecd5edd2b1f2d2424c6eeea5b4a2d8ddd 100644 (file)
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -31,6 +31,7 @@
 #define QEMU_ARM_VIRT_H
 
 #include "qemu-common.h"
+#include "exec/hwaddr.h"
 
 #define NUM_GICV2M_SPIS       64
 #define NUM_VIRTIO_TRANSPORTS 32

diff --git a/include/hw/hw.h b/include/hw/hw.h
index 29931d1e43ca8060c187561812bb4701228295eb..a20321badaaf1abf5cf8c2afae063ab1a7474157 100644 (file)
--- a/include/hw/hw.h
+++ b/include/hw/hw.h
@@ -2,7 +2,6 @@
 #ifndef QEMU_HW_H
 #define QEMU_HW_H
 
-
 #ifdef CONFIG_USER_ONLY
 #error Cannot include hw/hw.h from user emulation
 #endif

diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h
index d5d273a449b7a94c7dcd673007f1aed77a7a2b52..c8a4b98d5d712fb5cc54fdf1b9663bac6ea12dfe 100644 (file)
--- a/include/hw/sd/sd.h
+++ b/include/hw/sd/sd.h
@@ -29,6 +29,8 @@
 #ifndef __hw_sd_h
 #define __hw_sd_h              1
 
+#include "hw/qdev.h"
+
 #define OUT_OF_RANGE           (1 << 31)
 #define ADDRESS_ERROR          (1 << 30)
 #define BLOCK_LEN_ERROR                (1 << 29)

diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
index 6eb815aacebbb8f10c9e67cc6b2f6a437a35f831..63654834739f918d22b28a6f8bcc685f4e0383fb 100644 (file)
--- a/include/hw/xen/xen.h
+++ b/include/hw/xen/xen.h
@@ -7,8 +7,10 @@
  *   /usr/include/xen, so it can be included unconditionally.
  */
 
-#include "hw/irq.h"
 #include "qemu-common.h"
+#include "qemu/typedefs.h"
+#include "exec/cpu-common.h"
+#include "hw/irq.h"
 
 /* xen-machine.c */
 enum xen_mode {
@@ -37,12 +39,11 @@ qemu_irq *xen_interrupt_controller_init(void);
 
 void xenstore_store_pv_console_info(int i, struct CharDriverState *chr);
 
-#if defined(NEED_CPU_H) && !defined(CONFIG_USER_ONLY)
 void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory);
+
 void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size,
                    struct MemoryRegion *mr, Error **errp);
 void xen_modified_memory(ram_addr_t start, ram_addr_t length);
-#endif
 
 void xen_register_framebuffer(struct MemoryRegion *mr);
 

diff --git a/include/qemu-common.h b/include/qemu-common.h
index cd3139b2df94bfe1ab284c6051f7a8790cbb2297..835cbc68b8e4982fc8bf50e1fdae128005cac00d 100644 (file)
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -22,11 +22,6 @@
 
 #include "qemu/option.h"
 
-/* FIXME: Remove NEED_CPU_H.  */
-#ifdef NEED_CPU_H
-#include "cpu.h"
-#endif /* !defined(NEED_CPU_H) */
-
 /* main function, renamed */
 #if defined(CONFIG_COCOA)
 int qemu_main(int argc, char **argv, char **envp);

diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 0e18f15c9493ac87ea1256b048f70ffe049f6eb5..f9f00e2e56cba881678644f5485b405c1087990f 100644 (file)
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -218,6 +218,7 @@ int kvm_init_vcpu(CPUState *cpu);
 int kvm_cpu_exec(CPUState *cpu);
 
 #ifdef NEED_CPU_H
+#include "cpu.h"
 
 void kvm_setup_guest_memory(void *start, size_t size);
 void kvm_flush_coalesced_mmio_buffer(void);

diff --git a/ioport.c b/ioport.c
index 7a84d5444ea72b9609ee043ad01b5b134e1b39ac..901a997793cdfdb46d1e6df483f7628945fb6ec9 100644 (file)
--- a/ioport.c
+++ b/ioport.c
@@ -26,6 +26,8 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "exec/ioport.h"
 #include "trace.h"
 #include "exec/memory.h"

diff --git a/memory.c b/memory.c
index f76f85df95eea6a31ccf99ff168b91ad12842820..a8ef85261fdfd7dc1a796aef63582de7cdca0df9 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -15,6 +15,8 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
 #include "exec/ioport.h"

diff --git a/migration/ram.c b/migration/ram.c
index 88fbffcce45239befa37577b78f47a6fe4439640..5e88080fafe67f38899d9c2c7bfbe1d2fd16d33f 100644 (file)
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -26,6 +26,8 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include <zlib.h>
 #include "qapi-event.h"
 #include "qemu/cutils.h"

diff --git a/migration/savevm.c b/migration/savevm.c
index 16ba44379870d48342e7693406d8f3929cfc8699..bfb3d9178f688083cb878923b30d8bcacb73948e 100644 (file)
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -27,6 +27,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "cpu.h"
 #include "hw/boards.h"
 #include "hw/hw.h"
 #include "hw/qdev.h"

diff --git a/monitor.c b/monitor.c
index d1c193013e3657e167c72ca18b106567800cb5aa..812383ff4d6f25219b193d03d783c369d3875dad 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -23,6 +23,8 @@
  */
 #include "qemu/osdep.h"
 #include <dirent.h>
+#include "qemu-common.h"
+#include "cpu.h"
 #include "hw/hw.h"
 #include "monitor/qdev.h"
 #include "hw/usb.h"

diff --git a/qtest.c b/qtest.c
index 87575bc0b45d38ee3c4506596592b20fef9e198c..da4826c69ff50dc86115cfc0def3134c7db95083 100644 (file)
--- a/qtest.c
+++ b/qtest.c
@@ -13,6 +13,8 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "sysemu/qtest.h"
 #include "hw/qdev.h"
 #include "sysemu/char.h"

diff --git a/scripts/tracetool/format/tcg_helper_c.py b/scripts/tracetool/format/tcg_helper_c.py
index a089b0bf05637b7eda5a14a21fb0b58a6ede2f67..e3485b7f923b9716e15fa20db2e781304dccd457 100644 (file)
--- a/scripts/tracetool/format/tcg_helper_c.py
+++ b/scripts/tracetool/format/tcg_helper_c.py
@@ -48,6 +48,7 @@ def generate(events, backend):
         '',
         '#include "qemu/osdep.h"',
         '#include "qemu-common.h"',
+        '#include "cpu.h"',
         '#include "trace.h"',
         '#include "exec/helper-proto.h"',
         '',

diff --git a/target-alpha/gdbstub.c b/target-alpha/gdbstub.c
index 199f02842556b3b4cf83bbf6e032dd273ebdf610..d64bcccfa02ec25010c0cdf71fe6f320f58e8467 100644 (file)
--- a/target-alpha/gdbstub.c
+++ b/target-alpha/gdbstub.c
@@ -19,6 +19,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "exec/gdbstub.h"
 
 int alpha_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)

diff --git a/target-alpha/machine.c b/target-alpha/machine.c
index 3f72943ca61032f968a0edbb233058b251cb026b..710b7835b425c69d3f38ff6781636d6e5b5cdfe5 100644 (file)
--- a/target-alpha/machine.c
+++ b/target-alpha/machine.c
@@ -1,4 +1,6 @@
 #include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "migration/cpu.h"

diff --git a/target-arm/gdbstub.c b/target-arm/gdbstub.c
index 3ba9aadd484a1816da948f8ec74bbfcfcb2c1d64..04c1208d030b81de89ac77538ed8d0c98278bcb5 100644 (file)
--- a/target-arm/gdbstub.c
+++ b/target-arm/gdbstub.c
@@ -19,6 +19,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "exec/gdbstub.h"
 
 /* Old gdb always expect FPA registers.  Newer (xml-aware) gdb only expect

diff --git a/target-arm/gdbstub64.c b/target-arm/gdbstub64.c
index 634c6bc6f27807a5e27078a4f41a971c587ecea7..49bc3fc52167aa87553a4184fb54720eab8c6f07 100644 (file)
--- a/target-arm/gdbstub64.c
+++ b/target-arm/gdbstub64.c
@@ -18,6 +18,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "exec/gdbstub.h"
 
 int aarch64_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)

diff --git a/target-arm/kvm-stub.c b/target-arm/kvm-stub.c
index 38bf4338767b160f237d68aa09d50d81ce09df05..b2c66df532f91b33b6159f765cae5372a92c249a 100644 (file)
--- a/target-arm/kvm-stub.c
+++ b/target-arm/kvm-stub.c
@@ -11,6 +11,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "kvm_arm.h"
 
 bool write_kvmstate_to_list(ARMCPU *cpu)

diff --git a/target-arm/kvm32.c b/target-arm/kvm32.c
index d44a7f92b6622cebb1940055bc1d5a0e8712a786..7f5935ab135dae2f726f54b17c008d9d49f40ad8 100644 (file)
--- a/target-arm/kvm32.c
+++ b/target-arm/kvm32.c
@@ -15,11 +15,11 @@
 #include <linux/kvm.h>
 
 #include "qemu-common.h"
+#include "cpu.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/kvm.h"
 #include "kvm_arm.h"
-#include "cpu.h"
 #include "internals.h"
 #include "hw/arm/arm.h"
 

diff --git a/target-arm/kvm64.c b/target-arm/kvm64.c
index e8527bf0cc57b29fdd79a4d5e50017194e4c04b1..e2a34f67a44d73faa9495469c2c94df9bab361b2 100644 (file)
--- a/target-arm/kvm64.c
+++ b/target-arm/kvm64.c
@@ -18,6 +18,7 @@
 #include <linux/kvm.h>
 
 #include "qemu-common.h"
+#include "cpu.h"
 #include "qemu/timer.h"
 #include "qemu/error-report.h"
 #include "qemu/host-utils.h"
@@ -25,7 +26,6 @@
 #include "sysemu/sysemu.h"
 #include "sysemu/kvm.h"
 #include "kvm_arm.h"
-#include "cpu.h"
 #include "internals.h"
 #include "hw/arm/arm.h"
 

diff --git a/target-arm/machine.c b/target-arm/machine.c
index c23feb18d6b7ed92ae3e6e963c0bf76b7e85bbde..2f452603f16ab8410b290a65db659487a7551fb5 100644 (file)
--- a/target-arm/machine.c
+++ b/target-arm/machine.c
@@ -1,4 +1,6 @@
 #include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "qemu/error-report.h"

diff --git a/target-cris/gdbstub.c b/target-cris/gdbstub.c
index 1bbf17b04aee95af7e44cedf8a0a620f268c3a5c..3a72ee2a98a2820179244196595b50f1a1272fa1 100644 (file)
--- a/target-cris/gdbstub.c
+++ b/target-cris/gdbstub.c
@@ -19,6 +19,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "exec/gdbstub.h"
 
 int crisv10_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)

diff --git a/target-cris/machine.c b/target-cris/machine.c
index 4c9287f310c6faa54bfa19c90d0a699831888e81..6b797e8c1dbf709db55d1c137c6eb86aec42f496 100644 (file)
--- a/target-cris/machine.c
+++ b/target-cris/machine.c
@@ -19,6 +19,8 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "hw/hw.h"
 #include "migration/cpu.h"
 

diff --git a/target-i386/gdbstub.c b/target-i386/gdbstub.c
index 4b5071398fe5245ab0229c67d219d71999190d48..c494535df1e122120e4947abf461a9308968bb72 100644 (file)
--- a/target-i386/gdbstub.c
+++ b/target-i386/gdbstub.c
@@ -19,6 +19,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "exec/gdbstub.h"
 
 #ifdef TARGET_X86_64

diff --git a/target-i386/kvm-stub.c b/target-i386/kvm-stub.c
index 8df9c5953f540252b7fc8ac4c991d00756d7cd9f..cdf15061091df6c960bca738ea2f7fc05d597e7c 100644 (file)
--- a/target-i386/kvm-stub.c
+++ b/target-i386/kvm-stub.c
@@ -11,6 +11,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "kvm_i386.h"
 
 bool kvm_allows_irq0_override(void)

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 799fdfa682a2a6aba20d6760b36dbbeea2752464..c76e7bbc892967e6a8194672ff17a2cecd8d59b7 100644 (file)
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -22,10 +22,10 @@
 #include <linux/kvm_para.h>
 
 #include "qemu-common.h"
+#include "cpu.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/kvm_int.h"
 #include "kvm_i386.h"
-#include "cpu.h"
 #include "hyperv.h"
 
 #include "exec/gdbstub.h"

diff --git a/target-i386/machine.c b/target-i386/machine.c
index 57203b2fd3b2063fb256e33de839b15119166d86..658b066da001a6d16033142b7b3386dd294fcf25 100644 (file)
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -1,4 +1,6 @@
 #include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "hw/i386/pc.h"

diff --git a/target-lm32/gdbstub.c b/target-lm32/gdbstub.c
index 8ac1288bb6935c2edf6a4192a45bc7874a0ea9a4..cf929dd3926df1d6948b74afd128a29697fb2251 100644 (file)
--- a/target-lm32/gdbstub.c
+++ b/target-lm32/gdbstub.c
@@ -19,6 +19,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "exec/gdbstub.h"
 #include "hw/lm32/lm32_pic.h"
 

diff --git a/target-lm32/machine.c b/target-lm32/machine.c
index 6f562161ce7ecfaca2ce7a887f2ce7d9d68dfb6a..3c258a4bcc54ad37d04a570a9e643457fde29626 100644 (file)
--- a/target-lm32/machine.c
+++ b/target-lm32/machine.c
@@ -1,4 +1,6 @@
 #include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "migration/cpu.h"

diff --git a/target-m68k/gdbstub.c b/target-m68k/gdbstub.c
index f02bb5caf40d24cfeed0cc9abadf6657be0cfdac..c7f44c9bb32be14ef0323fce8b243e1bf59a46fb 100644 (file)
--- a/target-m68k/gdbstub.c
+++ b/target-m68k/gdbstub.c
@@ -19,6 +19,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "exec/gdbstub.h"
 
 int m68k_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)

diff --git a/target-microblaze/gdbstub.c b/target-microblaze/gdbstub.c
index 89d38980bf15bd9210b026893840b1a1028aebca..7fb076c2e9b096bd95dd7b6c5cea1a6e2e19f5fe 100644 (file)
--- a/target-microblaze/gdbstub.c
+++ b/target-microblaze/gdbstub.c
@@ -19,6 +19,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "exec/gdbstub.h"
 
 int mb_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)

diff --git a/target-mips/cpu.h b/target-mips/cpu.h
index c65f84e948cc05e3df3e2af3f43b81c42a5a38fa..a7c8660d4788f1e858053307cd4ff220c3a17146 100644 (file)
--- a/target-mips/cpu.h
+++ b/target-mips/cpu.h
@@ -1145,22 +1145,8 @@ static inline void cpu_mips_store_cause(CPUMIPSState *env, target_ulong val)
 }
 #endif
 
-static inline void QEMU_NORETURN do_raise_exception_err(CPUMIPSState *env,
-                                                        uint32_t exception,
-                                                        int error_code,
-                                                        uintptr_t pc)
-{
-    CPUState *cs = CPU(mips_env_get_cpu(env));
-
-    if (exception < EXCP_SC) {
-        qemu_log_mask(CPU_LOG_INT, "%s: %d %d\n",
-                      __func__, exception, error_code);
-    }
-    cs->exception_index = exception;
-    env->error_code = error_code;
-
-    cpu_loop_exit_restore(cs, pc);
-}
+void QEMU_NORETURN do_raise_exception_err(CPUMIPSState *env, uint32_t exception,
+                                          int error_code, uintptr_t pc);
 
 static inline void QEMU_NORETURN do_raise_exception(CPUMIPSState *env,
                                                     uint32_t exception,

diff --git a/target-mips/gdbstub.c b/target-mips/gdbstub.c
index b0b4a32ec01fc3a7e60cb809d369860267de51dc..2707ff5c2b2740660d3afc9426266ff96aa279d9 100644 (file)
--- a/target-mips/gdbstub.c
+++ b/target-mips/gdbstub.c
@@ -19,6 +19,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "exec/gdbstub.h"
 
 int mips_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)

diff --git a/target-mips/helper.c b/target-mips/helper.c
index cfea177ee55eb295e67de5d12e03df25195b5369..1f35e7ff87a21786b93eb80b0c450586794d99cd 100644 (file)
--- a/target-mips/helper.c
+++ b/target-mips/helper.c
@@ -840,3 +840,20 @@ void r4k_invalidate_tlb (CPUMIPSState *env, int idx, int use_extra)
     }
 }
 #endif
+
+void QEMU_NORETURN do_raise_exception_err(CPUMIPSState *env,
+                                          uint32_t exception,
+                                          int error_code,
+                                          uintptr_t pc)
+{
+    CPUState *cs = CPU(mips_env_get_cpu(env));
+
+    if (exception < EXCP_SC) {
+        qemu_log_mask(CPU_LOG_INT, "%s: %d %d\n",
+                      __func__, exception, error_code);
+    }
+    cs->exception_index = exception;
+    env->error_code = error_code;
+
+    cpu_loop_exit_restore(cs, pc);
+}

diff --git a/target-mips/kvm.c b/target-mips/kvm.c
index 950bc05b7c32d2b02e336ecc2737ada9fd66f500..a854e4de596dc44c02ab41538e37ceec4144b728 100644 (file)
--- a/target-mips/kvm.c
+++ b/target-mips/kvm.c
@@ -16,11 +16,11 @@
 #include <linux/kvm.h>
 
 #include "qemu-common.h"
+#include "cpu.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/kvm.h"
-#include "cpu.h"
 #include "sysemu/cpus.h"
 #include "kvm_mips.h"
 #include "exec/memattrs.h"

diff --git a/target-mips/machine.c b/target-mips/machine.c
index eb3d916ef34bb3e6d79a4ebda8930d01437cbcfd..7314cfe8c77a83f158009a7caf6cd5e142b1095e 100644 (file)
--- a/target-mips/machine.c
+++ b/target-mips/machine.c
@@ -1,4 +1,6 @@
 #include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "hw/hw.h"
 #include "cpu.h"
 #include "migration/cpu.h"

diff --git a/target-moxie/machine.c b/target-moxie/machine.c
index 7810e1cd2b8b31a568e1572eb2abb9162a1693a3..282dcd869f283b58a95b36e3b5e508d0e1f4e599 100644 (file)
--- a/target-moxie/machine.c
+++ b/target-moxie/machine.c
@@ -1,4 +1,6 @@
 #include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "machine.h"

diff --git a/target-openrisc/gdbstub.c b/target-openrisc/gdbstub.c
index edc301a7c5dcf71b15ae3d1339c29808117d4521..cb16e763582660dc8fc629a199b6e27ff76d7ce8 100644 (file)
--- a/target-openrisc/gdbstub.c
+++ b/target-openrisc/gdbstub.c
@@ -19,6 +19,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "exec/gdbstub.h"
 
 int openrisc_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)

diff --git a/target-openrisc/machine.c b/target-openrisc/machine.c
index bd5d50f3380f8b1fc013e566a06e44c081e2739a..17b0c77d6c453d20c714fe2721bc5b9a5addec6c 100644 (file)
--- a/target-openrisc/machine.c
+++ b/target-openrisc/machine.c
@@ -18,6 +18,8 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "migration/cpu.h"

diff --git a/target-ppc/gdbstub.c b/target-ppc/gdbstub.c
index 569c380cfad2dcac361d9496ee9d4a6a6cf83675..7a338136a89143b63b22f0f200b98d22d42ac4e0 100644 (file)
--- a/target-ppc/gdbstub.c
+++ b/target-ppc/gdbstub.c
@@ -19,6 +19,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "exec/gdbstub.h"
 
 static int ppc_gdb_register_len_apple(int n)

diff --git a/target-ppc/kvm-stub.c b/target-ppc/kvm-stub.c
index 627bcb43226acc202fdfc3281d063b57f480250c..efeafca1df61b247e549c7bc9b00fe649e888a7a 100644 (file)
--- a/target-ppc/kvm-stub.c
+++ b/target-ppc/kvm-stub.c
@@ -11,6 +11,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "hw/ppc/openpic.h"
 
 int kvm_openpic_connect_vcpu(DeviceState *d, CPUState *cs)

diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index c4c81467e442b30319272a0e5660e29595afd0d2..24d6032007afaf3d16c4537245558ebea444e0c2 100644 (file)
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -24,11 +24,11 @@
 
 #include "qemu-common.h"
 #include "qemu/error-report.h"
+#include "cpu.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/kvm.h"
 #include "kvm_ppc.h"
-#include "cpu.h"
 #include "sysemu/cpus.h"
 #include "sysemu/device_tree.h"
 #include "mmu-hash64.h"

diff --git a/target-ppc/machine.c b/target-ppc/machine.c
index c0b91823a900e8acb75979631937a51e4726e619..4911cb71393966a23bb19276b3054f7dc9158567 100644 (file)
--- a/target-ppc/machine.c
+++ b/target-ppc/machine.c
@@ -1,4 +1,6 @@
 #include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "sysemu/kvm.h"

diff --git a/target-s390x/gdbstub.c b/target-s390x/gdbstub.c
index 9fc36cb54e40da290230ec44b44baecabc2d7220..0992ae722b871afcf6a7b719236559932e1851df 100644 (file)
--- a/target-s390x/gdbstub.c
+++ b/target-s390x/gdbstub.c
@@ -19,6 +19,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "exec/gdbstub.h"
 #include "qemu/bitops.h"
 

diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 55ae6d3304586912bf2554d905113afe2ff0dd06..8f46fd0f104ed01e014a369806f6539b94af192e 100644 (file)
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -29,12 +29,12 @@
 #include <asm/ptrace.h>
 
 #include "qemu-common.h"
+#include "cpu.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/kvm.h"
 #include "hw/hw.h"
-#include "cpu.h"
 #include "sysemu/device_tree.h"
 #include "qapi/qmp/qjson.h"
 #include "exec/gdbstub.h"

diff --git a/target-sh4/gdbstub.c b/target-sh4/gdbstub.c
index 1b59ea8c7393edc3e7c1a11fb7d59eb1dd6afc15..13bea00d7d48b2e5c9b3f877d04fd1a658318214 100644 (file)
--- a/target-sh4/gdbstub.c
+++ b/target-sh4/gdbstub.c
@@ -19,6 +19,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "exec/gdbstub.h"
 
 /* Hint: Use "set architecture sh4" in GDB to see fpu registers */

diff --git a/target-sparc/gdbstub.c b/target-sparc/gdbstub.c
index e530dc52f5ee8336991f258c3719645116f774f6..ffc2baa2e74cb3981696add91500e2d598ba9229 100644 (file)
--- a/target-sparc/gdbstub.c
+++ b/target-sparc/gdbstub.c
@@ -19,6 +19,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "exec/gdbstub.h"
 
 #ifdef TARGET_ABI32

diff --git a/target-sparc/machine.c b/target-sparc/machine.c
index 04806f6728f5dc96aa679c08ce98e21a34b39a48..c8823af951db27ab0dc8631d8c7c8376f2a496f1 100644 (file)
--- a/target-sparc/machine.c
+++ b/target-sparc/machine.c
@@ -1,4 +1,6 @@
 #include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "qemu/timer.h"

diff --git a/target-xtensa/gdbstub.c b/target-xtensa/gdbstub.c
index 51d4db0836b2f326f14fd6a600f4e2211b943d9d..bfcd591409e589b6350c7415c08e49dbc61f0d0a 100644 (file)
--- a/target-xtensa/gdbstub.c
+++ b/target-xtensa/gdbstub.c
@@ -19,6 +19,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "cpu.h"
 #include "exec/gdbstub.h"
 
 int xtensa_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)

diff --git a/tcg/optimize.c b/tcg/optimize.c
index f01160815c17be5fcec4845b901343e801ce1cbf..def4ba691320481478574af955cf3816e247bd78 100644 (file)
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -24,9 +24,8 @@
  */
 
 #include "qemu/osdep.h"
-
-
 #include "qemu-common.h"
+#include "cpu.h"
 #include "tcg-op.h"
 
 #define CASE_OP_32_64(x)                        \

diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index f554b86d4064cc2d1ba25df2982e62fce455a2e4..7a159142e66560fcfa14624e235f08c22dc4ad75 100644 (file)
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -23,6 +23,8 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "cpu.h"
 #include "tcg.h"
 #include "tcg-op.h"
 

diff --git a/tcg/tcg.h b/tcg/tcg.h
index a013d77a338aca3e88f25e0c2eb6dd3e4db67800..8abf31834330e1b07e6bdb31450f7f226f7e116e 100644 (file)
--- a/tcg/tcg.h
+++ b/tcg/tcg.h
@@ -26,6 +26,7 @@
 #define TCG_H
 
 #include "qemu-common.h"
+#include "cpu.h"
 #include "qemu/bitops.h"
 #include "tcg-target.h"
 

diff --git a/xen-hvm.c b/xen-hvm.c
index 039680a6d905bd19a792330f1bcd50c127fd1f21..4236f78ad883c91595acc995aa7c4aa949279c7a 100644 (file)
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -11,6 +11,7 @@
 #include "qemu/osdep.h"
 #include <sys/mman.h>
 
+#include "cpu.h"
 #include "hw/pci/pci.h"
 #include "hw/i386/pc.h"
 #include "hw/i386/apic-msidef.h"