Move migration.h to include/migration/
+ qemu_file.h -> include/migration/qemu-file.h
+ thunk.h -> include/exec/user/
Change-Id: I6fc339ac0fe9d366db1ed095dff08f5619ebc3d5
diff --git a/arch_init.c b/arch_init.c
index eaeb15f..48ab692 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -37,7 +37,7 @@
#include "hw/pci.h"
#include "hw/audiodev.h"
#include "kvm.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "net/net.h"
#include "exec/gdbstub.h"
#include "hw/smbios.h"
diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index 746dd9d..7ed0db7 100644
--- a/audio/wavaudio.c
+++ b/audio/wavaudio.c
@@ -28,7 +28,7 @@
#define AUDIO_CAP "wav"
#include "audio_int.h"
-#include "qemu_file.h"
+#include "migration/qemu-file.h"
#define WAV_AUDIO_IN 1
diff --git a/hw/goldfish_audio.c b/hw/goldfish_audio.c
index ec0bbe0..2219d70 100644
--- a/hw/goldfish_audio.c
+++ b/hw/goldfish_audio.c
@@ -9,7 +9,7 @@
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
*/
-#include "qemu_file.h"
+#include "migration/qemu-file.h"
#include "goldfish_device.h"
#include "audio/audio.h"
#include "qemu_debug.h"
diff --git a/hw/goldfish_battery.c b/hw/goldfish_battery.c
index c4988d7..40c89d0 100644
--- a/hw/goldfish_battery.c
+++ b/hw/goldfish_battery.c
@@ -9,7 +9,7 @@
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
*/
-#include "qemu_file.h"
+#include "migration/qemu-file.h"
#include "goldfish_device.h"
#include "power_supply.h"
diff --git a/hw/goldfish_device.c b/hw/goldfish_device.c
index 8c9469e..164e09f 100644
--- a/hw/goldfish_device.c
+++ b/hw/goldfish_device.c
@@ -9,7 +9,7 @@
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
*/
-#include "qemu_file.h"
+#include "migration/qemu-file.h"
#include "arm_pic.h"
#include "goldfish_device.h"
#include "goldfish_vmem.h"
diff --git a/hw/goldfish_events_device.c b/hw/goldfish_events_device.c
index 9dcfa01..6c2aa34 100644
--- a/hw/goldfish_events_device.c
+++ b/hw/goldfish_events_device.c
@@ -9,7 +9,7 @@
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
*/
-#include "qemu_file.h"
+#include "migration/qemu-file.h"
#include "android/hw-events.h"
#include "android/charmap.h"
#include "android/globals.h" /* for android_hw */
diff --git a/hw/goldfish_fb.c b/hw/goldfish_fb.c
index 53a1428..070ae53 100644
--- a/hw/goldfish_fb.c
+++ b/hw/goldfish_fb.c
@@ -9,7 +9,7 @@
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
*/
-#include "qemu_file.h"
+#include "migration/qemu-file.h"
#include "android/android.h"
#include "android/utils/debug.h"
#include "android/utils/duff.h"
diff --git a/hw/goldfish_interrupt.c b/hw/goldfish_interrupt.c
index f4c5a89..116a28c 100644
--- a/hw/goldfish_interrupt.c
+++ b/hw/goldfish_interrupt.c
@@ -9,7 +9,7 @@
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
*/
-#include "qemu_file.h"
+#include "migration/qemu-file.h"
#include "arm_pic.h"
#include "goldfish_device.h"
#include "irq.h"
diff --git a/hw/goldfish_memlog.c b/hw/goldfish_memlog.c
index 6024f38..a00d3ee 100644
--- a/hw/goldfish_memlog.c
+++ b/hw/goldfish_memlog.c
@@ -13,7 +13,7 @@
#include <fcntl.h>
#include <string.h>
-#include "qemu_file.h"
+#include "migration/qemu-file.h"
#include "goldfish_device.h"
#include "audio/audio.h"
diff --git a/hw/goldfish_mmc.c b/hw/goldfish_mmc.c
index 3157bb3..cd5e054 100644
--- a/hw/goldfish_mmc.c
+++ b/hw/goldfish_mmc.c
@@ -9,7 +9,7 @@
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
*/
-#include "qemu_file.h"
+#include "migration/qemu-file.h"
#include "goldfish_device.h"
#include "mmc.h"
#include "sd.h"
diff --git a/hw/goldfish_nand.c b/hw/goldfish_nand.c
index 68cb872..d1b2131 100644
--- a/hw/goldfish_nand.c
+++ b/hw/goldfish_nand.c
@@ -9,7 +9,7 @@
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
*/
-#include "qemu_file.h"
+#include "migration/qemu-file.h"
#include "goldfish_nand_reg.h"
#include "goldfish_nand.h"
#include "goldfish_vmem.h"
diff --git a/hw/goldfish_switch.c b/hw/goldfish_switch.c
index a244cbc..eb6a713 100644
--- a/hw/goldfish_switch.c
+++ b/hw/goldfish_switch.c
@@ -9,7 +9,7 @@
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
*/
-#include "qemu_file.h"
+#include "migration/qemu-file.h"
#include "goldfish_device.h"
#include "goldfish_vmem.h"
diff --git a/hw/goldfish_trace.c b/hw/goldfish_trace.c
index 667faa0..bbec723 100644
--- a/hw/goldfish_trace.c
+++ b/hw/goldfish_trace.c
@@ -13,7 +13,7 @@
* Virtual hardware for bridging the FUSE kernel module
* in the emulated OS and outside file system
*/
-#include "qemu_file.h"
+#include "migration/qemu-file.h"
#include "goldfish_trace.h"
#include "goldfish_vmem.h"
#include "sysemu.h"
diff --git a/hw/goldfish_tty.c b/hw/goldfish_tty.c
index d989900..2a2b2a4 100644
--- a/hw/goldfish_tty.c
+++ b/hw/goldfish_tty.c
@@ -9,7 +9,7 @@
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
*/
-#include "qemu_file.h"
+#include "migration/qemu-file.h"
#include "qemu-char.h"
#include "goldfish_device.h"
#include "goldfish_vmem.h"
diff --git a/thunk.h b/include/exec/user/thunk.h
similarity index 100%
rename from thunk.h
rename to include/exec/user/thunk.h
diff --git a/migration.h b/include/migration/migration.h
similarity index 100%
rename from migration.h
rename to include/migration/migration.h
diff --git a/qemu_file.h b/include/migration/qemu-file.h
similarity index 100%
rename from qemu_file.h
rename to include/migration/qemu-file.h
diff --git a/memcheck/memcheck.c b/memcheck/memcheck.c
index 3ccb196b..d853b50 100644
--- a/memcheck/memcheck.c
+++ b/memcheck/memcheck.c
@@ -15,7 +15,7 @@
*/
#include "qemu-queue.h"
-#include "qemu_file.h"
+#include "migration/qemu-file.h"
#include "elff_api.h"
#include "memcheck.h"
#include "memcheck_proc_management.h"
diff --git a/migration-dummy-android.c b/migration-dummy-android.c
index dce8b81..aaa5e75 100755
--- a/migration-dummy-android.c
+++ b/migration-dummy-android.c
@@ -12,7 +12,7 @@
*/
#include "qemu-common.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "monitor/monitor.h"
#include "buffered_file.h"
#include "sysemu.h"
diff --git a/migration-exec.c b/migration-exec.c
index ab1dea2..895f862 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -15,7 +15,7 @@
#include "qemu-common.h"
#include "qemu_socket.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "qemu-char.h"
#include "sysemu.h"
#include "buffered_file.h"
diff --git a/migration-tcp-android.c b/migration-tcp-android.c
index 8287e69..bafa175 100644
--- a/migration-tcp-android.c
+++ b/migration-tcp-android.c
@@ -13,7 +13,7 @@
#include "qemu-common.h"
#include "qemu_socket.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "qemu-char.h"
#include "sysemu.h"
#include "buffered_file.h"
diff --git a/migration-tcp.c b/migration-tcp.c
index 1f4358e..95b5117 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -13,7 +13,7 @@
#include "qemu-common.h"
#include "qemu_socket.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "qemu-char.h"
#include "sysemu.h"
#include "buffered_file.h"
diff --git a/migration.c b/migration.c
index 271a277..8a1f2b6 100644
--- a/migration.c
+++ b/migration.c
@@ -12,7 +12,7 @@
*/
#include "qemu-common.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "monitor/monitor.h"
#include "buffered_file.h"
#include "sysemu.h"
diff --git a/monitor.c b/monitor.c
index dae1e5b..86e013d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -41,7 +41,7 @@
#include "disas/disas.h"
#include "balloon.h"
#include "qemu/timer.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "kvm.h"
#include "qemu/acl.h"
#include "exec/exec-all.h"
diff --git a/qemu_timers.h b/qemu_timers.h
index 6269dc8..9940e0f 100644
--- a/qemu_timers.h
+++ b/qemu_timers.h
@@ -1,7 +1,7 @@
#ifndef _QEMU_TIMERS_H
#define _QEMU_TIMERS_H
-#include "qemu_file.h"
+#include "migration/qemu-file.h"
#include "qemu/timer.h"
#endif /* _QEMU_TIMERS_H */
diff --git a/savevm.c b/savevm.c
index ad676df..fea41f2 100644
--- a/savevm.c
+++ b/savevm.c
@@ -80,10 +80,10 @@
#include "blockdev.h"
#include "block.h"
#include "audio/audio.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "qemu_socket.h"
#include "qemu-queue.h"
-#include "qemu_file.h"
+#include "migration/qemu-file.h"
#include "android/snapshot.h"
diff --git a/thunk.c b/thunk.c
index 0657188..579d1e8 100644
--- a/thunk.c
+++ b/thunk.c
@@ -21,7 +21,7 @@
#include <stdarg.h>
#include "qemu.h"
-#include "thunk.h"
+#include "exec/user/thunk.h"
//#define DEBUG
diff --git a/vl-android.c b/vl-android.c
index e0a97d6..ec0abfb 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -46,7 +46,7 @@
#include "blockdev.h"
#include "audio/audio.h"
-#include "qemu_file.h"
+#include "migration/qemu-file.h"
#include "android/android.h"
#include "charpipe.h"
#include "modem_driver.h"
@@ -198,7 +198,7 @@
#include "block.h"
#include "dma.h"
#include "audio/audio.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "kvm.h"
#include "hax.h"
#ifdef CONFIG_KVM
diff --git a/vl.c b/vl.c
index ceb0d3e..b355509 100644
--- a/vl.c
+++ b/vl.c
@@ -156,7 +156,7 @@
#include "block.h"
#include "dma.h"
#include "audio/audio.h"
-#include "migration.h"
+#include "migration/migration.h"
#include "kvm.h"
#include "balloon.h"
#include "qemu-option.h"
