Move monitor.h to include/monitor/

digit-android · digit-android · commit 6af6765e2f3b · 2014-01-08T07:32:48.000+01:00
+ monitor-android.h -&gt; include/android/monitor.h

Change-Id: Iad8afa71461dd70c6997902516fbf4ef7cb8babe
diff --git a/android/console.c b/android/console.c
@@ -38,7 +38,7 @@
 #include "android/config/config.h"
 #include "tcpdump.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/arch_init.c b/arch_init.c
@@ -29,7 +29,7 @@
 #include <sys/mman.h>
 #endif
 #include "config.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "arch_init.h"
 #include "audio/audio.h"
diff --git a/audio/audio.c b/audio/audio.c
@@ -24,7 +24,7 @@
  */
 #include "hw/hw.h"
 #include "audio.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qemu/timer.h"
 #include "sysemu.h"
 
diff --git a/audio/wavcapture.c b/audio/wavcapture.c
@@ -1,5 +1,5 @@
 #include "hw/hw.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "audio.h"
 
 typedef struct {
diff --git a/block.c b/block.c
@@ -23,7 +23,7 @@
  */
 #include "config-host.h"
 #include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "block_int.h"
 #include "qemu/module.h"
 #include "qemu-objects.h"
diff --git a/blockdev.c b/blockdev.c
@@ -9,7 +9,7 @@
 
 #include "block.h"
 #include "blockdev.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu-option.h"
 #include "qemu/config-file.h"
diff --git a/cpus.c b/cpus.c
@@ -23,7 +23,7 @@
  */
 #include "config-host.h"
 
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "exec/gdbstub.h"
 #include "dma.h"
diff --git a/disas.c b/disas.c
@@ -335,7 +335,7 @@ const char *lookup_symbol(target_ulong orig_addr)
 
 #if !defined(CONFIG_USER_ONLY)
 
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 static int monitor_disas_is_physical;
 static CPUState *monitor_disas_env;
diff --git a/gdbstub.c b/gdbstub.c
@@ -29,7 +29,7 @@
 
 #include "qemu.h"
 #else
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qemu-char.h"
 #include "sysemu.h"
 #include "exec/gdbstub.h"
diff --git a/hw/i8259.c b/hw/i8259.c
@@ -24,7 +24,7 @@
 #include "hw.h"
 #include "pc.h"
 #include "isa.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "goldfish_device.h"
 
 /* debug PIC */
diff --git a/hw/pc.c b/hw/pc.c
@@ -33,7 +33,7 @@
 //#include "smbus.h"
 #include "boards.h"
 #include "android/globals.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "fw_cfg.h"
 //#include "hpet_emul.h"
 #include "watchdog.h"
diff --git a/hw/pci.c b/hw/pci.c
@@ -23,7 +23,7 @@
  */
 #include "hw.h"
 #include "pci.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "net/net.h"
 #include "sysemu.h"
 
diff --git a/hw/qdev.c b/hw/qdev.c
@@ -29,7 +29,7 @@
 #include "net/net.h"
 #include "qdev.h"
 #include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "blockdev.h"
 
 struct DeviceProperty {
diff --git a/hw/sysbus.c b/hw/sysbus.c
@@ -20,7 +20,7 @@
 
 #include "sysbus.h"
 #include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 void sysbus_connect_irq(SysBusDevice *dev, int n, qemu_irq irq)
 {
diff --git a/include/android/monitor.h b/include/android/monitor.h
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
diff --git a/input.c b/input.c
@@ -24,7 +24,7 @@
 
 #include "sysemu.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "ui/console.h"
 #include "qapi/qmp/qjson.h"
 
diff --git a/migration-dummy-android.c b/migration-dummy-android.c
@@ -13,7 +13,7 @@
 
 #include "qemu-common.h"
 #include "migration.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "buffered_file.h"
 #include "sysemu.h"
 #include "block.h"
diff --git a/migration.c b/migration.c
@@ -13,7 +13,7 @@
 
 #include "qemu-common.h"
 #include "migration.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "buffered_file.h"
 #include "sysemu.h"
 #include "block.h"
diff --git a/monitor.c b/monitor.c
@@ -33,7 +33,7 @@
 #include "net/net.h"
 #include "qemu-char.h"
 #include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "readline.h"
 #include "ui/console.h"
 #include "blockdev.h"
@@ -96,7 +96,7 @@ struct Monitor {
 };
 
 #ifdef CONFIG_ANDROID
-#include "monitor-android.h"
+#include "android/monitor.h"
 #endif
 
 static QLIST_HEAD(mon_list, Monitor) mon_list;
diff --git a/net/net-android.c b/net/net-android.c
@@ -114,7 +114,7 @@
 
 #include "qemu-common.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "qemu/timer.h"
 #include "qemu-char.h"
diff --git a/net/net.c b/net/net.c
@@ -112,7 +112,7 @@
 
 #include "qemu-common.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "qemu/timer.h"
 #include "qemu-char.h"
diff --git a/qemu-char.c b/qemu-char.c
@@ -24,7 +24,7 @@
 #include "qemu-common.h"
 #include "android/sockets.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "ui/console.h"
 #include "sysemu.h"
 #include "qemu/timer.h"
diff --git a/qemu-timer.c b/qemu-timer.c
@@ -24,7 +24,7 @@
 
 #include "sysemu.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "ui/console.h"
 
 #include "hw/hw.h"
diff --git a/qobject/qerror.c b/qobject/qerror.c
@@ -10,7 +10,7 @@
  * See the COPYING.LIB file in the top-level directory.
  */
 
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu-common.h"
diff --git a/readline.c b/readline.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "readline.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 #define IS_NORM 0
 #define IS_ESC  1
diff --git a/savevm.c b/savevm.c
@@ -73,7 +73,7 @@
 #include "qemu-common.h"
 #include "hw/hw.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "qemu/timer.h"
 #include "qemu-char.h"
diff --git a/slirp-android/misc.c b/slirp-android/misc.c
@@ -513,7 +513,7 @@ relay(s)
 #endif
 
 #ifdef CONFIG_QEMU
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 void lprint(const char *format, ...)
 {
diff --git a/slirp/misc.c b/slirp/misc.c
@@ -549,7 +549,7 @@ relay(s)
 #endif
 
 #ifdef CONFIG_QEMU
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 void lprint(const char *format, ...)
 {
diff --git a/ui/vnc.h b/ui/vnc.h
@@ -29,7 +29,7 @@
 
 #include "qemu-common.h"
 #include "ui/console.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "audio/audio.h"
 #include <zlib.h>
 
diff --git a/usb-dummy-android.c b/usb-dummy-android.c
@@ -24,7 +24,7 @@
 
 #include "qemu-common.h"
 #include "qemu/timer.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "hw/usb.h"
 
 USBDevice *usb_host_device_open(const char *devname)
diff --git a/usb-linux.c b/usb-linux.c
@@ -32,7 +32,7 @@
 
 #include "qemu-common.h"
 #include "qemu/timer.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 #include <dirent.h>
 #include <sys/ioctl.h>
diff --git a/util/qemu-error.c b/util/qemu-error.c
@@ -11,7 +11,7 @@
  */
 
 #include <stdio.h>
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 /*
  * Print to current monitor if we have one, else to stderr.
diff --git a/vl-android.c b/vl-android.c
@@ -188,7 +188,7 @@ int qemu_main(int argc, char **argv, char **envp);
 #include "hw/xen.h"
 #include "bt-host.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "ui/console.h"
 #include "sysemu.h"
 #include "exec/gdbstub.h"
diff --git a/vl.c b/vl.c
@@ -146,7 +146,7 @@ int qemu_main(int argc, char **argv, char **envp);
 #include "hw/xen.h"
 #include "bt-host.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "ui/console.h"
 #include "sysemu.h"
 #include "exec/gdbstub.h"

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`#include "sysbus.h"`
`22`	`22`	`#include "sysemu.h"`
`23`		`-#include "monitor.h"`
	`23`	`+#include "monitor/monitor.h"`
`24`	`24`
`25`	`25`	`void sysbus_connect_irq(SysBusDevice *dev, int n, qemu_irq irq)`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,7 @@ relay(s)`
`513`	`513`	`#endif`
`514`	`514`
`515`	`515`	`#ifdef CONFIG_QEMU`
`516`		`-#include "monitor.h"`
	`516`	`+#include "monitor/monitor.h"`
`517`	`517`
`518`	`518`	`void lprint(const char *format, ...)`
`519`	`519`	`{`
Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,7 @@ relay(s)`
`549`	`549`	`#endif`
`550`	`550`
`551`	`551`	`#ifdef CONFIG_QEMU`
`552`		`-#include "monitor.h"`
	`552`	`+#include "monitor/monitor.h"`
`553`	`553`
`554`	`554`	`void lprint(const char *format, ...)`
`555`	`555`	`{`