hw/goldfish_*.h -> include/hw/android/goldfish/*.h
Change-Id: If7f9a46496fad5d936800215b21794bbab185b8a
diff --git a/android/console.c b/android/console.c
index a66b788..e30e724 100644
--- a/android/console.c
+++ b/android/console.c
@@ -26,7 +26,7 @@
#include "sysemu/sysemu.h"
#include "android/android.h"
#include "cpu.h"
-#include "hw/goldfish_device.h"
+#include "hw/android/goldfish/device.h"
#include "hw/power_supply.h"
#include "android/shaper.h"
#include "modem_driver.h"
diff --git a/android/hw-pipe-net.c b/android/hw-pipe-net.c
index f1c1411..c9db019 100644
--- a/android/hw-pipe-net.c
+++ b/android/hw-pipe-net.c
@@ -25,7 +25,7 @@
#include "android/async-utils.h"
#include "android/opengles.h"
#include "android/looper.h"
-#include "hw/goldfish_pipe.h"
+#include "hw/android/goldfish/pipe.h"
/* Implement the OpenGL fast-pipe */
diff --git a/android/hw-qemud.c b/android/hw-qemud.c
index ae38aca..df2d5ac 100644
--- a/android/hw-qemud.c
+++ b/android/hw-qemud.c
@@ -16,7 +16,7 @@
#include "android/utils/bufprint.h"
#include "android/looper.h"
#include "hw/hw.h"
-#include "hw/goldfish_pipe.h"
+#include "hw/android/goldfish/pipe.h"
#include "sysemu/char.h"
#include "android/charpipe.h"
#include "android/cbuffer.h"
diff --git a/hw/android_arm.c b/hw/android_arm.c
index ac39626..cfe8295 100644
--- a/hw/android_arm.c
+++ b/hw/android_arm.c
@@ -15,13 +15,13 @@
#include "net/net.h"
#include "hw/arm/pic.h"
#include "sysemu/sysemu.h"
-#include "goldfish_device.h"
+#include "hw/android/goldfish/device.h"
#include "android/globals.h"
#include "audio/audio.h"
#include "hw/arm/arm.h"
#include "ui/console.h"
#include "sysemu/blockdev.h"
-#include "goldfish_pipe.h"
+#include "hw/android/goldfish/pipe.h"
#ifdef CONFIG_MEMCHECK
#include "memcheck/memcheck_api.h"
#endif // CONFIG_MEMCHECK
diff --git a/hw/android_mips.c b/hw/android_mips.c
index fee4ec9..c3326d8 100644
--- a/hw/android_mips.c
+++ b/hw/android_mips.c
@@ -15,7 +15,7 @@
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "mips.h"
-#include "goldfish_device.h"
+#include "hw/android/goldfish/device.h"
#include "android/globals.h"
#include "audio/audio.h"
#include "sysemu/blockdev.h"
diff --git a/hw/goldfish_audio.c b/hw/goldfish_audio.c
index c713aee..8b868c4 100644
--- a/hw/goldfish_audio.c
+++ b/hw/goldfish_audio.c
@@ -10,7 +10,7 @@
** GNU General Public License for more details.
*/
#include "migration/qemu-file.h"
-#include "goldfish_device.h"
+#include "hw/android/goldfish/device.h"
#include "audio/audio.h"
#include "android/qemu-debug.h"
#include "android/globals.h"
diff --git a/hw/goldfish_battery.c b/hw/goldfish_battery.c
index 40c89d0..52e6a0c 100644
--- a/hw/goldfish_battery.c
+++ b/hw/goldfish_battery.c
@@ -10,7 +10,7 @@
** GNU General Public License for more details.
*/
#include "migration/qemu-file.h"
-#include "goldfish_device.h"
+#include "hw/android/goldfish/device.h"
#include "power_supply.h"
diff --git a/hw/goldfish_device.c b/hw/goldfish_device.c
index 1df4187..84c4262 100644
--- a/hw/goldfish_device.c
+++ b/hw/goldfish_device.c
@@ -11,8 +11,8 @@
*/
#include "migration/qemu-file.h"
#include "hw/arm/pic.h"
-#include "goldfish_device.h"
-#include "goldfish_vmem.h"
+#include "hw/android/goldfish/device.h"
+#include "hw/android/goldfish/vmem.h"
#include "android/utils/debug.h"
#define PDEV_BUS_OP_DONE (0x00)
diff --git a/hw/goldfish_fb.c b/hw/goldfish_fb.c
index 070ae53..ee817fd 100644
--- a/hw/goldfish_fb.c
+++ b/hw/goldfish_fb.c
@@ -13,7 +13,7 @@
#include "android/android.h"
#include "android/utils/debug.h"
#include "android/utils/duff.h"
-#include "goldfish_device.h"
+#include "hw/android/goldfish/device.h"
#include "ui/console.h"
/* These values *must* match the platform definitions found under
diff --git a/hw/goldfish_interrupt.c b/hw/goldfish_interrupt.c
index 55cc0de..725830a 100644
--- a/hw/goldfish_interrupt.c
+++ b/hw/goldfish_interrupt.c
@@ -11,7 +11,7 @@
*/
#include "migration/qemu-file.h"
#include "hw/arm/pic.h"
-#include "goldfish_device.h"
+#include "hw/android/goldfish/device.h"
#include "hw/irq.h"
enum {
diff --git a/hw/goldfish_memlog.c b/hw/goldfish_memlog.c
index a00d3ee..d93e5ad 100644
--- a/hw/goldfish_memlog.c
+++ b/hw/goldfish_memlog.c
@@ -14,7 +14,7 @@
#include <string.h>
#include "migration/qemu-file.h"
-#include "goldfish_device.h"
+#include "hw/android/goldfish/device.h"
#include "audio/audio.h"
extern void dprint(const char* fmt, ...);
diff --git a/hw/goldfish_mmc.c b/hw/goldfish_mmc.c
index f4de0f1..3c35895 100644
--- a/hw/goldfish_mmc.c
+++ b/hw/goldfish_mmc.c
@@ -10,7 +10,7 @@
** GNU General Public License for more details.
*/
#include "migration/qemu-file.h"
-#include "goldfish_device.h"
+#include "hw/android/goldfish/device.h"
#include "mmc.h"
#include "sd.h"
#include "block/block.h"
diff --git a/hw/goldfish_nand.c b/hw/goldfish_nand.c
index 13b4bec..fc4edcb 100644
--- a/hw/goldfish_nand.c
+++ b/hw/goldfish_nand.c
@@ -12,7 +12,7 @@
#include "migration/qemu-file.h"
#include "goldfish_nand_reg.h"
#include "goldfish_nand.h"
-#include "goldfish_vmem.h"
+#include "hw/android/goldfish/vmem.h"
#include "android/utils/tempfile.h"
#include "android/qemu-debug.h"
#include "android/android.h"
diff --git a/hw/goldfish_pipe.c b/hw/goldfish_pipe.c
index daa5118..e6d9288 100644
--- a/hw/goldfish_pipe.c
+++ b/hw/goldfish_pipe.c
@@ -11,9 +11,9 @@
*/
#include "android/utils/panic.h"
#include "android/utils/system.h"
-#include "hw/goldfish_pipe.h"
-#include "hw/goldfish_device.h"
-#include "hw/goldfish_vmem.h"
+#include "hw/android/goldfish/pipe.h"
+#include "hw/android/goldfish/device.h"
+#include "hw/android/goldfish/vmem.h"
#include "qemu/timer.h"
#define DEBUG 0
diff --git a/hw/goldfish_switch.c b/hw/goldfish_switch.c
index eb6a713..e3e1c52 100644
--- a/hw/goldfish_switch.c
+++ b/hw/goldfish_switch.c
@@ -10,8 +10,8 @@
** GNU General Public License for more details.
*/
#include "migration/qemu-file.h"
-#include "goldfish_device.h"
-#include "goldfish_vmem.h"
+#include "hw/android/goldfish/device.h"
+#include "hw/android/goldfish/vmem.h"
enum {
SW_NAME_LEN = 0x00,
diff --git a/hw/goldfish_timer.c b/hw/goldfish_timer.c
index 9656063..8ebdd89 100644
--- a/hw/goldfish_timer.c
+++ b/hw/goldfish_timer.c
@@ -13,7 +13,7 @@
#include "qemu/timer.h"
#include "cpu.h"
#include "hw/arm/pic.h"
-#include "goldfish_device.h"
+#include "hw/android/goldfish/device.h"
#include "hw/hw.h"
enum {
diff --git a/hw/goldfish_trace.c b/hw/goldfish_trace.c
index 15b6aa9..681bce7 100644
--- a/hw/goldfish_trace.c
+++ b/hw/goldfish_trace.c
@@ -14,8 +14,8 @@
* in the emulated OS and outside file system
*/
#include "migration/qemu-file.h"
-#include "goldfish_trace.h"
-#include "goldfish_vmem.h"
+#include "hw/android/goldfish/trace.h"
+#include "hw/android/goldfish/vmem.h"
#include "sysemu/sysemu.h"
#include "android/trace.h"
#ifdef CONFIG_MEMCHECK
diff --git a/hw/goldfish_tty.c b/hw/goldfish_tty.c
index 6b62c77..cd9ef1a 100644
--- a/hw/goldfish_tty.c
+++ b/hw/goldfish_tty.c
@@ -11,8 +11,8 @@
*/
#include "migration/qemu-file.h"
#include "sysemu/char.h"
-#include "goldfish_device.h"
-#include "goldfish_vmem.h"
+#include "hw/android/goldfish/device.h"
+#include "hw/android/goldfish/vmem.h"
enum {
TTY_PUT_CHAR = 0x00,
diff --git a/hw/goldfish_vmem.c b/hw/goldfish_vmem.c
index 4a7134e..a78290f 100644
--- a/hw/goldfish_vmem.c
+++ b/hw/goldfish_vmem.c
@@ -10,7 +10,7 @@
** GNU General Public License for more details.
*/
#include "hw/hw.h"
-#include "goldfish_vmem.h"
+#include "hw/android/goldfish/vmem.h"
#ifdef TARGET_I386
#include "sysemu/kvm.h"
#endif
diff --git a/hw/i8259.c b/hw/i8259.c
index 67703a2..321b66a 100644
--- a/hw/i8259.c
+++ b/hw/i8259.c
@@ -25,7 +25,7 @@
#include "hw/i386/pc.h"
#include "hw/isa/isa.h"
#include "monitor/monitor.h"
-#include "goldfish_device.h"
+#include "hw/android/goldfish/device.h"
/* debug PIC */
//#define DEBUG_PIC
diff --git a/hw/pc.c b/hw/pc.c
index 1245cec..6e85d13 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -40,8 +40,8 @@
#include "smbios.h"
#include "ui/console.h"
-#include "goldfish_device.h"
-#include "goldfish_pipe.h"
+#include "hw/android/goldfish/device.h"
+#include "hw/android/goldfish/pipe.h"
char* audio_input_source = NULL;
/* output Bochs bios info messages */
diff --git a/hw/goldfish_device.h b/include/hw/android/goldfish/device.h
similarity index 100%
rename from hw/goldfish_device.h
rename to include/hw/android/goldfish/device.h
diff --git a/hw/goldfish_pipe.h b/include/hw/android/goldfish/pipe.h
similarity index 100%
rename from hw/goldfish_pipe.h
rename to include/hw/android/goldfish/pipe.h
diff --git a/hw/goldfish_trace.h b/include/hw/android/goldfish/trace.h
similarity index 98%
rename from hw/goldfish_trace.h
rename to include/hw/android/goldfish/trace.h
index 61d3f4f..3e92f3e 100644
--- a/hw/goldfish_trace.h
+++ b/include/hw/android/goldfish/trace.h
@@ -12,7 +12,7 @@
#ifndef _TRACE_DEV_H_
#define _TRACE_DEV_H_
-#include "goldfish_device.h"
+#include "hw/android/goldfish/device.h"
#define CLIENT_PAGE_SIZE 4096
diff --git a/hw/goldfish_vmem.h b/include/hw/android/goldfish/vmem.h
similarity index 100%
rename from hw/goldfish_vmem.h
rename to include/hw/android/goldfish/vmem.h