softmmu: move include files to include/sysemu/

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

diff --git a/arch_init.c b/arch_init.c
index 9dacf5689bce20089c3e456b4fab3c38ef9db771..a8b65416da215b1ce829844782750b51f3218e79 100644 (file)
--- a/arch_init.c
+++ b/arch_init.c
@@ -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"

diff --git a/audio/audio.c b/audio/audio.c
index eb2222c10fc24fb1aed4d92fce607a57f315ee2c..1510b598a6269eb996569ae29b8817610093283d 100644 (file)
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -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"

diff --git a/audio/winwaveaudio.c b/audio/winwaveaudio.c
index 72babbf184a199ca08b075166ea5b902ed4bcbad..8dbd145ca1ffed13b82209ce78c7320a38ca2bb2 100644 (file)
--- a/audio/winwaveaudio.c
+++ b/audio/winwaveaudio.c
@@ -1,7 +1,7 @@
 /* public domain */
 
 #include "qemu-common.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "audio.h"
 
 #define AUDIO_CAP "winwave"

diff --git a/balloon.c b/balloon.c
index d1de4352b47407daf6d583a95fc480c348e57e90..e321f2c6886dae5c96bc7a38c4ffa0f45590d45e 100644 (file)
--- a/balloon.c
+++ b/balloon.c
@@ -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"

diff --git a/block-migration.c b/block-migration.c
index 4e865a67810bd0475439c3364451af894b5b1ff0..ca4ba3fffb0574f037f3edaceea06d2a2bff75f1 100644 (file)
--- a/block-migration.c
+++ b/block-migration.c
@@ -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)

diff --git a/block.c b/block.c
index 1af4b99ee8e1ba696c34c53c526a83ce9674be87..4e28c55bc70c00787dcd31a11a0190ff6dd9c752 100644 (file)
--- a/block.c
+++ b/block.c
@@ -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"

diff --git a/block/vdi.c b/block/vdi.c
index 7b6231941bacb2553ace49c97eb5912d2886ed33..021abaa22731622c6ba756d04bd20137a2ed24f4 100644 (file)
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -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
 

diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index 95b621699aba1913b14de3afae504af7f2907d44..dc4e9a2462c0909b23853257adde7ee2968cf896 100644 (file)
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -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"

diff --git a/blockdev.c b/blockdev.c
index 3ebff4431061525847e5e2cd19aa319f6a31fae0..d724e2dc5bf8d40f6e321d09eda2f34e9bd371f3 100644 (file)
--- a/blockdev.c
+++ b/blockdev.c
@@ -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);
 

diff --git a/cpu-exec.c b/cpu-exec.c
index 54e62ed551fa1aa951dc72ce20dd4b01855b9404..19ebb4a924c244b2d35212a9dc097614519c4703 100644 (file)
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -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;
 

diff --git a/cpus.c b/cpus.c
index 036418d62ce3f4a50a1ada593c965522d3e34f4c..4a7782a541382619c5ec211e7a46faaac8442049 100644 (file)
--- a/cpus.c
+++ b/cpus.c
@@ -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"
 

diff --git a/device_tree.c b/device_tree.c
index c3e1ba49046d5d3df50eb1112a5efed012006d4d..56af24b397282bbecb14c3cb37cd21bbdf968e39 100644 (file)
--- a/device_tree.c
+++ b/device_tree.c
@@ -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"

diff --git a/dma-helpers.c b/dma-helpers.c
index e6a6dd82fd1110ffcad6081e0c350f46ec301eb9..272632f3671988e479d0c3473efbb8c12b1bb075 100644 (file)
--- a/dma-helpers.c
+++ b/dma-helpers.c
@@ -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"

diff --git a/dump-stub.c b/dump-stub.c
index 0842e6f916d52feaefcabf293bfc44d01113def6..a9d0b3c67b10ef1caec46dbbbd5353a4dec9231b 100644 (file)
--- a/dump-stub.c
+++ b/dump-stub.c
@@ -12,7 +12,7 @@
  */
 
 #include "qemu-common.h"
-#include "dump.h"
+#include "sysemu/dump.h"
 #include "qapi/qmp/qerror.h"
 #include "qmp-commands.h"
 

diff --git a/dump.c b/dump.c
index 871ee1727ab08242ff75b97e32461b783b67a726..a26b1a5e1a0663616fe32909ef303de521b3af96 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -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"

diff --git a/exec.c b/exec.c
index 917bec0ecd02442a1771c0fe63be5349acc627d1..28abd7e7102013d9ac04d6d026689c7b37d0c5bc 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -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
 

diff --git a/gdbstub.c b/gdbstub.c
index 4b178a608fe58723e1a25174f4b87dd54eddf508..2fca1a7ebf476ee0cc63dd71ed03a1a15c2475a9 100644 (file)
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -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,

diff --git a/hw/ac97.c b/hw/ac97.c
index 3e659b38df8bb88dc0205155825ac54cb6786e13..5cd19c1d023d3f428777d222494f037dca81349f 100644 (file)
--- a/hw/ac97.c
+++ b/hw/ac97.c
@@ -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,

diff --git a/hw/acpi.c b/hw/acpi.c
index fe9b76a9b01cc32da0cb9f985f11b407be83c4e4..97617c4ef57674b33af3f8ccac1cbab035f88e21 100644 (file)
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -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"

diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c
index 8d1a689a364ec16007de7447c5b42533e9d17609..37a50e6d7bc5ad03a78f7ff8a73ebc6cbe3b82fa 100644 (file)
--- a/hw/acpi_ich9.c
+++ b/hw/acpi_ich9.c
@@ -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"

diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index ebd015dc02c5eec8d23780e4d7c41ad8326667f5..f53b969aa60516ee78760ccb483a8e798a608c9e 100644 (file)
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -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"

diff --git a/hw/alpha_dp264.c b/hw/alpha_dp264.c
index 76d8ae8a843a8f982e0344fa24c2a1b4e23b5414..e7e52c1f1ca9eff96f85700e7a212a251a4a7e0c 100644 (file)
--- a/hw/alpha_dp264.c
+++ b/hw/alpha_dp264.c
@@ -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"

diff --git a/hw/alpha_pci.c b/hw/alpha_pci.c
index 78d93e55ece6a169a4d099f7335fc1cb2d2b57d2..7327d488fdb3bbdf7b6dee148c84e24320f55d14 100644 (file)
--- a/hw/alpha_pci.c
+++ b/hw/alpha_pci.c
@@ -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.  */

diff --git a/hw/alpha_typhoon.c b/hw/alpha_typhoon.c
index d61b2f483c40bc4c552bb579b4e16dfb9435aba1..9f233d99f5a5994a267c95b94f42f563289fd5e5 100644 (file)
--- a/hw/alpha_typhoon.c
+++ b/hw/alpha_typhoon.c
@@ -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"
 

diff --git a/hw/apb_pci.c b/hw/apb_pci.c
index 144a7cc8d39386fb73293f4d07562f7be87d0390..c22e2b0fc3e03925fd9d9bd7f532b50f44996fbb 100644 (file)
--- a/hw/apb_pci.c
+++ b/hw/apb_pci.c
@@ -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 */

diff --git a/hw/apic_common.c b/hw/apic_common.c
index 5f542764eb9d9b60ba4926539b19142522117c2c..0658be93c1d3f3b0b553e79ef7d246088f57549e 100644 (file)
--- a/hw/apic_common.c
+++ b/hw/apic_common.c
@@ -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;

diff --git a/hw/arm_boot.c b/hw/arm_boot.c
index bb9889fbefca48e603e14791c3aab998d2e02b42..115f58387641ac8a505b111e5d590918d3d4de93 100644 (file)
--- a/hw/arm_boot.c
+++ b/hw/arm_boot.c
@@ -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

diff --git a/hw/arm_sysctl.c b/hw/arm_sysctl.c
index 0884f6275cc84ff67e966fb1df2f2aa0a29a0eb8..b733617aa0c61191f03d9238da8e576531baa774 100644 (file)
--- a/hw/arm_sysctl.c
+++ b/hw/arm_sysctl.c
@@ -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
 

diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
index e537aecc785483d7fea02858a6174aa8622606fa..2ca606b835eab695f74301832811395c6c99fbf8 100644 (file)
--- a/hw/axis_dev88.c
+++ b/hw/axis_dev88.c
@@ -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)

diff --git a/hw/block-common.c b/hw/block-common.c
index c24208e56030ebaad31da7f03f06f80d57c69347..0f1b64ec95a06a3712422847850f43fe24b34a72 100644 (file)
--- a/hw/block-common.c
+++ b/hw/block-common.c
@@ -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"
 

diff --git a/hw/boards.h b/hw/boards.h
index c66fa16a9da3f5db92c17fd584043ad72de87b26..4540e952f7b9e98fd95a0fb2a8896c035c485582 100644 (file)
--- a/hw/boards.h
+++ b/hw/boards.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 {

diff --git a/hw/bonito.c b/hw/bonito.c
index 78e264ccc05b0d9e5a94ec0c48c405c2fd98fe46..0498c9be7980da5e94b671f72f93c2222b346c56 100644 (file)
--- a/hw/bonito.c
+++ b/hw/bonito.c
@@ -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

diff --git a/hw/cbus.c b/hw/cbus.c
index 7216899a093e9c63e8e05c074fb482482a862e85..6fd39054486956f3b5f17b46f30aac011f8dbf4f 100644 (file)
--- a/hw/cbus.c
+++ b/hw/cbus.c
@@ -23,7 +23,7 @@
 #include "qemu-common.h"
 #include "irq.h"
 #include "devices.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 //#define DEBUG
 

diff --git a/hw/collie.c b/hw/collie.c
index faf5ac9ac7d9fcf2602366b4162b62ce31caba46..804d61a421da0a6288791b8730b4e5fe2e6c9efe 100644 (file)
--- a/hw/collie.c
+++ b/hw/collie.c
@@ -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 = {

diff --git a/hw/cuda.c b/hw/cuda.c
index cf83956e1ac7e6b7db8a13df8d171a4afad11c45..d59e0aeaa91e34c47e0374a61fa98404ccf79a54 100644 (file)
--- a/hw/cuda.c
+++ b/hw/cuda.c
@@ -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 */
 

diff --git a/hw/device-hotplug.c b/hw/device-hotplug.c
index 34543786e580b2992d21785e4202013c7f6e678a..88da145a89e43fc8dd93f7d000cb3a3d09406320 100644 (file)
--- a/hw/device-hotplug.c
+++ b/hw/device-hotplug.c
@@ -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)

diff --git a/hw/e1000.c b/hw/e1000.c
index aeee3e61f41b8fa58adcfd52639aa84860fd1719..92fb00a89f282fe8d933c09600c632754baa9dac 100644 (file)
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -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"
 

diff --git a/hw/eepro100.c b/hw/eepro100.c
index 9e2be4ea0df77c42af9c60f912731b33cf1160f8..6bbefb505fd1d3d7a103961a56f099e5201b3d7c 100644 (file)
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -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.

diff --git a/hw/es1370.c b/hw/es1370.c
index 65365788e17cce4d095747cc391a3945d5ad817c..59c3f2329ea78fa1e5315f602890b39ebe3d49a8 100644 (file)
--- a/hw/es1370.c
+++ b/hw/es1370.c
@@ -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

diff --git a/hw/etraxfs_dma.c b/hw/etraxfs_dma.c
index 089267fcc1d1bcaf400b4f0a2e81e795afcf1fcb..d41500316fbf4c7123ff8ffd04b9985d98d04d52 100644 (file)
--- a/hw/etraxfs_dma.c
+++ b/hw/etraxfs_dma.c
@@ -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"
 

diff --git a/hw/etraxfs_timer.c b/hw/etraxfs_timer.c
index cc8b32771596fb5abbbce31d905aa9f207ef4b6d..e9273cd95d8cf7608bbbee803db29f537941ce83 100644 (file)
--- a/hw/etraxfs_timer.c
+++ b/hw/etraxfs_timer.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/timer.h"
 #include "ptimer.h"
 

diff --git a/hw/exynos4210.c b/hw/exynos4210.c
index 22148cd946f0be0f1e13ea7ea6e4b866a55bc59d..a7b84d61a0993e9a82e378ca7ef1bd636b4c9e83 100644 (file)
--- a/hw/exynos4210.c
+++ b/hw/exynos4210.c
@@ -22,7 +22,7 @@
  */
 
 #include "boards.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "sysbus.h"
 #include "arm-misc.h"
 #include "loader.h"

diff --git a/hw/exynos4210_rtc.c b/hw/exynos4210_rtc.c
index 6ebc9b1790d5522c8e0f5bd3fdb79fe4c4757463..5694a6207b238654eeb104ef41d206eda3a20f24 100644 (file)
--- a/hw/exynos4210_rtc.c
+++ b/hw/exynos4210_rtc.c
@@ -32,7 +32,7 @@
 
 #include "hw.h"
 #include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 #include "exynos4210.h"
 

diff --git a/hw/exynos4210_uart.c b/hw/exynos4210_uart.c
index 20dcd9fb572f8945efe0deb13fd2fd491dd31393..8950891a00eb813ea05834d471758936ec9b5b9d 100644 (file)
--- a/hw/exynos4210_uart.c
+++ b/hw/exynos4210_uart.c
@@ -20,7 +20,7 @@
  */
 
 #include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu-char.h"
 
 #include "exynos4210.h"

diff --git a/hw/exynos4_boards.c b/hw/exynos4_boards.c
index 5dd296145959af736b34b6aecbd54984ead8c084..b26796847b540377ec2353341b61a3948173695c 100644 (file)
--- a/hw/exynos4_boards.c
+++ b/hw/exynos4_boards.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "sysbus.h"
 #include "net/net.h"
 #include "arm-misc.h"

diff --git a/hw/fdc.c b/hw/fdc.c
index b67d3a574b52ae56589c6be573d058a8f50b4814..ddc0cc3819f23631e37b3d6ce25502e9d5ceee10 100644 (file)
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -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"
 
 /********************************************************/

diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c
index 2a00163a0419d203b1ec12a42872b567a52e08f7..26f7125fe2993550669157bfb5751b60f21ce1a5 100644 (file)
--- a/hw/fw_cfg.c
+++ b/hw/fw_cfg.c
@@ -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"

diff --git a/hw/gumstix.c b/hw/gumstix.c
index 4acb32c2a93ebdb6390e20937cdea0a0fe9c895d..6fb068386c029ca073ec5c96b625dce415ef7082 100644 (file)
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -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;

diff --git a/hw/highbank.c b/hw/highbank.c
index 6f5f2a9d9dca6c23d07ca8c4b0ac16d9be235bd9..6005622f3a4494f9c2d3a9f95ce820c484e6e39e 100644 (file)
--- a/hw/highbank.c
+++ b/hw/highbank.c
@@ -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

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index d38c6e4574864191d8468a363c832227663847d6..d0724499c711f49a09f144551aca69b2ffd0ed24 100644 (file)
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -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>

diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index f6d15b9f2a588ce5ff5c5e9e2292d8817677bf1d..ee855b670f7431f8b6c840117033960cdf9e2c62 100644 (file)
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -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>
 

diff --git a/hw/ide/core.c b/hw/ide/core.c
index bf65cb407e8d0505c9a7dbe0af6c48d2b04a476a..6f1938a0a8a41c04c84cdb696116afe1e0f8978c 100644 (file)
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -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>
 

diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 3457b98cc1708d58bd44f2674fe0a10c522ccb8c..de39b3067aed180ea0a45362f3d2c87ad4fbd580 100644 (file)
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -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>

diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index c5016f0ceacabab751c216212f8c647e71eaa4d8..d80360e85bbfaf54d58bafe01071dd013fe3b2f6 100644 (file)
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.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"
 

diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index 39df87c608c08e8fbe88eb8679d010fede29be8b..aa0e7fa22d0af3ff6597bd6139cbe6cdf596c01d 100644 (file)
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -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>
 

diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index 87cbb0c31e46a409a6986d0c545b85675849cdf3..d8f9b4bce1f19cf5a2a4015ad024e072c93652be 100644 (file)
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -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>
 

diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c
index 6cce5230c59a9bb8943ffae24a03840ff94e0634..642774ef98fc16054338c8e897e5c56f8c51dd70 100644 (file)
--- a/hw/ide/microdrive.c
+++ b/hw/ide/microdrive.c
@@ -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>
 

diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c
index 40443513be2d37e99641f49a616f992e2e3b7f11..eb59976eda29aaaff24ebbbe7b27963d46f53368 100644 (file)
--- a/hw/ide/mmio.c
+++ b/hw/ide/mmio.c
@@ -24,7 +24,7 @@
  */
 #include <hw/hw.h>
 #include "block/block.h"
-#include "dma.h"
+#include "sysemu/dma.h"
 
 #include <hw/ide/internal.h>
 

diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 8821d5cceb1096439d6f9fe4303269ce1ac17f63..e6226e31973eaf380ecb880277b6bd7199ce0377 100644 (file)
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -27,7 +27,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>
 

diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index 5cf39cf8f0c34f9a037a557416e5ff54f938ffca..df95aec1955fff5538d49650cde07ac9aefa4887 100644 (file)
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -27,9 +27,9 @@
 #include <hw/pc.h>
 #include <hw/pci/pci.h>
 #include <hw/isa.h>
-#include "blockdev.h"
-#include "sysemu.h"
-#include "dma.h"
+#include "sysemu/blockdev.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/dma.h"
 
 #include <hw/ide/pci.h>
 

diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index c85e1ac018e71e71604fb87b3c17a2ce35593691..d2fe77398f283bcaa949ba87b7e4820acfa98e60 100644 (file)
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -17,12 +17,12 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <hw/hw.h>
-#include "dma.h"
+#include "sysemu/dma.h"
 #include "qemu/error-report.h"
 #include <hw/ide/internal.h>
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "hw/block-common.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 /* --------------------------------- */
 

diff --git a/hw/ide/via.c b/hw/ide/via.c
index 880f61cc8e1482220002ec88d5f84e000068592a..14acb3ac0492ec5f8586211e0e5bd204938255a1 100644 (file)
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -28,8 +28,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>
 

diff --git a/hw/imx_ccm.c b/hw/imx_ccm.c
index f2e623cd293186bf949c286614f9726dd099dc5f..46962e4df9fadc64c7ac5c818a7a6502228d7d30 100644 (file)
--- a/hw/imx_ccm.c
+++ b/hw/imx_ccm.c
@@ -12,7 +12,7 @@
 
 #include "hw.h"
 #include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "imx.h"
 
 #define CKIH_FREQ 26000000 /* 26MHz crystal input */

diff --git a/hw/imx_serial.c b/hw/imx_serial.c
index dcd125fd25f56734248eb1c5e27c3f117a2b327b..e56e3ea7262d3d3448e4d1b5ff16b80715fd9fe4 100644 (file)
--- a/hw/imx_serial.c
+++ b/hw/imx_serial.c
@@ -19,7 +19,7 @@
 
 #include "hw.h"
 #include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu-char.h"
 #include "imx.h"
 

diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index c995dc724f322dfe1826314d607f3dc29a0a598d..47fc9cb944953ddfc4a6ec5a21fefa7099a11045 100644 (file)
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -13,7 +13,7 @@
 #include "arm-misc.h"
 #include "net/net.h"
 #include "exec/address-spaces.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 typedef struct {
     SysBusDevice busdev;

diff --git a/hw/intel-hda.c b/hw/intel-hda.c
index 7ef3a15e08492d2e590f5c970778e2aecc80f85e..98ff93679db44b6a4828db5bfb3b947880887301 100644 (file)
--- a/hw/intel-hda.c
+++ b/hw/intel-hda.c
@@ -24,7 +24,7 @@
 #include "audiodev.h"
 #include "intel-hda.h"
 #include "intel-hda-defs.h"
-#include "dma.h"
+#include "sysemu/dma.h"
 
 /* --------------------------------------------------------------------- */
 /* hda bus                                                               */

diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index a2be67df562e8614d4b50105f9476160577aec92..86b0bbd3d1ddba195a7690cc4f6951971501754f 100644 (file)
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -19,7 +19,7 @@
 #include "hw.h"
 #include "monitor/monitor.h"
 #include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "isa.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index af34f3b5822a6d843e1c14031837d12472f9f498..567c9a76a7af7f0639f4e6abcb6f7a9b93ee6507 100644 (file)
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -20,7 +20,7 @@
 #include "pc.h"
 #include "pci/pci.h"
 #include "pci/msix.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "migration/migration.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/event_notifier.h"

diff --git a/hw/kvm/apic.c b/hw/kvm/apic.c
index beb418de8dea107abf1d0efe54d9c7f961c74c87..dad2f21c1863694e693fbefa7d12ff48be33eaa0 100644 (file)
--- a/hw/kvm/apic.c
+++ b/hw/kvm/apic.c
@@ -11,7 +11,7 @@
  */
 #include "hw/apic_internal.h"
 #include "hw/pci/msi.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 
 static inline void kvm_apic_set_reg(struct kvm_lapic_state *kapic,
                                     int reg_id, uint32_t val)

diff --git a/hw/kvm/clock.c b/hw/kvm/clock.c
index 824b9783972710eddee87ca7943e7336be8e93b9..6fcca95ada0f0083966ffc8d1717d778aeeada39 100644 (file)
--- a/hw/kvm/clock.c
+++ b/hw/kvm/clock.c
@@ -14,8 +14,8 @@
  */
 
 #include "qemu-common.h"
-#include "sysemu.h"
-#include "kvm.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/kvm.h"
 #include "hw/sysbus.h"
 #include "hw/kvm/clock.h"
 

diff --git a/hw/kvm/i8254.c b/hw/kvm/i8254.c
index 8ee1c352cf044f7e03d6fdf3cde96a1fca164713..57faf64ab2585989c6d733e8453594f24a7fdf59 100644 (file)
--- a/hw/kvm/i8254.c
+++ b/hw/kvm/i8254.c
@@ -23,10 +23,10 @@
  * THE SOFTWARE.
  */
 #include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "hw/i8254.h"
 #include "hw/i8254_internal.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 
 #define KVM_PIT_REINJECT_BIT 0
 

diff --git a/hw/kvm/i8259.c b/hw/kvm/i8259.c
index 1e24cd4f36ff56cb49c627553501dc5c8007ea15..70e1d185dea11339909f94e3a6f44e82316967ff 100644 (file)
--- a/hw/kvm/i8259.c
+++ b/hw/kvm/i8259.c
@@ -11,7 +11,7 @@
  */
 #include "hw/i8259_internal.h"
 #include "hw/apic_internal.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 
 static void kvm_pic_get(PICCommonState *s)
 {

diff --git a/hw/kvm/ioapic.c b/hw/kvm/ioapic.c
index f95c1575919b70962aef9b406e8174d1effb8065..30db6230b4f02bc6bbe5cfba96323cdfc308fe3e 100644 (file)
--- a/hw/kvm/ioapic.c
+++ b/hw/kvm/ioapic.c
@@ -13,7 +13,7 @@
 #include "hw/pc.h"
 #include "hw/ioapic_internal.h"
 #include "hw/apic_internal.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 
 /* PC Utility function */
 void kvm_pc_setup_irq_routing(bool pci_enabled)

diff --git a/hw/kvm/pci-assign.c b/hw/kvm/pci-assign.c
index 2f06c27e83b04649a9e633d2388b821621c9d2dc..410b6c6eebd02fdac44c4cee7d30b602cc55c28f 100644 (file)
--- a/hw/kvm/pci-assign.c
+++ b/hw/kvm/pci-assign.c
@@ -33,7 +33,7 @@
 #include "hw/loader.h"
 #include "monitor/monitor.h"
 #include "qemu/range.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/msi.h"
 #include "kvm_i386.h"

diff --git a/hw/kvmvapic.c b/hw/kvmvapic.c
index 60c8fc46aae63149b4e4fd641b4bc39501fec533..81f4bcfdf6b75ef2ac0eeb7ff9e24e83f047f2cd 100644 (file)
--- a/hw/kvmvapic.c
+++ b/hw/kvmvapic.c
@@ -8,9 +8,9 @@
  * (at your option) any later version. See the COPYING file in the
  * top-level directory.
  */
-#include "sysemu.h"
-#include "cpus.h"
-#include "kvm.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/cpus.h"
+#include "sysemu/kvm.h"
 #include "apic_internal.h"
 
 #define APIC_DEFAULT_ADDRESS    0xfee00000

diff --git a/hw/kzm.c b/hw/kzm.c
index 9f92d309282b10b93a40849cefa846b02569c914..fd00af921efd557fd259d428996946930eea265a 100644 (file)
--- a/hw/kzm.c
+++ b/hw/kzm.c
@@ -19,7 +19,7 @@
 #include "arm-misc.h"
 #include "devices.h"
 #include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "boards.h"
 #include "serial.h"
 #include "imx.h"

diff --git a/hw/lan9118.c b/hw/lan9118.c
index 4c72d0d98e58695b036cee4481e846965cebe883..5adf91199b12a49af499abdebff90edf1d1d82af 100644 (file)
--- a/hw/lan9118.c
+++ b/hw/lan9118.c
@@ -13,7 +13,7 @@
 #include "sysbus.h"
 #include "net/net.h"
 #include "devices.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "ptimer.h"
 /* For crc32 */
 #include <zlib.h>

diff --git a/hw/leon3.c b/hw/leon3.c
index 776ab97a78c63e768e239839b3ebd3e849d33e0b..d1d4541867c71eeed050aff69cedcdb055e4a40f 100644 (file)
--- a/hw/leon3.c
+++ b/hw/leon3.c
@@ -25,7 +25,7 @@
 #include "qemu/timer.h"
 #include "ptimer.h"
 #include "qemu-char.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "boards.h"
 #include "loader.h"
 #include "elf.h"

diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c
index 81afdf675cd67abab010dd532587fabc52713f76..42e8b6b52ab3a393d9a4b7127681028e1d0eae8f 100644 (file)
--- a/hw/lm32_boards.c
+++ b/hw/lm32_boards.c
@@ -23,7 +23,7 @@
 #include "devices.h"
 #include "boards.h"
 #include "loader.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "elf.h"
 #include "lm32_hwsetup.h"
 #include "lm32.h"

diff --git a/hw/lm32_sys.c b/hw/lm32_sys.c
index b3350890cbf02b6925df63e44e47bb412c62777b..e3a9db9748f47877e643578c66ab7384fecbb20a 100644 (file)
--- a/hw/lm32_sys.c
+++ b/hw/lm32_sys.c
@@ -33,7 +33,7 @@
 #include "trace.h"
 #include "qemu/log.h"
 #include "qemu/error-report.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/log.h"
 
 enum {

diff --git a/hw/loader.c b/hw/loader.c
index f5ef575b52b7b64542c7cbfd6ade537488d349c2..3f59fcd14aa4b7b1c694ef4f29503d345a2bf2fb 100644 (file)
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -45,7 +45,7 @@
 #include "hw.h"
 #include "disas/disas.h"
 #include "monitor/monitor.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "uboot_image.h"
 #include "loader.h"
 #include "fw_cfg.h"

diff --git a/hw/lpc_ich9.c b/hw/lpc_ich9.c
index 76217a74fc1580b20a16a58d79d9f5f02ea6e94f..a068715c0497f1e25fa0ac998ea75a00804fb320 100644 (file)
--- a/hw/lpc_ich9.c
+++ b/hw/lpc_ich9.c
@@ -44,7 +44,7 @@
 #include "pam.h"
 #include "pci/pci_bus.h"
 #include "exec/address-spaces.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 static int ich9_lpc_sci_irq(ICH9LPCState *lpc);
 

diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index 4aac9a0cffa2906ac87b9abc3ecb1904feae344b..0aafb00b58786ac18d9fd7b4c802106b713d888c 100644 (file)
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -15,7 +15,7 @@
 #include "hw.h"
 #include "pci/pci.h"
 #include "scsi.h"
-#include "dma.h"
+#include "sysemu/dma.h"
 
 //#define DEBUG_LSI
 //#define DEBUG_LSI_REG

diff --git a/hw/m25p80.c b/hw/m25p80.c
index 3895e73957cfa67673b4206fe499896a6f3d067b..d39265632bb50cc09a8d18d0e0ffc24a006d236f 100644 (file)
--- a/hw/m25p80.c
+++ b/hw/m25p80.c
@@ -22,7 +22,7 @@
  */
 
 #include "hw.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "ssi.h"
 #include "devices.h"
 

diff --git a/hw/m48t59.c b/hw/m48t59.c
index 301b10ce792372e9d011dc3fe97cbb851c22d62f..393c5c049a0b7a8ad82b51f3f7884183634203fb 100644 (file)
--- a/hw/m48t59.c
+++ b/hw/m48t59.c
@@ -24,7 +24,7 @@
 #include "hw.h"
 #include "nvram.h"
 #include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "sysbus.h"
 #include "isa.h"
 #include "exec/address-spaces.h"

diff --git a/hw/mac_nvram.c b/hw/mac_nvram.c
index a0d14dd3c58756a648621a54c1e20c71d6fa34cc..71093c2b102933329d0c759ce975dac203841613 100644 (file)
--- a/hw/mac_nvram.c
+++ b/hw/mac_nvram.c
@@ -24,7 +24,7 @@
  */
 #include "hw.h"
 #include "firmware_abi.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "ppc_mac.h"
 
 /* debug NVR */

diff --git a/hw/mainstone.c b/hw/mainstone.c
index 80d6a9d54dfc7f4ba3676ca527fdbe8e9ec21d72..a5ddbeff9d8b9e8fc0a9da5a7ea44ddb3973dafb 100644 (file)
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -18,7 +18,7 @@
 #include "devices.h"
 #include "boards.h"
 #include "flash.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "sysbus.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c
index fba75029dfe5d5f6081dd8c8c5414ff0db851095..2ddd7de09ee4a4c608a84d9d136a898275cb05c6 100644 (file)
--- a/hw/mc146818rtc.c
+++ b/hw/mc146818rtc.c
@@ -23,7 +23,7 @@
  */
 #include "hw.h"
 #include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "mc146818rtc.h"
 #include "qapi/visitor.h"
 

diff --git a/hw/mcf5206.c b/hw/mcf5206.c
index fbc806ac184ca6e0252fd16c05a73ffaee17d945..fe7a48864fa8b5be325ad8040c5bf43aa4b63e2a 100644 (file)
--- a/hw/mcf5206.c
+++ b/hw/mcf5206.c
@@ -9,7 +9,7 @@
 #include "mcf.h"
 #include "qemu/timer.h"
 #include "ptimer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
 
 /* General purpose timer module.  */

diff --git a/hw/mcf5208.c b/hw/mcf5208.c
index fea8a6926248fad676234b260937702b502b6ea0..c1816cc9d119757efd5f373f63e8244ed925b30d 100644 (file)
--- a/hw/mcf5208.c
+++ b/hw/mcf5208.c
@@ -9,7 +9,7 @@
 #include "mcf.h"
 #include "qemu/timer.h"
 #include "ptimer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "net/net.h"
 #include "boards.h"
 #include "loader.h"

diff --git a/hw/megasas.c b/hw/megasas.c
index e80c0d1c2518b2d2ae78d2e0e4833457f282dd0f..eb191f5e12c033ef2d2a45208de61aaf06deadeb 100644 (file)
--- a/hw/megasas.c
+++ b/hw/megasas.c
@@ -20,7 +20,7 @@
 
 #include "hw.h"
 #include "pci/pci.h"
-#include "dma.h"
+#include "sysemu/dma.h"
 #include "pci/msix.h"
 #include "qemu/iov.h"
 #include "scsi.h"

diff --git a/hw/microblaze_boot.c b/hw/microblaze_boot.c
index 76d33021c06dd234234f3916a0259fe5205a4a32..3ec5c0f7dd67118f750d072028d789d17f8f7ed9 100644 (file)
--- a/hw/microblaze_boot.c
+++ b/hw/microblaze_boot.c
@@ -27,7 +27,7 @@
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qemu-common.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
 #include "loader.h"
 #include "elf.h"
 

diff --git a/hw/milkymist-memcard.c b/hw/milkymist-memcard.c
index 5dc30ace60c708f150866ca3e5dcc1daf72c74e7..f80befc53a3c38ed9b9e69529b288c27d8adcf6b 100644 (file)
--- a/hw/milkymist-memcard.c
+++ b/hw/milkymist-memcard.c
@@ -23,10 +23,10 @@
 
 #include "hw.h"
 #include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "trace.h"
 #include "qemu/error-report.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "sd.h"
 
 enum {

diff --git a/hw/milkymist-sysctl.c b/hw/milkymist-sysctl.c
index 519462afcc93bc10125918875103c292af3a0cdf..796e795f04e786d46e730f5542414fd87f1e5127 100644 (file)
--- a/hw/milkymist-sysctl.c
+++ b/hw/milkymist-sysctl.c
@@ -23,7 +23,7 @@
 
 #include "hw.h"
 #include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "trace.h"
 #include "qemu/timer.h"
 #include "ptimer.h"

diff --git a/hw/milkymist.c b/hw/milkymist.c
index 588522260bac027be33be60b95e24b799db00cdb..0c23b672f3610309055fd376e5096132634faa10 100644 (file)
--- a/hw/milkymist.c
+++ b/hw/milkymist.c
@@ -20,12 +20,12 @@
 #include "sysbus.h"
 #include "hw.h"
 #include "flash.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "devices.h"
 #include "boards.h"
 #include "loader.h"
 #include "elf.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "milkymist-hw.h"
 #include "lm32.h"
 #include "exec/address-spaces.h"

diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index 60dd8c69bbe75624be072f57c4ccc10dd72caaae..e7eeda319e4b2bcf43d40b178970e92bff67efec 100644 (file)
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -31,7 +31,7 @@
 #include "mips_cpudevs.h"
 #include "pci/pci.h"
 #include "qemu-char.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "audio/audio.h"
 #include "qemu/log.h"
 #include "loader.h"
@@ -41,7 +41,7 @@
 #include "vt82c686.h"
 #include "mc146818rtc.h"
 #include "i8254.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 
 #define DEBUG_FULONG2E_INIT

diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 0befc99210b332e814a02b88711d7bf94744d8d0..63df2a734b56cf6e0e42acbc30f32a101ab088f8 100644 (file)
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -29,8 +29,8 @@
 #include "serial.h"
 #include "isa.h"
 #include "fdc.h"
-#include "sysemu.h"
-#include "arch_init.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/arch_init.h"
 #include "boards.h"
 #include "net/net.h"
 #include "esp.h"
@@ -39,7 +39,7 @@
 #include "mc146818rtc.h"
 #include "i8254.h"
 #include "pcspk.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "sysbus.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 04c7a2612ceede60975394db08849d8dddc1743c..bd31ced29dc366a27e1b21f759c07317b399e766 100644 (file)
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -35,8 +35,8 @@
 #include "mips_cpudevs.h"
 #include "pci/pci.h"
 #include "qemu-char.h"
-#include "sysemu.h"
-#include "arch_init.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/arch_init.h"
 #include "boards.h"
 #include "qemu/log.h"
 #include "mips-bios.h"
@@ -45,7 +45,7 @@
 #include "elf.h"
 #include "mc146818rtc.h"
 #include "i8254.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 #include "sysbus.h"             /* SysBusDevice */
 

diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c
index ac7dfa9b74426ffbf4e4b68a0adc80e7d72d59a1..67066c0ca11e3b2b03e36d5db5da2187e46e14f7 100644 (file)
--- a/hw/mips_mipssim.c
+++ b/hw/mips_mipssim.c
@@ -30,7 +30,7 @@
 #include "serial.h"
 #include "isa.h"
 #include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "boards.h"
 #include "mips-bios.h"
 #include "loader.h"

diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 511e1e41c03cabece1c2c314c689563823583e24..59c43e591c098bdad5350a21adfc4539bd321706 100644 (file)
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -14,7 +14,7 @@
 #include "serial.h"
 #include "isa.h"
 #include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "boards.h"
 #include "flash.h"
 #include "qemu/log.h"
@@ -24,7 +24,7 @@
 #include "elf.h"
 #include "mc146818rtc.h"
 #include "i8254.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 
 #define MAX_IDE_BUS 2

diff --git a/hw/mpc8544_guts.c b/hw/mpc8544_guts.c
index 873cb8cbfc6724f54b12fa0cbc5e8e5b92c5c558..84522e9722ebbf95c201b3049e3581b0562487df 100644 (file)
--- a/hw/mpc8544_guts.c
+++ b/hw/mpc8544_guts.c
@@ -18,7 +18,7 @@
  */
 
 #include "hw.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "sysbus.h"
 
 #define MPC8544_GUTS_MMIO_SIZE        0x1000

diff --git a/hw/multiboot.c b/hw/multiboot.c
index 09ec5b253987e9718eefb789ed0562e2aaecc642..c4ec2e34a7c2d70e488a1749c4e47bc140cbab4c 100644 (file)
--- a/hw/multiboot.c
+++ b/hw/multiboot.c
@@ -27,7 +27,7 @@
 #include "multiboot.h"
 #include "loader.h"
 #include "elf.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 /* Show multiboot debug output */
 //#define DEBUG_MULTIBOOT

diff --git a/hw/musicpal.c b/hw/musicpal.c
index 5a7bf8bee11ab0fe6871e0d1b84bacbcf747c93d..77a585eee64b56770291664cf746f016c1230c04 100644 (file)
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -13,7 +13,7 @@
 #include "arm-misc.h"
 #include "devices.h"
 #include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "boards.h"
 #include "serial.h"
 #include "qemu/timer.h"
@@ -22,7 +22,7 @@
 #include "flash.h"
 #include "ui/console.h"
 #include "i2c.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 #include "ui/pixel_ops.h"
 

diff --git a/hw/nand.c b/hw/nand.c
index a73205d866dcd684f1613ef7577f84d755a3f2b7..16950c5ec43f6cf465bf03454f701337b3f2234d 100644 (file)
--- a/hw/nand.c
+++ b/hw/nand.c
@@ -20,7 +20,7 @@
 
 # include "hw.h"
 # include "flash.h"
-# include "blockdev.h"
+# include "sysemu/blockdev.h"
 # include "sysbus.h"
 #include "qemu/error-report.h"
 

diff --git a/hw/ne2000.c b/hw/ne2000.c
index 2001264e14d3e7adb71118ca6540a15500924396..00efa74a0f342e2bea30e06cdc57760225c5c5fc 100644 (file)
--- a/hw/ne2000.c
+++ b/hw/ne2000.c
@@ -26,7 +26,7 @@
 #include "net/net.h"
 #include "ne2000.h"
 #include "loader.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 /* debug NE2000 card */
 //#define DEBUG_NE2000

diff --git a/hw/nseries.c b/hw/nseries.c
index 83adb97211a2240f5d84bcc6949552497d065336..d96b750ccdb28b0177e5cfb11b0ae504f180c48d 100644 (file)
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -19,7 +19,7 @@
  */
 
 #include "qemu-common.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "omap.h"
 #include "arm-misc.h"
 #include "irq.h"
@@ -31,7 +31,7 @@
 #include "hw.h"
 #include "bt.h"
 #include "loader.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "sysbus.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/omap1.c b/hw/omap1.c
index 50c4570f31d6d08941cd57f1fa72954cac815f12..8536e96687f15dccbed79caf08149c9cc032abc4 100644 (file)
--- a/hw/omap1.c
+++ b/hw/omap1.c
@@ -19,9 +19,9 @@
 #include "hw.h"
 #include "arm-misc.h"
 #include "omap.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "soc_dma.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "qemu/range.h"
 #include "sysbus.h"
 

diff --git a/hw/omap2.c b/hw/omap2.c
index 7ccee696611be42ebeec5e3dfc8a6a7108d2eb5a..dc6867c962fc45c068e3af836cc7b1615885cc58 100644 (file)
--- a/hw/omap2.c
+++ b/hw/omap2.c
@@ -18,11 +18,11 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "hw.h"
 #include "arm-misc.h"
 #include "omap.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/timer.h"
 #include "qemu-char.h"
 #include "flash.h"

diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index ca6eb9ddebc2cedcc546b10596b31b83d0c0074a..0f031215057e08a91466aef39beabf52e5de0ace 100644 (file)
--- a/hw/omap_sx1.c
+++ b/hw/omap_sx1.c
@@ -31,7 +31,7 @@
 #include "boards.h"
 #include "arm-misc.h"
 #include "flash.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 
 /*****************************************************************************/

diff --git a/hw/onenand.c b/hw/onenand.c
index 2e26e3a05d5aa83a8e750ebae2e94976f97d059e..26bf991d6d42df6ea629f4ef380ef84570abaf3d 100644 (file)
--- a/hw/onenand.c
+++ b/hw/onenand.c
@@ -22,7 +22,7 @@
 #include "hw.h"
 #include "flash.h"
 #include "irq.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
 #include "sysbus.h"

diff --git a/hw/opencores_eth.c b/hw/opencores_eth.c
index fd2f0f61c38175e0d6a4b327f754d61f12681b7b..a0dfdce1f969496933644a11ef06b5f447b41992 100644 (file)
--- a/hw/opencores_eth.c
+++ b/hw/opencores_eth.c
@@ -34,7 +34,7 @@
 #include "hw.h"
 #include "sysbus.h"
 #include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "trace.h"
 
 /* RECSMALL is not used because it breaks tap networking in linux:

diff --git a/hw/openrisc_sim.c b/hw/openrisc_sim.c
index c12097e12bec566151b62b504b78bd44befc62b4..d2b2379ae20c40b79ae77691684bd21272ba0ae9 100644 (file)
--- a/hw/openrisc_sim.c
+++ b/hw/openrisc_sim.c
@@ -25,9 +25,9 @@
 #include "net/net.h"
 #include "loader.h"
 #include "exec/address-spaces.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "sysbus.h"
-#include "qtest.h"
+#include "sysemu/qtest.h"
 
 #define KERNEL_LOAD_ADDR 0x100
 

diff --git a/hw/palm.c b/hw/palm.c
index e091bbcfc1e708364b07e9a0bbc9c5bff59869a1..5219e37394855fa4033c67a03ed1217c4420aa07 100644 (file)
--- a/hw/palm.c
+++ b/hw/palm.c
@@ -18,7 +18,7 @@
  */
 #include "hw.h"
 #include "audio/audio.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "ui/console.h"
 #include "omap.h"
 #include "boards.h"

diff --git a/hw/pam.c b/hw/pam.c
index a95e2cfb079da6b5b6c1399421ff247c5bdef646..1d72e88e626dec22754692c7c5dc35aa14a4fb2e 100644 (file)
--- a/hw/pam.c
+++ b/hw/pam.c
@@ -26,7 +26,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "pam.h"
 
 void smram_update(MemoryRegion *smram_region, uint8_t smram,

diff --git a/hw/parallel.c b/hw/parallel.c
index c4705bc89d54308bffee779fb0e6b887a689690d..56b3760e8ca85b8ce657aea139a12a7364e3547e 100644 (file)
--- a/hw/parallel.c
+++ b/hw/parallel.c
@@ -26,7 +26,7 @@
 #include "qemu-char.h"
 #include "isa.h"
 #include "pc.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 //#define DEBUG_PARALLEL
 

diff --git a/hw/pc.c b/hw/pc.c
index 0a92ea6bed52e1ac75bc047927a7b706f22901f9..71902e210bccd92798e58a36b23a3b9394dd9686 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -40,16 +40,16 @@
 #include "pcspk.h"
 #include "pci/msi.h"
 #include "sysbus.h"
-#include "sysemu.h"
-#include "kvm.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/kvm.h"
 #include "kvm_i386.h"
 #include "xen.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "hw/block-common.h"
 #include "ui/qemu-spice.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
-#include "arch_init.h"
+#include "sysemu/arch_init.h"
 #include "qemu/bitmap.h"
 
 /* debug PC/ISA interrupts */

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 0d011348f2df74978686577e6149d8c1e0126f59..99747a774c4525c3c5363c2bf45c80e0099fbf64 100644 (file)
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -33,12 +33,12 @@
 #include "net/net.h"
 #include "boards.h"
 #include "ide.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "kvm/clock.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "sysbus.h"
-#include "arch_init.h"
-#include "blockdev.h"
+#include "sysemu/arch_init.h"
+#include "sysemu/blockdev.h"
 #include "smbus.h"
 #include "xen.h"
 #include "exec/memory.h"

diff --git a/hw/pc_q35.c b/hw/pc_q35.c
index 2580d5ff343c2883d78ae9ad96aca9d559ccbca9..c7262d631511a53f54edfbe7d8ed7b8cc0526aaa 100644 (file)
--- a/hw/pc_q35.c
+++ b/hw/pc_q35.c
@@ -28,12 +28,12 @@
  * THE SOFTWARE.
  */
 #include "hw.h"
-#include "arch_init.h"
+#include "sysemu/arch_init.h"
 #include "smbus.h"
 #include "boards.h"
 #include "mc146818rtc.h"
 #include "xen.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "kvm/clock.h"
 #include "q35.h"
 #include "exec/address-spaces.h"

diff --git a/hw/pc_sysfw.c b/hw/pc_sysfw.c
index d7ea3a5595667b7c922ad9c136736702b7cddcdd..87e1fa961b52ea69bf1e6d2fb418c320f3262dfe 100644 (file)
--- a/hw/pc_sysfw.c
+++ b/hw/pc_sysfw.c
@@ -23,15 +23,15 @@
  * THE SOFTWARE.
  */
 
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "sysbus.h"
 #include "hw.h"
 #include "pc.h"
 #include "hw/boards.h"
 #include "loader.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "flash.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 
 #define BIOS_FILENAME "bios.bin"
 

diff --git a/hw/pci/pci-hotplug.c b/hw/pci/pci-hotplug.c
index 2bc02e344f57529a5e441df983946518f651e4cf..f38df30540fa89bbcab982d5b5804c4e2f658961 100644 (file)
--- a/hw/pci/pci-hotplug.c
+++ b/hw/pci/pci-hotplug.c
@@ -31,7 +31,7 @@
 #include "hw/scsi.h"
 #include "hw/virtio-blk.h"
 #include "qemu/config-file.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "qapi/error.h"
 
 #if defined(TARGET_I386)

diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c
index 5891dc959d69910f81aa0382ca2193650ee0f9ef..1dda89b593873739694fbc4a495c74a53c62130d 100644 (file)
--- a/hw/pci/pci-stub.c
+++ b/hw/pci/pci-stub.c
@@ -18,7 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
 #include "hw/pci/pci.h"
 #include "qmp-commands.h"

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index c9ed95be89ba3bfe96d8edcad751e716b3c9dc86..94840c4af71d0c4bfe8760a166635a3be6b4f363 100644 (file)
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -27,7 +27,7 @@
 #include "hw/pci/pci_bus.h"
 #include "monitor/monitor.h"
 #include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "hw/loader.h"
 #include "qemu/range.h"
 #include "qmp-commands.h"

diff --git a/hw/pci/pci.h b/hw/pci/pci.h
index d6ef4f65743a83abdd99df68c6d6b147b3965179..3152050856429c4503b3bb046740bf57aa0da686 100644 (file)
--- a/hw/pci/pci.h
+++ b/hw/pci/pci.h
@@ -5,7 +5,7 @@
 
 #include "hw/qdev.h"
 #include "exec/memory.h"
-#include "dma.h"
+#include "sysemu/dma.h"
 
 /* PCI includes legacy ISA access.  */
 #include "hw/isa.h"

diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index f7f3633f5b3296d3c8b5f29a592bde077d5f6380..1ce72ce944d10c5229a2de3763bd99d4eaa7ab18 100644 (file)
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -18,7 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qapi/qmp/types.h"
 #include "monitor/monitor.h"
 #include "hw/pci/pci_bridge.h"

diff --git a/hw/pckbd.c b/hw/pckbd.c
index 5bb3e0abf3fd167f85f817d0cbcc85fd6228b4fd..6db7bbcc06d1d1787c13b76f4b9f2ea6206b18cb 100644 (file)
--- a/hw/pckbd.c
+++ b/hw/pckbd.c
@@ -25,7 +25,7 @@
 #include "isa.h"
 #include "pc.h"
 #include "ps2.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 /* debug PC keyboard */
 //#define DEBUG_KBD

diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c
index 5e8eed3af8705468448dff761d18455d41584e23..40a0e6eda4f1b4ad845f2ca358121e0f41cd922a 100644 (file)
--- a/hw/pcnet-pci.c
+++ b/hw/pcnet-pci.c
@@ -31,7 +31,7 @@
 #include "net/net.h"
 #include "loader.h"
 #include "qemu/timer.h"
-#include "dma.h"
+#include "sysemu/dma.h"
 
 #include "pcnet.h"
 

diff --git a/hw/pcnet.c b/hw/pcnet.c
index 87736542e497abef2dc1a6bb95f9e5b2b2856b2a..30f100007a6ebcaa3b5054fcb8125edaee4b16f6 100644 (file)
--- a/hw/pcnet.c
+++ b/hw/pcnet.c
@@ -39,7 +39,7 @@
 #include "net/net.h"
 #include "qemu/timer.h"
 #include "qemu/sockets.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 #include "pcnet.h"
 

diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c
index 4eab0f2d8bd9b2eb4d8bce539bc2b093b18da7e8..1cfdb2f302584873d8ee97275c450634b1bee909 100644 (file)
--- a/hw/petalogix_ml605_mmu.c
+++ b/hw/petalogix_ml605_mmu.c
@@ -29,11 +29,11 @@
 #include "hw.h"
 #include "net/net.h"
 #include "flash.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "devices.h"
 #include "boards.h"
 #include "xilinx.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "serial.h"
 #include "exec/address-spaces.h"
 #include "ssi.h"

diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
index 124a88eeda452e7d1277b66aad59c57c3721b25c..27ecfe7752c9fdfe0c8e9b0caa4e4fffb2459334 100644 (file)
--- a/hw/petalogix_s3adsp1800_mmu.c
+++ b/hw/petalogix_s3adsp1800_mmu.c
@@ -27,11 +27,11 @@
 #include "hw.h"
 #include "net/net.h"
 #include "flash.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "devices.h"
 #include "boards.h"
 #include "xilinx.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 
 #include "microblaze_boot.h"

diff --git a/hw/pl031.c b/hw/pl031.c
index 834a20c91766a89295901d5b15962fb60eaaae60..3a23ecde4829f6d36d3be1d6b207b452a29bcc63 100644 (file)
--- a/hw/pl031.c
+++ b/hw/pl031.c
@@ -13,7 +13,7 @@
 
 #include "sysbus.h"
 #include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 //#define DEBUG_PL031
 

diff --git a/hw/pl181.c b/hw/pl181.c
index 8a2895ce1ba532dbdae6ac9ea3967d1523e9a3ad..cbddb741ce2b82aead10629a27d73d11119f000b 100644 (file)
--- a/hw/pl181.c
+++ b/hw/pl181.c
@@ -7,7 +7,7 @@
  * This code is licensed under the GPL.
  */
 
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "sysbus.h"
 #include "sd.h"
 

diff --git a/hw/ppc.c b/hw/ppc.c
index f066367609bef088acb3b001541c2074d865533f..1559982625eb2d9b18674b072e48625a784cda15 100644 (file)
--- a/hw/ppc.c
+++ b/hw/ppc.c
@@ -24,11 +24,11 @@
 #include "hw.h"
 #include "ppc.h"
 #include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "nvram.h"
 #include "qemu/log.h"
 #include "loader.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "kvm_ppc.h"
 
 //#define PPC_DEBUG_IRQ

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 3593f7c0e25472f2e433e8100fcb6858d3d0487a..aa54fd84d78c4fb232df3923db651dc7a0f2017b 100644 (file)
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -24,10 +24,10 @@
 #include "hw/serial.h"
 #include "hw/pci/pci.h"
 #include "hw/boards.h"
-#include "sysemu.h"
-#include "kvm.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/kvm.h"
 #include "kvm_ppc.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
 #include "hw/openpic.h"
 #include "hw/ppc.h"
 #include "hw/loader.h"

diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
index 2992bd97940c0f0ad3f7f67bde02abf07a09bc31..4deb02ac38fcf477463a68d93cf6c49a95b4fcd2 100644 (file)
--- a/hw/ppc/e500plat.c
+++ b/hw/ppc/e500plat.c
@@ -13,8 +13,8 @@
 #include "qemu-common.h"
 #include "e500.h"
 #include "../boards.h"
-#include "device_tree.h"
-#include "hw/pci.h"
+#include "sysemu/device_tree.h"
+#include "hw/pci/pci.h"
 
 static void e500plat_fixup_devtree(PPCE500Params *params, void *fdt)
 {

diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c
index 7e1761d20c4d365095065c715d989e2af75554c0..f9ae20f5a3b070e5b964bc600d9e1ee0e1d940e2 100644 (file)
--- a/hw/ppc/mpc8544ds.c
+++ b/hw/ppc/mpc8544ds.c
@@ -13,7 +13,7 @@
 #include "qemu-common.h"
 #include "e500.h"
 #include "../boards.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
 
 static void mpc8544ds_fixup_devtree(PPCE500Params *params, void *fdt)
 {

diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index 31bcc4bb95d2700f601067f076650296658fc8dd..8f7f0d07d1212cf5f8a328d7fa8ce654e7f44253 100644 (file)
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -26,12 +26,12 @@
 #include "ppc405.h"
 #include "nvram.h"
 #include "flash.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "block/block.h"
 #include "boards.h"
 #include "qemu/log.h"
 #include "loader.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 
 #define BIOS_FILENAME "ppc405_rom.bin"

diff --git a/hw/ppc405_uc.c b/hw/ppc405_uc.c
index b1ed8837d61a7ebe883bf818393f73f7710b17e8..7e56ecb4aff4f59b3c109b8c8c3ef9bc39b63dc2 100644 (file)
--- a/hw/ppc405_uc.c
+++ b/hw/ppc405_uc.c
@@ -26,7 +26,7 @@
 #include "ppc405.h"
 #include "serial.h"
 #include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/log.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 591d7b0088a6c5c08a0a17ce8b9f6b384ee61587..4f1b734c22077ca5995eeca3b5dfcc97264d6ab6 100644 (file)
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -17,16 +17,16 @@
 #include "hw.h"
 #include "pci/pci.h"
 #include "boards.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "kvm_ppc.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
 #include "loader.h"
 #include "elf.h"
 #include "exec/address-spaces.h"
 #include "serial.h"
 #include "ppc.h"
 #include "ppc405.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "sysbus.h"
 
 #define BINARY_DEVICE_TREE_FILE "bamboo.dtb"

diff --git a/hw/ppc_booke.c b/hw/ppc_booke.c
index a7182be0d3f521ae798c3d0455b77f690aebaf6e..5c89fc313d5235b017c7d98ce588d9426dca7c24 100644 (file)
--- a/hw/ppc_booke.c
+++ b/hw/ppc_booke.c
@@ -24,7 +24,7 @@
 #include "hw.h"
 #include "ppc.h"
 #include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "nvram.h"
 #include "qemu/log.h"
 #include "loader.h"

diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index b2d02eaff25357a175591b76f0b8aeb550515867..fabcc08b406466327c162346dda796451e88430a 100644 (file)
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -54,7 +54,7 @@
 #include "nvram.h"
 #include "pci/pci.h"
 #include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "boards.h"
 #include "fw_cfg.h"
 #include "escc.h"
@@ -62,10 +62,10 @@
 #include "ide.h"
 #include "loader.h"
 #include "elf.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "kvm_ppc.h"
 #include "hw/usb.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 #include "sysbus.h"
 

diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index 7a8a039d7e795ac3adad85165b0a0c9ec36c3ffb..fff5129ca9ad221f2763d628df772860dc60a540 100644 (file)
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -29,7 +29,7 @@
 #include "adb.h"
 #include "mac_dbdma.h"
 #include "nvram.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "net/net.h"
 #include "isa.h"
 #include "pci/pci.h"
@@ -39,9 +39,9 @@
 #include "ide.h"
 #include "loader.h"
 #include "elf.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "kvm_ppc.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 
 #define MAX_IDE_BUS 2

diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 072535294ee34c60fc1e66195024846989bc32ce..9c78c863e846ec065581cd55396a40b79176c9d9 100644 (file)
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -27,7 +27,7 @@
 #include "serial.h"
 #include "fdc.h"
 #include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "isa.h"
 #include "pci/pci.h"
 #include "pci/pci_host.h"
@@ -37,8 +37,8 @@
 #include "ide.h"
 #include "loader.h"
 #include "mc146818rtc.h"
-#include "blockdev.h"
-#include "arch_init.h"
+#include "sysemu/blockdev.h"
+#include "sysemu/arch_init.h"
 #include "exec/address-spaces.h"
 
 //#define HARD_DEBUG_PPC_IO

diff --git a/hw/ppce500_spin.c b/hw/ppce500_spin.c
index c1a155bd31636ffa43a6518f0dd2e877e6bc9f7d..177aa2d12228467f704a5b92c7eff0648521d173 100644 (file)
--- a/hw/ppce500_spin.c
+++ b/hw/ppce500_spin.c
@@ -28,9 +28,9 @@
  */
 
 #include "hw.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "sysbus.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 
 #define MAX_CPUS 32
 

diff --git a/hw/ps2.c b/hw/ps2.c
index ba80089aba8a3868090bacb1a70436c2fab0c8ab..15cfd5bb76e7c7dfbdd068618d37395b494d2d3d 100644 (file)
--- a/hw/ps2.c
+++ b/hw/ps2.c
@@ -24,7 +24,7 @@
 #include "hw.h"
 #include "ps2.h"
 #include "ui/console.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 /* debug PC keyboard */
 //#define DEBUG_KBD

diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c
index e61697920782118411b644b7dca1608f10ff9bf4..936e9f87cd70917f236287114a901613e4bc21b5 100644 (file)
--- a/hw/pxa2xx.c
+++ b/hw/pxa2xx.c
@@ -9,12 +9,12 @@
 
 #include "sysbus.h"
 #include "pxa.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "serial.h"
 #include "i2c.h"
 #include "ssi.h"
 #include "qemu-char.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 
 static struct {
     hwaddr io_base;

diff --git a/hw/pxa2xx_lcd.c b/hw/pxa2xx_lcd.c
index b5efd4d426b564ae60cb93c572b425365aa73066..512a27e702926043214e5de6fd4ccadbb1931468 100644 (file)
--- a/hw/pxa2xx_lcd.c
+++ b/hw/pxa2xx_lcd.c
@@ -15,7 +15,7 @@
 #include "pxa.h"
 #include "ui/pixel_ops.h"
 /* FIXME: For graphic_rotate. Should probably be done in common code.  */
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "framebuffer.h"
 
 struct DMAChannel {

diff --git a/hw/pxa2xx_timer.c b/hw/pxa2xx_timer.c
index 1481c6d3e121bf26f71352a0b67ead25aceef311..e4ffb15bb23d24963634a7f160fc6f4a2f46b835 100644 (file)
--- a/hw/pxa2xx_timer.c
+++ b/hw/pxa2xx_timer.c
@@ -9,7 +9,7 @@
 
 #include "hw.h"
 #include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "pxa.h"
 #include "sysbus.h"
 

diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
index 1c6712e6debf9a18a7c7edd0a8d439bfb4831e55..b73986759b3fbad99c0e29847f6f45eab7d24361 100644 (file)
--- a/hw/qdev-monitor.c
+++ b/hw/qdev-monitor.c
@@ -20,7 +20,7 @@
 #include "qdev.h"
 #include "monitor/monitor.h"
 #include "qmp-commands.h"
-#include "arch_init.h"
+#include "sysemu/arch_init.h"
 #include "qemu/config-file.h"
 
 /*

diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index ba6c648fed20654fa3b827ba6309d3a2004fdc96..1cb97ea594988025d43d22d7790391b1dd0c56d6 100644 (file)
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -1,7 +1,7 @@
 #include "net/net.h"
 #include "qdev.h"
 #include "qapi/qmp/qerror.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "hw/block-common.h"
 #include "net/hub.h"
 #include "qapi/visitor.h"

diff --git a/hw/qdev.c b/hw/qdev.c
index 0a2a32d5d3ffb1564858a1611cebc98279ba3152..c4a9857a0521a1c5141980f4a1cb344aaa1adef4 100644 (file)
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -27,7 +27,7 @@
 
 #include "net/net.h"
 #include "qdev.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 

diff --git a/hw/qxl.c b/hw/qxl.c
index b88a39cc9308254d847546cd50fa8ef50bafb430..d08b9bd3c1dcc418b2ec3a2003d540f468d55553 100644 (file)
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -24,7 +24,7 @@
 #include "qemu/timer.h"
 #include "qemu/queue.h"
 #include "monitor/monitor.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "trace.h"
 
 #include "qxl.h"

diff --git a/hw/r2d.c b/hw/r2d.c
index d7a26bf3982e4b49a81eec70bbdbe5c2ed83a873..7cf1893d1902621b9fb728491519c838c2e9806d 100644 (file)
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -27,7 +27,7 @@
 #include "hw.h"
 #include "sh.h"
 #include "devices.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "boards.h"
 #include "pci/pci.h"
 #include "net/net.h"
@@ -36,7 +36,7 @@
 #include "loader.h"
 #include "usb.h"
 #include "flash.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 
 #define FLASH_BASE 0x00000000

diff --git a/hw/realview.c b/hw/realview.c
index 9c55bf29b7e8b61e27d081892d8020a501e0954e..872b3b468a5c4c89aea90f3ffeaa87a3d0867b75 100644 (file)
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -13,10 +13,10 @@
 #include "devices.h"
 #include "pci/pci.h"
 #include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "boards.h"
 #include "i2c.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 
 #define SMP_BOOT_ADDR 0xe0000000

diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index 19c31a02c62b295dfd5e0da914bfcd5f0ce2fd8b..c59ec6b6df3c716f7036c4be32507b215f9222f2 100644 (file)
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -53,11 +53,11 @@
 
 #include "hw.h"
 #include "pci/pci.h"
-#include "dma.h"
+#include "sysemu/dma.h"
 #include "qemu/timer.h"
 #include "net/net.h"
 #include "loader.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/iov.h"
 
 /* debug RTL8139 card */

diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index 769015c13698fa6025da1a01bd648a39e12d86dd..963b4f0dc2316259f09fa10bb6a134f6124fdfa2 100644 (file)
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -19,7 +19,7 @@
 
 #include "hw.h"
 #include "block/block.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "boards.h"
 #include "monitor/monitor.h"
 #include "loader.h"
@@ -29,7 +29,7 @@
 #include "hw/virtio-serial.h"
 #include "hw/virtio-net.h"
 #include "hw/sysbus.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 
 #include "hw/s390-virtio-bus.h"
 

diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 7dfe87ade36fdf1d8219d08cfea7b65b8f60f1cc..20827761d09271a702fb878a9ca58a5efc8488fa 100644 (file)
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -19,8 +19,8 @@
 
 #include "hw.h"
 #include "block/block.h"
-#include "blockdev.h"
-#include "sysemu.h"
+#include "sysemu/blockdev.h"
+#include "sysemu/sysemu.h"
 #include "net/net.h"
 #include "boards.h"
 #include "monitor/monitor.h"
@@ -28,7 +28,7 @@
 #include "elf.h"
 #include "hw/virtio.h"
 #include "hw/sysbus.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "exec/address-spaces.h"
 
 #include "hw/s390-virtio-bus.h"

diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 748118d0f0afcd86c3fccf7df7d5acd0fdf48736..89b1b66bd217b7cd1e7246c939795e2666931b5e 100644 (file)
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -16,7 +16,7 @@
  */
 
 #include "monitor/monitor.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 #include "sclp.h"
 #include "event-facility.h"

diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index bc9b0aeb008e43046b4251db8c061f4de4cf9f0c..7ad791d5e36472ff5b8ca2c4271bbabacc776ab9 100644 (file)
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -13,7 +13,7 @@
  */
 
 #include "cpu.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "exec/memory.h"
 
 #include "sclp.h"

diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c
index 9a773b87ff5ab8b9688c6ff4d3d864b2936038eb..6e6f5624df9bf952722b603fa1a51ba7bea167f3 100644 (file)
--- a/hw/s390x/sclpquiesce.c
+++ b/hw/s390x/sclpquiesce.c
@@ -12,7 +12,7 @@
  *
  */
 #include <hw/qdev.h>
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "sclp.h"
 #include "event-facility.h"
 

diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index 5dc9f512b5c2c52f507f1612d246ed42ba5956e6..970c1fc01bfee82001337836c5faf68191940647 100644 (file)
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -3,9 +3,9 @@
 #include "scsi.h"
 #include "scsi-defs.h"
 #include "qdev.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "trace.h"
-#include "dma.h"
+#include "sysemu/dma.h"
 
 static char *scsibus_get_dev_path(DeviceState *dev);
 static char *scsibus_get_fw_dev_path(DeviceState *dev);

diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index c65da4a9c95a4079c6ef89d52301c2736812d56b..a69735b0a637392319b2267135aa884df981aede 100644 (file)
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -32,10 +32,10 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0)
 #include "qemu/error-report.h"
 #include "scsi.h"
 #include "scsi-defs.h"
-#include "sysemu.h"
-#include "blockdev.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/blockdev.h"
 #include "hw/block-common.h"
-#include "dma.h"
+#include "sysemu/dma.h"
 
 #ifdef __linux
 #include <scsi/sg.h>

diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c
index faeb61ee2c0fe4a9a57f973c7b0f6f20a9241f45..4c702be19f80f549823e568abbea36affe6a73aa 100644 (file)
--- a/hw/scsi-generic.c
+++ b/hw/scsi-generic.c
@@ -14,7 +14,7 @@
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "scsi.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 
 #ifdef __linux__
 

diff --git a/hw/scsi.h b/hw/scsi.h
index 24ed522722d6daa4a845b454ebc44a10677e9764..a5b5b2ec0d4ae43e3c1122bf62980c7390d45513 100644 (file)
--- a/hw/scsi.h
+++ b/hw/scsi.h
@@ -4,7 +4,7 @@
 #include "qdev.h"
 #include "block/block.h"
 #include "hw/block-common.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 #define MAX_SCSI_DEVS  255
 

diff --git a/hw/serial.h b/hw/serial.h
index 5722f8a35337784f92f9157a7e4f79f0051363d9..98ee4241be05eee51918a69cc2c163c28f89ee0c 100644 (file)
--- a/hw/serial.h
+++ b/hw/serial.h
@@ -26,7 +26,7 @@
 #define HW_SERIAL_H 1
 
 #include "hw.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "exec/memory.h"
 
 #define UART_FIFO_LENGTH    16      /* 16550A Fifo Length */

diff --git a/hw/sga.c b/hw/sga.c
index 5d80efd0c288466e55971f56ac710caba3260d9e..d5c91ed98ec79b40d283cf7765b6ee50f8735a4e 100644 (file)
--- a/hw/sga.c
+++ b/hw/sga.c
@@ -27,7 +27,7 @@
 #include "pci/pci.h"
 #include "pc.h"
 #include "loader.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 #define SGABIOS_FILENAME "sgabios.bin"
 

diff --git a/hw/sh7750.c b/hw/sh7750.c
index 08945750c46e482a321c38ad16d6e433f8802ba7..666f8655ed62a0157430b913e5de211eee25d764 100644 (file)
--- a/hw/sh7750.c
+++ b/hw/sh7750.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include "hw.h"
 #include "sh.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "sh7750_regs.h"
 #include "sh7750_regnames.h"
 #include "sh_intc.h"

diff --git a/hw/shix.c b/hw/shix.c
index 821196e84c8f81a5871c6d79449a0118f3c8b717..86d703ad7028fdc02638099d1d9709ac7e1a6e73 100644 (file)
--- a/hw/shix.c
+++ b/hw/shix.c
@@ -29,7 +29,7 @@
 */
 #include "hw.h"
 #include "sh.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "boards.h"
 #include "loader.h"
 #include "exec/address-spaces.h"

diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c
index 682fb457f585991aafc3ab78f61a0455e49ddf9b..704f2b173babf6f63d4dd81d41ba7c47b9c37423 100644 (file)
--- a/hw/slavio_misc.c
+++ b/hw/slavio_misc.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "sysbus.h"
 #include "trace.h"
 

diff --git a/hw/smbios.c b/hw/smbios.c
index c57237d27925176b1cde1236d5ede39bb1b28144..a7b8bfc383d2a5497f34fa5427743be7fe1f9f4f 100644 (file)
--- a/hw/smbios.c
+++ b/hw/smbios.c
@@ -13,7 +13,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "smbios.h"
 #include "loader.h"
 

diff --git a/hw/smbus_ich9.c b/hw/smbus_ich9.c
index b7bddc80d3e263e0206fb8e73d6dab42f8c3fd9d..16db3a743cfae92b8a4d7980d3525832bdde54f2 100644 (file)
--- a/hw/smbus_ich9.c
+++ b/hw/smbus_ich9.c
@@ -28,7 +28,7 @@
 #include "pc.h"
 #include "pm_smbus.h"
 #include "pci/pci.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "i2c.h"
 #include "smbus.h"
 

diff --git a/hw/spapr.c b/hw/spapr.c
index 1abfde2a05263015e49de71af433ef4f82f7db10..fdd1eb6925be3ff6b32cbdc9ef29945ddeb2a534 100644 (file)
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -24,13 +24,13 @@
  * THE SOFTWARE.
  *
  */
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "hw.h"
 #include "elf.h"
 #include "net/net.h"
-#include "blockdev.h"
-#include "cpus.h"
-#include "kvm.h"
+#include "sysemu/blockdev.h"
+#include "sysemu/cpus.h"
+#include "sysemu/kvm.h"
 #include "kvm_ppc.h"
 
 #include "hw/boards.h"
@@ -43,7 +43,7 @@
 #include "hw/xics.h"
 #include "hw/pci/msi.h"
 
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "kvm_ppc.h"
 #include "pci/pci.h"
 

diff --git a/hw/spapr.h b/hw/spapr.h
index 600722f13229ee96972fa77cb92419e47eeecfc6..3a1f69f2a9fc78f33254a696d6a03d947e6f536f 100644 (file)
--- a/hw/spapr.h
+++ b/hw/spapr.h
@@ -1,7 +1,7 @@
 #if !defined(__HW_SPAPR_H__)
 #define __HW_SPAPR_H__
 
-#include "dma.h"
+#include "sysemu/dma.h"
 #include "hw/xics.h"
 
 struct VIOsPAPRBus;

diff --git a/hw/spapr_events.c b/hw/spapr_events.c
index 18ccd4a9e09c7520ce0d5870c9c453590cb50aaf..7956601466ef3a6f34751855b10fc3952c01a8a9 100644 (file)
--- a/hw/spapr_events.c
+++ b/hw/spapr_events.c
@@ -25,10 +25,10 @@
  *
  */
 #include "cpu.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu-char.h"
 #include "hw/qdev.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
 
 #include "hw/spapr.h"
 #include "hw/spapr_vio.h"

diff --git a/hw/spapr_hcall.c b/hw/spapr_hcall.c
index 1fac3623293e5f3cfb1ef8dafaca77ab9d72d4cb..afb12973f267c114e238765ebaf9ecb4eef299f4 100644 (file)
--- a/hw/spapr_hcall.c
+++ b/hw/spapr_hcall.c
@@ -1,6 +1,6 @@
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "cpu.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "helper_regs.h"
 #include "hw/spapr.h"
 

diff --git a/hw/spapr_iommu.c b/hw/spapr_iommu.c
index fb968b250be2894f1dbb38affcb39416589ba492..d8a098cb1b23124b0a826e904aa2947ee17fa6ed 100644 (file)
--- a/hw/spapr_iommu.c
+++ b/hw/spapr_iommu.c
@@ -17,10 +17,10 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "hw.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "qdev.h"
 #include "kvm_ppc.h"
-#include "dma.h"
+#include "sysemu/dma.h"
 #include "exec/address-spaces.h"
 
 #include "hw/spapr.h"

diff --git a/hw/spapr_nvram.c b/hw/spapr_nvram.c
index 512bb8d5d1b36231e7066ac73ee7f84cde44996c..f20f6b4fdd20b14559a8825a85c79b356cfa3e16 100644 (file)
--- a/hw/spapr_nvram.c
+++ b/hw/spapr_nvram.c
@@ -24,7 +24,7 @@
 #include <sys/mman.h>
 #include <libfdt.h>
 
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
 #include "hw/sysbus.h"
 #include "hw/spapr.h"
 #include "hw/spapr_vio.h"

diff --git a/hw/spapr_rtas.c b/hw/spapr_rtas.c
index e618c2db53a7b1f113afb47d4e1f36971aa1df48..d29736285ce5c4c77e4beb52fc53579fa4939da1 100644 (file)
--- a/hw/spapr_rtas.c
+++ b/hw/spapr_rtas.c
@@ -25,10 +25,10 @@
  *
  */
 #include "cpu.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu-char.h"
 #include "hw/qdev.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
 
 #include "hw/spapr.h"
 #include "hw/spapr_vio.h"

diff --git a/hw/spapr_vio.c b/hw/spapr_vio.c
index fdf8db915816097e5e449b5dcc75d66de522c4ae..a58621d17e67a4992ac25a5007c6c976e1d67683 100644 (file)
--- a/hw/spapr_vio.c
+++ b/hw/spapr_vio.c
@@ -20,14 +20,14 @@
  */
 
 #include "hw.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "boards.h"
 #include "monitor/monitor.h"
 #include "loader.h"
 #include "elf.h"
 #include "hw/sysbus.h"
-#include "kvm.h"
-#include "device_tree.h"
+#include "sysemu/kvm.h"
+#include "sysemu/device_tree.h"
 #include "kvm_ppc.h"
 
 #include "hw/spapr.h"

diff --git a/hw/spapr_vio.h b/hw/spapr_vio.h
index cc85d2610106dd08e1b97b0b7128a6328a77a2ed..f98ec0a2e57f9c0aada91492af62d14fec301a1c 100644 (file)
--- a/hw/spapr_vio.h
+++ b/hw/spapr_vio.h
@@ -21,7 +21,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dma.h"
+#include "sysemu/dma.h"
 
 #define TYPE_VIO_SPAPR_DEVICE "vio-spapr-device"
 #define VIO_SPAPR_DEVICE(obj) \

diff --git a/hw/spitz.c b/hw/spitz.c
index 1259e3297456fc9bb30340695a4322231fc9affb..8e1be7fb21bf13132d1b297fd23b13929559b50d 100644 (file)
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -13,7 +13,7 @@
 #include "hw.h"
 #include "pxa.h"
 #include "arm-misc.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "pcmcia.h"
 #include "i2c.h"
 #include "ssi.h"
@@ -25,7 +25,7 @@
 #include "block/block.h"
 #include "audio/audio.h"
 #include "boards.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "sysbus.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/ssi-sd.c b/hw/ssi-sd.c
index c5505ee24fbaab4ebebe2a47e2ee7d37329d1b0f..d61c3328d931e30f7fb1e378db16c220b25ba994 100644 (file)
--- a/hw/ssi-sd.c
+++ b/hw/ssi-sd.c
@@ -10,7 +10,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "ssi.h"
 #include "sd.h"
 

diff --git a/hw/strongarm.c b/hw/strongarm.c
index f776fee3bc902bbee58d9601f1f7cb72b1b9e3bc..5d5f454b1d89fc5f20a36f6f04d3dae9d0fd6c38 100644 (file)
--- a/hw/strongarm.c
+++ b/hw/strongarm.c
@@ -31,7 +31,7 @@
 #include "qemu/error-report.h"
 #include "arm-misc.h"
 #include "qemu-char.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "ssi.h"
 
 //#define DEBUG

diff --git a/hw/sun4m.c b/hw/sun4m.c
index 4245854949c32b2265ebc112fe5dddbb69139ec5..0d84b373b1e7e20902f01af51036884992183b5c 100644 (file)
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -27,7 +27,7 @@
 #include "nvram.h"
 #include "sparc32_dma.h"
 #include "fdc.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "net/net.h"
 #include "boards.h"
 #include "firmware_abi.h"
@@ -40,7 +40,7 @@
 #include "qdev-addr.h"
 #include "loader.h"
 #include "elf.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "trace.h"
 
 /*

diff --git a/hw/sun4u.c b/hw/sun4u.c
index 8bca4fdff9b5d1c032895b7b96931b4679109c11..cbfd217587b6315aeddc99651c4b6b045905e041 100644 (file)
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -30,7 +30,7 @@
 #include "fdc.h"
 #include "net/net.h"
 #include "qemu/timer.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "boards.h"
 #include "firmware_abi.h"
 #include "fw_cfg.h"
@@ -38,7 +38,7 @@
 #include "ide.h"
 #include "loader.h"
 #include "elf.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 
 //#define DEBUG_IRQ

diff --git a/hw/tc6393xb.c b/hw/tc6393xb.c
index edf76817b5915d2978ff7078e97baaf7a6360b2a..e815f83198f3962a1f89e5afe0c212dad83bce0c 100644 (file)
--- a/hw/tc6393xb.c
+++ b/hw/tc6393xb.c
@@ -15,7 +15,7 @@
 #include "flash.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 
 #define IRQ_TC6393_NAND                0
 #define IRQ_TC6393_MMC         1

diff --git a/hw/tosa.c b/hw/tosa.c
index 6fdbec53ee6d4f1f1b1a0959d333604fa04ac789..6ee46938405d3f3f2e84793db90e45527980c461 100644 (file)
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -21,7 +21,7 @@
 #include "boards.h"
 #include "i2c.h"
 #include "ssi.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "sysbus.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/twl92230.c b/hw/twl92230.c
index 3210b9ef4e77a2921ec4132f76a5972fc409a921..c71e4a2af0c35efa63ebf649025cc4db18a43115 100644 (file)
--- a/hw/twl92230.c
+++ b/hw/twl92230.c
@@ -22,7 +22,7 @@
 #include "hw.h"
 #include "qemu/timer.h"
 #include "i2c.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "ui/console.h"
 
 #define VERBOSE 1

diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 74728c94e5984006f1aad629d824726c72bf3cc0..10260a13ac2f1b46439c0f725b6d3da932885919 100644 (file)
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -1,7 +1,7 @@
 #include "hw/hw.h"
 #include "hw/usb.h"
 #include "hw/qdev.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
 #include "trace.h"
 

diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index e8ada9f02cf51791804711b7b5c32d7e3a3f0dae..1c548634529b40f32b3c686cdfa2b26b13559756 100644 (file)
--- a/hw/usb/dev-network.c
+++ b/hw/usb/dev-network.c
@@ -29,7 +29,7 @@
 #include "net/net.h"
 #include "qemu/queue.h"
 #include "qemu/config-file.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/iov.h"
 
 /*#define TRAFFIC_DEBUG*/

diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 6d27bac94f336c0863552657465507a9bed302ff..50255976739631939dcd4d5f0e4db625455093e5 100644 (file)
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -15,8 +15,8 @@
 #include "hw/scsi.h"
 #include "ui/console.h"
 #include "monitor/monitor.h"
-#include "sysemu.h"
-#include "blockdev.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/blockdev.h"
 
 //#define DEBUG_MSD
 

diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h
index 5bc80031bf5e4cfdcf272d3a7658726e63763327..e35144d38670f1ecbea91aee50424da2723fff9d 100644 (file)
--- a/hw/usb/hcd-ehci.h
+++ b/hw/usb/hcd-ehci.h
@@ -22,8 +22,8 @@
 #include "hw/usb.h"
 #include "monitor/monitor.h"
 #include "trace.h"
-#include "dma.h"
-#include "sysemu.h"
+#include "sysemu/dma.h"
+#include "sysemu/sysemu.h"
 
 #ifndef EHCI_DEBUG
 #define EHCI_DEBUG   0

diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index c9b8a3146502d2acd3d4be6558b265f353d0c6f8..2af754b5cf9f81445c2aac3a3c9b49e6bb341665 100644 (file)
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -30,7 +30,7 @@
 #include "hw/pci/pci.h"
 #include "qemu/timer.h"
 #include "qemu/iov.h"
-#include "dma.h"
+#include "sysemu/dma.h"
 #include "trace.h"
 
 //#define DEBUG

diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c
index 9a8c26ceaf4210b3dbe6cd9221d0654d795bda1e..669fbd245c56b591ec52928c5a06fcb61ccb3c87 100644 (file)
--- a/hw/usb/host-linux.c
+++ b/hw/usb/host-linux.c
@@ -33,7 +33,7 @@
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "monitor/monitor.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "trace.h"
 
 #include <dirent.h>

diff --git a/hw/usb/libhw.c b/hw/usb/libhw.c
index 672d7a5598e775998cf6290f0fcdc4732e3859f5..75f022f4ec847025b5ee191b03fa8d5dd9f268e3 100644 (file)
--- a/hw/usb/libhw.c
+++ b/hw/usb/libhw.c
@@ -22,7 +22,7 @@
 #include "qemu-common.h"
 #include "exec/cpu-common.h"
 #include "hw/usb.h"
-#include "dma.h"
+#include "sysemu/dma.h"
 
 int usb_packet_map(USBPacket *p, QEMUSGList *sgl)
 {

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 31e5f27595f4c8afb7e020e3b0fc6581fb11f3e5..b65e8682b626ecd9514f7a316e2b1f3728c04f73 100644 (file)
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -28,7 +28,7 @@
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "monitor/monitor.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/iov.h"
 
 #include <dirent.h>

diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index bd9c01564af3a2a35f1003be8680bf01b6c2a541..5e89e747a2935984bfe7416fe51e6a0f2abb3a2f 100644 (file)
--- a/hw/versatilepb.c
+++ b/hw/versatilepb.c
@@ -11,11 +11,11 @@
 #include "arm-misc.h"
 #include "devices.h"
 #include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "pci/pci.h"
 #include "i2c.h"
 #include "boards.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "exec/address-spaces.h"
 #include "flash.h"
 

diff --git a/hw/vexpress.c b/hw/vexpress.c
index e7b9e93852af86bbb8c456169e14ea27dd4747b0..93c3176667661cb5df579d293ccc2b64b5796957 100644 (file)
--- a/hw/vexpress.c
+++ b/hw/vexpress.c
@@ -26,10 +26,10 @@
 #include "primecell.h"
 #include "devices.h"
 #include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "boards.h"
 #include "exec/address-spaces.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "flash.h"
 
 #define VEXPRESS_BOARD_ID 0x8e0

diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c
index 9f204bc113588f6e734654ba0e71491f4c40a04b..41fb7ad1de96c9c62763b59ebcf41724e67c578d 100644 (file)
--- a/hw/vfio_pci.c
+++ b/hw/vfio_pci.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "qemu/event_notifier.h"
 #include "exec/address-spaces.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "exec/memory.h"
 #include "pci/msi.h"
 #include "pci/msix.h"

diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
index 5134e2f477847998a244f2941de0aaeedccc5c64..5238c7cbd6d5cdaa0e4a1378ebd5d5142587c79e 100644 (file)
--- a/hw/virtex_ml507.c
+++ b/hw/virtex_ml507.c
@@ -26,10 +26,10 @@
 #include "hw.h"
 #include "serial.h"
 #include "flash.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "devices.h"
 #include "boards.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
 #include "loader.h"
 #include "elf.h"
 #include "qemu/log.h"
@@ -39,7 +39,7 @@
 #include "ppc4xx.h"
 #include "ppc405.h"
 
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "xilinx.h"
 
 #define EPAPR_MAGIC    (0x45504150)

diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c
index 2eb709b422ef58178445128c34df60d0c2532a7d..3040bc63ab52f4b7858792b32c718e3cc5e0df69 100644 (file)
--- a/hw/virtio-balloon.c
+++ b/hw/virtio-balloon.c
@@ -18,9 +18,9 @@
 #include "virtio.h"
 #include "pc.h"
 #include "cpu.h"
-#include "balloon.h"
+#include "sysemu/balloon.h"
 #include "virtio-balloon.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "exec/address-spaces.h"
 
 #if defined(__linux__)

diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index 208caa2642be927f9a25ef085bd9548365e0189d..90cfa246dbf89ace9defa7d59432174621b6ec2e 100644 (file)
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -15,7 +15,7 @@
 #include "qemu/error-report.h"
 #include "trace.h"
 #include "hw/block-common.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "virtio-blk.h"
 #include "scsi-defs.h"
 #ifdef __linux__

diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index f58917f75fe7e9e331bddd6069343333e228550e..d2d2454493ff4da0aa2ff7b94fd393899c12f2ec 100644 (file)
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -27,8 +27,8 @@
 #include "pci/msi.h"
 #include "pci/msix.h"
 #include "loader.h"
-#include "kvm.h"
-#include "blockdev.h"
+#include "sysemu/kvm.h"
+#include "sysemu/blockdev.h"
 #include "virtio-pci.h"
 #include "qemu/range.h"
 

diff --git a/hw/virtio.h b/hw/virtio.h
index 511a16992ef77a288dd959c9face628f843fb485..541600484eca5e51217c9661e460d1d5aaea69b2 100644 (file)
--- a/hw/virtio.h
+++ b/hw/virtio.h
@@ -17,7 +17,7 @@
 #include "hw.h"
 #include "net/net.h"
 #include "qdev.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/event_notifier.h"
 #ifdef CONFIG_LINUX
 #include "9p.h"

diff --git a/hw/vmport.c b/hw/vmport.c
index 3ab3a1405ca22458b2b029f21145cf6a39144f57..7d425237ac1d03b58fa0147f79e5ba2fb82ccbea 100644 (file)
--- a/hw/vmport.c
+++ b/hw/vmport.c
@@ -24,7 +24,7 @@
 #include "hw.h"
 #include "isa.h"
 #include "pc.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "qdev.h"
 
 //#define VMPORT_DEBUG

diff --git a/hw/vt82c686.c b/hw/vt82c686.c
index a18aaed21768ba17124c739fc8e8075fc371e6c9..d3469d49f196e3bed3bf86d66f28a214464eb392 100644 (file)
--- a/hw/vt82c686.c
+++ b/hw/vt82c686.c
@@ -22,7 +22,7 @@
 #include "apm.h"
 #include "acpi.h"
 #include "pm_smbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/timer.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/watchdog.c b/hw/watchdog.c
index 5b04215374e99d9732b1f9a11565f638b77a0d56..072d2568820ff4f953d5ed322f6300c09e478805 100644 (file)
--- a/hw/watchdog.c
+++ b/hw/watchdog.c
@@ -25,7 +25,7 @@
 #include "qemu/queue.h"
 #include "qapi/qmp/types.h"
 #include "monitor/monitor.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "hw/watchdog.h"
 
 /* Possible values for action parameter. */

diff --git a/hw/xen_backend.h b/hw/xen_backend.h
index 92ab501d374469950f23bcd196334ac0ed890941..f37afb1f05837bfd97f72ee6f4f7a7a7fb11c628 100644 (file)
--- a/hw/xen_backend.h
+++ b/hw/xen_backend.h
@@ -2,7 +2,7 @@
 #define QEMU_HW_XEN_BACKEND_H 1
 
 #include "xen_common.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "net/net.h"
 
 /* ------------------------------------------------------------- */

diff --git a/hw/xen_devconfig.c b/hw/xen_devconfig.c
index d83e8d0f64c8a644f89d4fc830cad2445621df48..e2ba741d54251d9d82ed3675d0d76b4320670c68 100644 (file)
--- a/hw/xen_devconfig.c
+++ b/hw/xen_devconfig.c
@@ -1,5 +1,5 @@
 #include "xen_backend.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 
 /* ------------------------------------------------------------- */
 

diff --git a/hw/xen_disk.c b/hw/xen_disk.c
index 423b580cfff241f254cacea931071e86526332e2..a6a64a2455879811ecb52eb9087a691407b0b694 100644 (file)
--- a/hw/xen_disk.c
+++ b/hw/xen_disk.c
@@ -38,7 +38,7 @@
 #include "hw.h"
 #include "xen_backend.h"
 #include "xen_blkif.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 
 /* ------------------------------------------------------------- */
 

diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
index 426470351ed25bb1c5e9634e79fc84e74b795144..9feecd5a2797a3b65147f7e0d79ee084bce841a5 100644 (file)
--- a/hw/xen_machine_pv.c
+++ b/hw/xen_machine_pv.c
@@ -27,7 +27,7 @@
 #include "boards.h"
 #include "xen_backend.h"
 #include "xen_domainbuild.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 
 static void xen_init_pv(QEMUMachineInitArgs *args)
 {

diff --git a/hw/xilinx_spi.c b/hw/xilinx_spi.c
index 4eed1828e36c722e8259698eacc0885e28526e92..77f917800876cb898953a39d93e7b233f3d0e53e 100644 (file)
--- a/hw/xilinx_spi.c
+++ b/hw/xilinx_spi.c
@@ -25,7 +25,7 @@
  */
 
 #include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/log.h"
 #include "fifo.h"
 

diff --git a/hw/xilinx_spips.c b/hw/xilinx_spips.c
index ebe375e56f6f29beadbe0f3fcf2c3c8b07446072..42e019dc057ceaf60735c09e2e44b456152a1773 100644 (file)
--- a/hw/xilinx_spips.c
+++ b/hw/xilinx_spips.c
@@ -23,7 +23,7 @@
  */
 
 #include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "ptimer.h"
 #include "qemu/log.h"
 #include "fifo.h"

diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c
index 156648a5d1ce3fb569490a974dccfbd2c3472643..da0a7d0aa173538b8cccb5d5c5f41a634647a998 100644 (file)
--- a/hw/xilinx_zynq.c
+++ b/hw/xilinx_zynq.c
@@ -19,10 +19,10 @@
 #include "arm-misc.h"
 #include "net/net.h"
 #include "exec/address-spaces.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "boards.h"
 #include "flash.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "loader.h"
 #include "ssi.h"
 

diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c
index c6c880eba570f78d0f6f13ba27ced5da8e7bb068..9c7bb75f8183aff5bc2b749f7e77a826d19798a2 100644 (file)
--- a/hw/xtensa_lx60.c
+++ b/hw/xtensa_lx60.c
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "boards.h"
 #include "loader.h"
 #include "elf.h"
@@ -35,7 +35,7 @@
 #include "net/net.h"
 #include "sysbus.h"
 #include "flash.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "qemu-char.h"
 #include "xtensa_bootparam.h"
 

diff --git a/hw/xtensa_sim.c b/hw/xtensa_sim.c
index 29b5f22a184a70cf1dd218f14cf51774a59152d0..14fe85b2fc276b1df24ded15de4b8e26ac1af067 100644 (file)
--- a/hw/xtensa_sim.c
+++ b/hw/xtensa_sim.c
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "boards.h"
 #include "loader.h"
 #include "elf.h"

diff --git a/hw/z2.c b/hw/z2.c
index ec35f3e44491bb8640690ca9c1c74e6999f1f1a1..09b03687d1172d4bc9ef8b327a4ae28c932eeafa 100644 (file)
--- a/hw/z2.c
+++ b/hw/z2.c
@@ -18,9 +18,9 @@
 #include "i2c.h"
 #include "ssi.h"
 #include "boards.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "flash.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "ui/console.h"
 #include "audio/audio.h"
 #include "exec/address-spaces.h"

diff --git a/hw/zynq_slcr.c b/hw/zynq_slcr.c
index c7ce51f4a6bd4f263ab335f9450a2ca2cfc07238..97ec578262be75b4da9fb8faa2872e38cb50ca6b 100644 (file)
--- a/hw/zynq_slcr.c
+++ b/hw/zynq_slcr.c
@@ -17,7 +17,7 @@
 #include "hw.h"
 #include "qemu/timer.h"
 #include "sysbus.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 #ifdef ZYNQ_ARM_SLCR_ERR_DEBUG
 #define DB_PRINT(...) do { \

diff --git a/arch_init.h b/include/sysemu/arch_init.h
similarity index 100%
rename from arch_init.h
rename to include/sysemu/arch_init.h

diff --git a/balloon.h b/include/sysemu/balloon.h
similarity index 100%
rename from balloon.h
rename to include/sysemu/balloon.h

diff --git a/blockdev.h b/include/sysemu/blockdev.h
similarity index 100%
rename from blockdev.h
rename to include/sysemu/blockdev.h

diff --git a/cpus.h b/include/sysemu/cpus.h
similarity index 100%
rename from cpus.h
rename to include/sysemu/cpus.h

diff --git a/device_tree.h b/include/sysemu/device_tree.h
similarity index 100%
rename from device_tree.h
rename to include/sysemu/device_tree.h

diff --git a/dma.h b/include/sysemu/dma.h
similarity index 99%
rename from dma.h
rename to include/sysemu/dma.h
index fd68f74c5bf1a3d2ac2cee9eed04561b7aa4438e..a52c93a553674ba0f25675b67be5f3c7c6a0f060 100644 (file)
--- a/dma.h
+++ b/include/sysemu/dma.h
@@ -14,7 +14,7 @@
 #include "exec/memory.h"
 #include "hw/hw.h"
 #include "block/block.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 
 typedef struct DMAContext DMAContext;
 typedef struct ScatterGatherEntry ScatterGatherEntry;

diff --git a/dump.h b/include/sysemu/dump.h
similarity index 100%
rename from dump.h
rename to include/sysemu/dump.h

diff --git a/kvm.h b/include/sysemu/kvm.h
similarity index 100%
rename from kvm.h
rename to include/sysemu/kvm.h

diff --git a/memory_mapping.h b/include/sysemu/memory_mapping.h
similarity index 100%
rename from memory_mapping.h
rename to include/sysemu/memory_mapping.h

diff --git a/qemu-os-posix.h b/include/sysemu/os-posix.h
similarity index 100%
rename from qemu-os-posix.h
rename to include/sysemu/os-posix.h

diff --git a/qemu-os-win32.h b/include/sysemu/os-win32.h
similarity index 100%
rename from qemu-os-win32.h
rename to include/sysemu/os-win32.h

diff --git a/qtest.h b/include/sysemu/qtest.h
similarity index 100%
rename from qtest.h
rename to include/sysemu/qtest.h

diff --git a/qemu-seccomp.h b/include/sysemu/seccomp.h
similarity index 100%
rename from qemu-seccomp.h
rename to include/sysemu/seccomp.h

diff --git a/sysemu.h b/include/sysemu/sysemu.h
similarity index 100%
rename from sysemu.h
rename to include/sysemu/sysemu.h

diff --git a/xen-mapcache.h b/include/sysemu/xen-mapcache.h
similarity index 100%
rename from xen-mapcache.h
rename to include/sysemu/xen-mapcache.h

diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h
index a0d1a50487a19d032a0433c45d7eaaa080099e33..8b192e961380c252b2640c0eb3f2727f111d6fed 100644 (file)
--- a/include/ui/spice-display.h
+++ b/include/ui/spice-display.h
@@ -21,7 +21,7 @@
 
 #include "qemu/thread.h"
 #include "ui/qemu-pixman.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 #define NUM_MEMSLOTS 8
 #define MEMSLOT_GENERATION_BITS 8

diff --git a/kvm-all.c b/kvm-all.c
index 41ea3aa6ee1d6bc86d9cec6efbf16759b1b0879f..5aa65c4c15ce86edcbfda67c9589d849d74e4f15 100644 (file)
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -24,11 +24,11 @@
 #include "qemu/atomic.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "hw/hw.h"
 #include "hw/pci/msi.h"
 #include "exec/gdbstub.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "qemu/bswap.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"

diff --git a/kvm-stub.c b/kvm-stub.c
index 8de8ebd3d2c139ef735b323bbd354c029449a9eb..5b971521cdd243988beb270f62ca1ed7a0ab0fb5 100644 (file)
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -15,7 +15,7 @@
 #include "hw/pci/msi.h"
 #include "cpu.h"
 #include "exec/gdbstub.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 
 KVMState *kvm_state;
 bool kvm_kernel_irqchip;

diff --git a/memory.c b/memory.c
index d44200335bae8d75af33fa3f5e9cecc14304e35a..35e6122dd7756b7b081f080fd407ac34b975fb6a 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -17,7 +17,7 @@
 #include "exec/address-spaces.h"
 #include "exec/ioport.h"
 #include "qemu/bitops.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include <assert.h>
 
 #include "exec/memory-internal.h"

diff --git a/memory_mapping-stub.c b/memory_mapping-stub.c
index 5f5fb99c58283b698898c344aa991e2137f8c40d..24d5d67371938cb61b4b60e6d4591cb721ce8380 100644 (file)
--- a/memory_mapping-stub.c
+++ b/memory_mapping-stub.c
@@ -13,7 +13,7 @@
 
 #include "cpu.h"
 #include "exec/cpu-all.h"
-#include "memory_mapping.h"
+#include "sysemu/memory_mapping.h"
 
 int qemu_get_guest_memory_mapping(MemoryMappingList *list)
 {

diff --git a/memory_mapping.c b/memory_mapping.c
index c829a9fa34c26c0120cb35aa5ce1ac787a923bfc..530f1d679358996669f18891da63f2b267d12ece 100644 (file)
--- a/memory_mapping.c
+++ b/memory_mapping.c
@@ -13,7 +13,7 @@
 
 #include "cpu.h"
 #include "exec/cpu-all.h"
-#include "memory_mapping.h"
+#include "sysemu/memory_mapping.h"
 
 static void memory_mapping_list_add_mapping_sorted(MemoryMappingList *list,
                                                    MemoryMapping *mapping)

diff --git a/migration.c b/migration.c
index 8c5c5670d8b892c870a9db82e68b48a93429c3cb..810f25e7ebeff03fbc44e40749ae7c006b5df820 100644 (file)
--- a/migration.c
+++ b/migration.c
@@ -17,7 +17,7 @@
 #include "migration/migration.h"
 #include "monitor/monitor.h"
 #include "buffered_file.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "block/block.h"
 #include "qemu/sockets.h"
 #include "migration/block.h"

diff --git a/monitor.c b/monitor.c
index 878b2317af75df581e9a23540fe2548cb0e7b1b0..200bef452fe9fafd643b113dbb57b30a7d932d83 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -35,17 +35,17 @@
 #include "net/slirp.h"
 #include "qemu-char.h"
 #include "ui/qemu-spice.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
 #include "monitor/readline.h"
 #include "ui/console.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "audio/audio.h"
 #include "disas/disas.h"
-#include "balloon.h"
+#include "sysemu/balloon.h"
 #include "qemu/timer.h"
 #include "migration/migration.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "qemu/acl.h"
 #include "qapi/qmp/qint.h"
 #include "qapi/qmp/qfloat.h"

diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index b48182f678c5c8492356f235ecaa710d97bb7f9b..01c705b4c03c891b2882de809ece9049a7a1ef48 100644 (file)
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -24,7 +24,7 @@
 
 #include "tap_int.h"
 #include "qemu-common.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
 
 #ifdef __NetBSD__

diff --git a/net/tap-linux.c b/net/tap-linux.c
index dd4b9152438a84a20435ddc910383e9f85cb4f6a..059f5f34ab2ce026957b4c0c3507f306cadc5709 100644 (file)
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -30,7 +30,7 @@
 #include <net/if.h>
 #include <sys/ioctl.h>
 
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 

diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index 3d5fee554239a2b132e210134a2a9d9be8466b2e..486a7ea838c97d7beb2843ed4cd02add1393c895 100644 (file)
--- a/net/tap-solaris.c
+++ b/net/tap-solaris.c
@@ -23,7 +23,7 @@
  */
 
 #include "tap_int.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 #include <sys/stat.h>
 #include <sys/ethernet.h>

diff --git a/net/tap-win32.c b/net/tap-win32.c
index 1ddd6fa6e6a40dd7d778bd6dd1373d1c6b1d9c96..0c63cbd203a0532b78bf66cf1aebb8211869138b 100644 (file)
--- a/net/tap-win32.c
+++ b/net/tap-win32.c
@@ -31,7 +31,7 @@
 #include "qemu-common.h"
 #include "clients.h"            /* net_init_tap */
 #include "net/net.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
 #include <stdio.h>
 #include <windows.h>

diff --git a/net/tap.c b/net/tap.c
index d34ff1339828fb9d2ab988db24016d0578d76b81..eb40c42d7d9f75a7b41b0666c0881990abbb226d 100644 (file)
--- a/net/tap.c
+++ b/net/tap.c
@@ -36,7 +36,7 @@
 #include "net/net.h"
 #include "clients.h"
 #include "monitor/monitor.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 

diff --git a/os-posix.c b/os-posix.c
index 488e48005f5330bcc59e442bdcf5e02e594fa9de..5c64518902583cfd90edaf87a57ac59749d0b9e9 100644 (file)
--- a/os-posix.c
+++ b/os-posix.c
@@ -36,7 +36,7 @@
 
 /* Needed early for CONFIG_BSD etc. */
 #include "config-host.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "net/slirp.h"
 #include "qemu-options.h"
 

diff --git a/os-win32.c b/os-win32.c
index 13892ba3206d63ed6c23aa4e5c60d897c8240619..9673a81c7dbce14085b6bbe6d2f71d5cf66a1efd 100644 (file)
--- a/os-win32.c
+++ b/os-win32.c
@@ -30,7 +30,7 @@
 #include <errno.h>
 #include <sys/time.h>
 #include "config-host.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu-options.h"
 
 /***********************************************************/

diff --git a/oslib-posix.c b/oslib-posix.c
index a737d6e0e33aa71498ae038b6ac7b792402bcc5f..4f5ec6788b6513e3113eab18107c58608cb0ee27 100644 (file)
--- a/oslib-posix.c
+++ b/oslib-posix.c
@@ -49,7 +49,7 @@ extern int daemon(int, int);
 #endif
 
 #include "config-host.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "trace.h"
 #include "qemu/sockets.h"
 

diff --git a/oslib-win32.c b/oslib-win32.c
index 7f0dd07e5f1889f8ac17c912677f12eb4088ec99..e7e283e875e7294797e444125af7fb863abe68c2 100644 (file)
--- a/oslib-win32.c
+++ b/oslib-win32.c
@@ -27,7 +27,7 @@
  */
 #include <windows.h>
 #include "config-host.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/main-loop.h"
 #include "trace.h"
 #include "qemu/sockets.h"

diff --git a/qemu-char.c b/qemu-char.c
index 5a8d8f75a4e19d57cb1a46680be23b3afe570a2b..0cbe85318e58d3194a9ed1a230b13498097fabd9 100644 (file)
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -24,7 +24,7 @@
 #include "qemu-common.h"
 #include "monitor/monitor.h"
 #include "ui/console.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/timer.h"
 #include "qemu-char.h"
 #include "hw/usb.h"

diff --git a/qemu-common.h b/qemu-common.h
index 40cd198fc13d56d31b83abdc94939b808b45398f..6871cab37138c5379ed3c6b323698368479a3788 100644 (file)
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -43,11 +43,11 @@
 #include <glib.h>
 
 #ifdef _WIN32
-#include "qemu-os-win32.h"
+#include "sysemu/os-win32.h"
 #endif
 
 #ifdef CONFIG_POSIX
-#include "qemu-os-posix.h"
+#include "sysemu/os-posix.h"
 #endif
 
 #ifndef O_LARGEFILE

diff --git a/qemu-img.c b/qemu-img.c
index 4c8e2f3849829a73d40d0b67e9ffc84c40df1c05..69cc02871b10649bdabaf78a5e2cfdbf66bf17dd 100644 (file)
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -28,7 +28,7 @@
 #include "qemu/option.h"
 #include "qemu/error-report.h"
 #include "qemu/osdep.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "block/block_int.h"
 #include <getopt.h>
 #include <stdio.h>

diff --git a/qemu-progress.c b/qemu-progress.c
index 08d67949a1fcaf5be4ff3902fc3c078392ac1efa..9a3f96cd47077b3d49f52c57e098e86ce05e7e06 100644 (file)
--- a/qemu-progress.c
+++ b/qemu-progress.c
@@ -24,7 +24,7 @@
 
 #include "qemu-common.h"
 #include "qemu/osdep.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include <stdio.h>
 
 struct progress_state {

diff --git a/qemu-seccomp.c b/qemu-seccomp.c
index 2a71d6fee9cadc1fc228eee89ddc1fc4491d9bd2..031da1dfee17e36aeaee0401bb4158f73096ed3b 100644 (file)
--- a/qemu-seccomp.c
+++ b/qemu-seccomp.c
@@ -14,7 +14,7 @@
  */
 #include <stdio.h>
 #include <seccomp.h>
-#include "qemu-seccomp.h"
+#include "sysemu/seccomp.h"
 
 struct QemuSeccompSyscall {
     int32_t num;

diff --git a/qemu-timer.c b/qemu-timer.c
index 80b3f2eb31a614ef74b0d689ac6ea984da00eb49..8fb5c75df73b8838b58995222b008a11356237d6 100644 (file)
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
 #include "ui/console.h"
 

diff --git a/qemu-tool.c b/qemu-tool.c
index 8ac45ff39bfd149df145dfc99630a2c38c898536..1a474c45bcb5f05a0c4dba2e2abbe5698fb62bc2 100644 (file)
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -19,7 +19,7 @@
 #include "qemu/log.h"
 #include "migration/migration.h"
 #include "qemu/main-loop.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/sockets.h"
 #include "slirp/libslirp.h"
 

diff --git a/qmp.c b/qmp.c
index 5b3a5d7d038a88920686f0682747e66fade8c737..be63fe10296b31e25064882bb1c896d1e7b9f8b8 100644 (file)
--- a/qmp.c
+++ b/qmp.c
@@ -14,15 +14,15 @@
  */
 
 #include "qemu-common.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qmp-commands.h"
 #include "qemu-char.h"
 #include "ui/qemu-spice.h"
 #include "ui/vnc.h"
-#include "kvm.h"
-#include "arch_init.h"
+#include "sysemu/kvm.h"
+#include "sysemu/arch_init.h"
 #include "hw/qdev.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "qom/qom-qobject.h"
 
 NameInfo *qmp_query_name(Error **errp)

diff --git a/qtest.c b/qtest.c
index ebe3963167dfb199bd33c1e5afa26928a47a7b44..468c921310c12d9d3e5dbfa85acbf908b4c1d72a 100644 (file)
--- a/qtest.c
+++ b/qtest.c
@@ -11,14 +11,14 @@
  *
  */
 
-#include "qtest.h"
+#include "sysemu/qtest.h"
 #include "hw/qdev.h"
 #include "qemu-char.h"
 #include "exec/ioport.h"
 #include "exec/memory.h"
 #include "hw/irq.h"
-#include "sysemu.h"
-#include "cpus.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/cpus.h"
 
 #define MAX_IRQ 256
 

diff --git a/savevm.c b/savevm.c
index ea01e9baf6e2ae10e2fb6a7e323ca34dcd9a5e71..b2a844f2b1daacb7ed395dd58b2e22bf167194c6 100644 (file)
--- a/savevm.c
+++ b/savevm.c
@@ -74,14 +74,14 @@
 #include "hw/qdev.h"
 #include "net/net.h"
 #include "monitor/monitor.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/timer.h"
 #include "audio/audio.h"
 #include "migration/migration.h"
 #include "qemu/sockets.h"
 #include "qemu/queue.h"
 #include "qemu/timer.h"
-#include "cpus.h"
+#include "sysemu/cpus.h"
 #include "exec/memory.h"
 #include "qmp-commands.h"
 #include "trace.h"

diff --git a/stubs/arch-query-cpu-def.c b/stubs/arch-query-cpu-def.c
index 6eca8527d2626ac2be0311464a920d7cd6fff4c4..fa6789598acfa9c196f08fbd55429248d4c29d07 100644 (file)
--- a/stubs/arch-query-cpu-def.c
+++ b/stubs/arch-query-cpu-def.c
@@ -1,5 +1,5 @@
 #include "qemu-common.h"
-#include "arch_init.h"
+#include "sysemu/arch_init.h"
 #include "qapi/qmp/qerror.h"
 
 CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)

diff --git a/target-alpha/sys_helper.c b/target-alpha/sys_helper.c
index 2bc2b028156011c10f7ecc4f303b2c4eb6e8270c..434a63a97d7efb1668030ffaebf3916c228a3bac 100644 (file)
--- a/target-alpha/sys_helper.c
+++ b/target-alpha/sys_helper.c
@@ -19,7 +19,7 @@
 
 #include "cpu.h"
 #include "helper.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/timer.h"
 
 

diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index b00f5fa547a05f4ae81c0786ff1c279a29e310bd..17875ed0f0aef8cdb23df7648b323447ccba548f 100644 (file)
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -23,7 +23,7 @@
 #if !defined(CONFIG_USER_ONLY)
 #include "hw/loader.h"
 #endif
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 static void cp_reg_reset(gpointer key, gpointer value, gpointer opaque)
 {

diff --git a/target-arm/helper.c b/target-arm/helper.c
index eef2acd18a1294ee7f8fe3b2392503d7ec56fa65..e343fac8535a4f4c616d1ef87e4d8fa0d6ae8c7a 100644 (file)
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -2,7 +2,7 @@
 #include "exec/gdbstub.h"
 #include "helper.h"
 #include "qemu/host-utils.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/bitops.h"
 
 #ifndef CONFIG_USER_ONLY

diff --git a/target-i386/arch_dump.c b/target-i386/arch_dump.c
index 50d866f4c60cab268266c0d4dc80b0f4c92ac940..8209ce9ee28fdc4e14e0171288350e82bb5beff1 100644 (file)
--- a/target-i386/arch_dump.c
+++ b/target-i386/arch_dump.c
@@ -13,7 +13,7 @@
 
 #include "cpu.h"
 #include "exec/cpu-all.h"
-#include "dump.h"
+#include "sysemu/dump.h"
 #include "elf.h"
 
 #ifdef TARGET_X86_64

diff --git a/target-i386/arch_memory_mapping.c b/target-i386/arch_memory_mapping.c
index 6dfb0f3f56b9399cb1258027f3d63ec2e42dc635..c6c7874474deb1bb9889157149653a43d899fda8 100644 (file)
--- a/target-i386/arch_memory_mapping.c
+++ b/target-i386/arch_memory_mapping.c
@@ -13,7 +13,7 @@
 
 #include "cpu.h"
 #include "exec/cpu-all.h"
-#include "memory_mapping.h"
+#include "sysemu/memory_mapping.h"
 
 /* PAE Paging or IA-32e Paging */
 static void walk_pte(MemoryMappingList *list, hwaddr pte_start_addr,

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 8abc5561e9d908ef64acffd74f6015e0ffa2fbf3..1837f5af0479a92e076dcdf8bd2ecc9f04214e74 100644 (file)
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -22,14 +22,14 @@
 #include <inttypes.h>
 
 #include "cpu.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qapi/qmp/qerror.h"
 
 #include "qapi/visitor.h"
-#include "arch_init.h"
+#include "sysemu/arch_init.h"
 
 #include "hyperv.h"
 
@@ -38,7 +38,7 @@
 #include <linux/kvm_para.h>
 #endif
 
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #ifndef CONFIG_USER_ONLY
 #include "hw/xen.h"
 #include "hw/sysbus.h"

diff --git a/target-i386/excp_helper.c b/target-i386/excp_helper.c
index 64c8346d3b12442f128a3b419e4765fffc6ecfe3..179ea82f0fcead781a6fb4804f4adfa7d1faaae9 100644 (file)
--- a/target-i386/excp_helper.c
+++ b/target-i386/excp_helper.c
@@ -19,7 +19,7 @@
 
 #include "cpu.h"
 #include "qemu/log.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "helper.h"
 
 #if 0

diff --git a/target-i386/helper.c b/target-i386/helper.c
index bd47b8e58ee1f0b9d00ed1b56d08db402d5eb458..dca13609626fb6024241a44770de8a866320e179 100644 (file)
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -18,9 +18,9 @@
  */
 
 #include "cpu.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #ifndef CONFIG_USER_ONLY
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
 #endif
 

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 340ed3f33e5519d8076f4cd83ab4779962f64402..f63b1fbfda247666a5204b7e34fb811d8ef426b3 100644 (file)
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -21,8 +21,8 @@
 #include <linux/kvm_para.h>
 
 #include "qemu-common.h"
-#include "sysemu.h"
-#include "kvm.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/kvm.h"
 #include "kvm_i386.h"
 #include "cpu.h"
 #include "exec/gdbstub.h"

diff --git a/target-i386/kvm_i386.h b/target-i386/kvm_i386.h
index f6ab82f93c5bd149d5289930c7ccf21ea04caed4..4392ab43598724121111b0b7166bcc1ae065cea2 100644 (file)
--- a/target-i386/kvm_i386.h
+++ b/target-i386/kvm_i386.h
@@ -11,7 +11,7 @@
 #ifndef QEMU_KVM_I386_H
 #define QEMU_KVM_I386_H
 
-#include "kvm.h"
+#include "sysemu/kvm.h"
 
 bool kvm_allows_irq0_override(void);
 

diff --git a/target-i386/machine.c b/target-i386/machine.c
index 477150887bb4fe8248bbd0c6dbb9c25208110d4a..8c1fed10055b16fac640d640809807e6ee13821b 100644 (file)
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -4,7 +4,7 @@
 #include "hw/isa.h"
 
 #include "cpu.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 
 static const VMStateDescription vmstate_segment = {
     .name = "segment",

diff --git a/target-m68k/m68k-semi.c b/target-m68k/m68k-semi.c
index e6c7dd2f9b4a1c1755409ef1a6ddac1d843f2138..239fadbad597b435d21afcb899db15b881065ddf 100644 (file)
--- a/target-m68k/m68k-semi.c
+++ b/target-m68k/m68k-semi.c
@@ -36,7 +36,7 @@
 #include "exec/gdbstub.h"
 #include "exec/softmmu-semi.h"
 #endif
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 #define HOSTED_EXIT  0
 #define HOSTED_INIT_SIM 1

diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index 48b19a7e1d164cecf0dbe0ab6461f4b539a58d6a..103855afe0ea3f11a4408148b0f9e3b77823a347 100644 (file)
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -19,9 +19,9 @@
 
 #include "cpu.h"
 #include "helper_regs.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "kvm_ppc.h"
-#include "cpus.h"
+#include "sysemu/cpus.h"
 
 PowerPCCPU *cpu_ppc_init(const char *cpu_model)
 {

diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 2546c577f6b311edca3702da9152d4561ce2c0fb..88650d4ae4e1dfd8408fe46433833148c0785443 100644 (file)
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -24,12 +24,12 @@
 
 #include "qemu-common.h"
 #include "qemu/timer.h"
-#include "sysemu.h"
-#include "kvm.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/kvm.h"
 #include "kvm_ppc.h"
 #include "cpu.h"
-#include "cpus.h"
-#include "device_tree.h"
+#include "sysemu/cpus.h"
+#include "sysemu/device_tree.h"
 #include "hw/sysbus.h"
 #include "hw/spapr.h"
 

diff --git a/target-ppc/kvm_ppc.c b/target-ppc/kvm_ppc.c
index 2de59fd43bc276593c9f88ee972e78dcc8ee6d68..1b192a803858c1945a45e9e5d7dac322b1833b39 100644 (file)
--- a/target-ppc/kvm_ppc.c
+++ b/target-ppc/kvm_ppc.c
@@ -14,7 +14,7 @@
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "kvm_ppc.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
 
 #define PROC_DEVTREE_PATH "/proc/device-tree"
 

diff --git a/target-ppc/machine.c b/target-ppc/machine.c
index 5e7bc00e2619530fd11670c2025729556d379d2c..e014c0c1afff0c6ae563b15f5929d897354553be 100644 (file)
--- a/target-ppc/machine.c
+++ b/target-ppc/machine.c
@@ -1,6 +1,6 @@
 #include "hw/hw.h"
 #include "hw/boards.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 
 void cpu_save(QEMUFile *f, void *opaque)
 {

diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c
index 318ce92adb416610f1b54430fb4bfbe60a9095fd..0aee7a90633c1514741459ead5f58916e2137495 100644 (file)
--- a/target-ppc/mmu_helper.c
+++ b/target-ppc/mmu_helper.c
@@ -18,7 +18,7 @@
  */
 #include "cpu.h"
 #include "helper.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "kvm_ppc.h"
 
 //#define DEBUG_MMU

diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index cca63abf5d22ccb96917dd382bd3ff98a15ce47c..42ed748b59332e04322ec09b4f30cd1903c3992a 100644 (file)
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -25,9 +25,9 @@
 
 #include "disas/bfd.h"
 #include "exec/gdbstub.h"
-#include <kvm.h>
+#include <sysemu/kvm.h>
 #include "kvm_ppc.h"
-#include "arch_init.h"
+#include "sysemu/arch_init.h"
 
 //#define PPC_DUMP_CPU
 //#define PPC_DEBUG_SPR

diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index 8e135457a3f547624ffc2f4d058f9f8b3ebc7486..42e06eb85e6de7302bac9452d3c72cd6138f2d3e 100644 (file)
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -22,7 +22,7 @@
 #include "exec/gdbstub.h"
 #include "qemu/timer.h"
 #ifndef CONFIG_USER_ONLY
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #endif
 
 //#define DEBUG_S390

diff --git a/target-s390x/interrupt.c b/target-s390x/interrupt.c
index c1b034f77525c030ff7a539f86537bbc5b4fa5cc..6c0024b426c2d7b5197bceb1bc3b1ca6c7bde3d9 100644 (file)
--- a/target-s390x/interrupt.c
+++ b/target-s390x/interrupt.c
@@ -8,7 +8,7 @@
  */
 
 #include "cpu.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 
 #if !defined(CONFIG_USER_ONLY)
 /* service interrupts are floating therefore we must not pass an cpustate */

diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index dc7069991938b4c681c5784fcc98b0f648abf09f..762231d845b21af520840e2f12d430904f6d4bfb 100644 (file)
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -26,10 +26,10 @@
 
 #include "qemu-common.h"
 #include "qemu/timer.h"
-#include "sysemu.h"
-#include "kvm.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/kvm.h"
 #include "cpu.h"
-#include "device_tree.h"
+#include "sysemu/device_tree.h"
 
 /* #define DEBUG_KVM */
 

diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c
index 2e73d30756d82157c2cf09dfee70fc16901ba64d..e521ed55cc628179399f7e57b8ab124b9d7a6e7f 100644 (file)
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -23,7 +23,7 @@
 #include "qemu/host-utils.h"
 #include "helper.h"
 #include <string.h>
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "qemu/timer.h"
 #ifdef CONFIG_KVM
 #include <linux/kvm.h>
@@ -31,7 +31,7 @@
 
 #if !defined(CONFIG_USER_ONLY)
 #include "exec/softmmu_exec.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #endif
 
 /* #define DEBUG_HELPER */

diff --git a/target-sparc/helper.c b/target-sparc/helper.c
index e0d78f385283940145ec5a4063909eb6b794c91b..91ecfc7aa85d9e559a4a81f275a0a61a98969ad7 100644 (file)
--- a/target-sparc/helper.c
+++ b/target-sparc/helper.c
@@ -20,7 +20,7 @@
 #include "cpu.h"
 #include "qemu/host-utils.h"
 #include "helper.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 void helper_raise_exception(CPUSPARCState *env, int tt)
 {

diff --git a/target-sparc/int32_helper.c b/target-sparc/int32_helper.c
index 507c355cac6130f6301ed5cf4064b2c55af04f8d..c35f522e0f4cc1e416f5ecdf7a9b193a924f4357 100644 (file)
--- a/target-sparc/int32_helper.c
+++ b/target-sparc/int32_helper.c
@@ -19,7 +19,7 @@
 
 #include "cpu.h"
 #include "trace.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 #define DEBUG_PCALL
 

diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c
index f61a497d2190c4ce8b69d86f8c869215c33a117f..0a037291ef6b62082dd6d6fb998e9ded87505764 100644 (file)
--- a/target-xtensa/translate.c
+++ b/target-xtensa/translate.c
@@ -35,7 +35,7 @@
 #include "disas/disas.h"
 #include "tcg-op.h"
 #include "qemu/log.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 #include "helper.h"
 #define GEN_HELPER 1

diff --git a/ui/cocoa.m b/ui/cocoa.m
index 0afa6f86dd685026bc2346b779e3f09eacda1a26..3bf1c6e8901ed15c44d04218882c1b23838ddf79 100644 (file)
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -27,7 +27,7 @@
 
 #include "qemu-common.h"
 #include "ui/console.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 #ifndef MAC_OS_X_VERSION_10_4
 #define MAC_OS_X_VERSION_10_4 1040

diff --git a/ui/curses.c b/ui/curses.c
index 5d15e9e16ee44fecf9ed559a1f40c4b35f8d393b..d78e378440044a96d544126b9eebd640ab5b6111 100644 (file)
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -30,7 +30,7 @@
 
 #include "qemu-common.h"
 #include "ui/console.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 #define FONT_HEIGHT 16
 #define FONT_WIDTH 8

diff --git a/ui/input.c b/ui/input.c
index 05f6c0c849e300e9b1efe7f1f268884d6c430c9e..259fd1808db9149303c3422ca6746187d9e282da 100644 (file)
--- a/ui/input.c
+++ b/ui/input.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
 #include "ui/console.h"
 #include "qapi/error.h"

diff --git a/ui/keymaps.c b/ui/keymaps.c
index f55a2aa46452cb5836bb8a6ccd79e455d407fbbe..9625d82fa17c2ced40fd0ed8a20a11f236eb67b2 100644 (file)
--- a/ui/keymaps.c
+++ b/ui/keymaps.c
@@ -23,7 +23,7 @@
  */
 
 #include "keymaps.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 static int get_keysym(const name2keysym_t *table,
                      const char *name)

diff --git a/ui/sdl.c b/ui/sdl.c
index bcbf89daeb698f69bff33e2394f59a5b020f3fac..1657848e9f5d696da82ce5a6c103edc5e48a8384 100644 (file)
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -30,7 +30,7 @@
 
 #include "qemu-common.h"
 #include "ui/console.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "x_keymap.h"
 #include "sdl_zoom.h"
 

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 8727bf49ca95053fe06ea2922fd2a4e0d900c70d..5fe3e0e4cfafb3e1f1e4670f9a10723bfe916b5e 100644 (file)
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -19,7 +19,7 @@
 #include <spice-experimental.h>
 
 #include <netdb.h>
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 
 #include "qemu-common.h"
 #include "ui/qemu-spice.h"

diff --git a/ui/spice-display.c b/ui/spice-display.c
index a19b3d95fb018a5309ec52b3f77c5e8f6fced1bd..dc7e58d0eddd0ca69d086917ce01d88821273cce 100644 (file)
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -21,7 +21,7 @@
 #include "qemu/queue.h"
 #include "monitor/monitor.h"
 #include "ui/console.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "trace.h"
 
 #include "ui/spice-display.h"

diff --git a/ui/vnc.c b/ui/vnc.c
index d9e5315e79a85158a69e7bcc8d86e1033452c731..8912b789455cc12ce58113c0076d040b36b73269 100644 (file)
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -26,7 +26,7 @@
 
 #include "vnc.h"
 #include "vnc-jobs.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "qemu/sockets.h"
 #include "qemu/timer.h"
 #include "qemu/acl.h"

diff --git a/vl.c b/vl.c
index 9b80e7abc444b58689501cfeea7f5cf32937684a..75a30a17201af9d8dad74195279a191de1dc1081 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -65,7 +65,7 @@
 #endif
 
 #ifdef CONFIG_SECCOMP
-#include "qemu-seccomp.h"
+#include "sysemu/seccomp.h"
 #endif
 
 #ifdef __sun__
@@ -131,18 +131,18 @@ int main(int argc, char **argv)
 #include "net/slirp.h"
 #include "monitor/monitor.h"
 #include "ui/console.h"
-#include "sysemu.h"
+#include "sysemu/sysemu.h"
 #include "exec/gdbstub.h"
 #include "qemu/timer.h"
 #include "qemu-char.h"
 #include "qemu/cache-utils.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "hw/block-common.h"
 #include "migration/block.h"
-#include "dma.h"
+#include "sysemu/dma.h"
 #include "audio/audio.h"
 #include "migration/migration.h"
-#include "kvm.h"
+#include "sysemu/kvm.h"
 #include "qapi/qmp/qjson.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
@@ -152,7 +152,7 @@ int main(int argc, char **argv)
 #ifdef CONFIG_VIRTFS
 #include "fsdev/qemu-fsdev.h"
 #endif
-#include "qtest.h"
+#include "sysemu/qtest.h"
 
 #include "disas/disas.h"
 
@@ -163,8 +163,8 @@ int main(int argc, char **argv)
 #include "trace.h"
 #include "trace/control.h"
 #include "qemu/queue.h"
-#include "cpus.h"
-#include "arch_init.h"
+#include "sysemu/cpus.h"
+#include "sysemu/arch_init.h"
 #include "qemu/osdep.h"
 
 #include "ui/qemu-spice.h"

diff --git a/xen-all.c b/xen-all.c
index 6965626db8053d9c3de5f31940b4551f01c1b143..b659321184bef821c4b04c005b3907eb35949ea6 100644 (file)
--- a/xen-all.c
+++ b/xen-all.c
@@ -17,7 +17,7 @@
 #include "qmp-commands.h"
 
 #include "qemu/range.h"
-#include "xen-mapcache.h"
+#include "sysemu/xen-mapcache.h"
 #include "trace.h"
 #include "exec/address-spaces.h"
 

diff --git a/xen-mapcache.c b/xen-mapcache.c
index 8f4648cc32aabb7f19960dc4b11e2db7729fbe85..dc6d1fadb751c2fd8d2496ba3b5fd0e162793d4e 100644 (file)
--- a/xen-mapcache.c
+++ b/xen-mapcache.c
@@ -13,13 +13,13 @@
 #include <sys/resource.h>
 
 #include "hw/xen_backend.h"
-#include "blockdev.h"
+#include "sysemu/blockdev.h"
 #include "qemu/bitmap.h"
 
 #include <xen/hvm/params.h>
 #include <sys/mman.h>
 
-#include "xen-mapcache.h"
+#include "sysemu/xen-mapcache.h"
 #include "trace.h"