hmp: Move hmp.h to include/monitor/

Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190619201050.19040-4-armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

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

diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index c283dde0e9638f417605e9a68214d4def477ca6b..5082fcd016829d84d7a3dbe85baad1b060ed1b61 100644 (file)
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -14,7 +14,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hmp.h"
+#include "monitor/hmp.h"
 #include "net/net.h"
 #include "net/eth.h"
 #include "chardev/char.h"

diff --git a/monitor/misc.c b/monitor/misc.c
index bf9faceb865b2644982e10c829ae6b403491f3e8..2fb6896e8462404a25e02bbf660e1e90b128596f 100644 (file)
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -56,13 +56,13 @@
 #include "qom/object_interfaces.h"
 #include "trace/control.h"
 #include "monitor/hmp-target.h"
+#include "monitor/hmp.h"
 #ifdef CONFIG_TRACE_SIMPLE
 #include "trace/simple.h"
 #endif
 #include "exec/memory.h"
 #include "exec/exec-all.h"
 #include "qemu/option.h"
-#include "hmp.h"
 #include "qemu/thread.h"
 #include "block/qapi.h"
 #include "qapi/qapi-commands.h"

diff --git a/target/i386/monitor.c b/target/i386/monitor.c
index 56e2dbece7e4e850bdc4ac9d0cd3f0b05367b0a2..1f3b532fc221ea596a2d396ad00a72baf39b7fa1 100644 (file)
--- a/target/i386/monitor.c
+++ b/target/i386/monitor.c
@@ -26,11 +26,11 @@
 #include "cpu.h"
 #include "monitor/monitor.h"
 #include "monitor/hmp-target.h"
+#include "monitor/hmp.h"
 #include "qapi/qmp/qdict.h"
 #include "hw/i386/pc.h"
 #include "sysemu/kvm.h"
 #include "sysemu/sev.h"
-#include "hmp.h"
 #include "qapi/error.h"
 #include "sev_i386.h"
 #include "qapi/qapi-commands-misc.h"

diff --git a/target/nios2/monitor.c b/target/nios2/monitor.c
index d5e3393716e4322354d1bbd4ee5de75777e54e8b..6646836df58c032cf8852e6050d7b98e88c61d04 100644 (file)
--- a/target/nios2/monitor.c
+++ b/target/nios2/monitor.c
@@ -25,7 +25,7 @@
 #include "cpu.h"
 #include "monitor/monitor.h"
 #include "monitor/hmp-target.h"
-#include "hmp.h"
+#include "monitor/hmp.h"
 
 void hmp_info_tlb(Monitor *mon, const QDict *qdict)
 {

diff --git a/target/ppc/monitor.c b/target/ppc/monitor.c
index 7f8360d903bad3091269e3722853ba56c1eb08d5..a5a177d717e6fa1232822fdf51a49cb6b9d78fe5 100644 (file)
--- a/target/ppc/monitor.c
+++ b/target/ppc/monitor.c
@@ -27,7 +27,7 @@
 #include "monitor/monitor.h"
 #include "qemu/ctype.h"
 #include "monitor/hmp-target.h"
-#include "hmp.h"
+#include "monitor/hmp.h"
 
 static target_long monitor_get_ccr(const struct MonitorDef *md, int val)
 {

diff --git a/target/sh4/monitor.c b/target/sh4/monitor.c
index 4c7f36c9cca3a8931693364d17ac65ba781a8007..918a5ccfc6ee07ebc76102fbd661e961eb338a35 100644 (file)
--- a/target/sh4/monitor.c
+++ b/target/sh4/monitor.c
@@ -25,7 +25,7 @@
 #include "cpu.h"
 #include "monitor/monitor.h"
 #include "monitor/hmp-target.h"
-#include "hmp.h"
+#include "monitor/hmp.h"
 
 static void print_tlb(Monitor *mon, int idx, tlb_t *tlb)
 {

diff --git a/target/sparc/monitor.c b/target/sparc/monitor.c
index 3ec3b51a3db72f407ce3b4704bf28dada2d27540..a7ea287cbccc4827f1acc6c041299ae6938029fb 100644 (file)
--- a/target/sparc/monitor.c
+++ b/target/sparc/monitor.c
@@ -25,7 +25,7 @@
 #include "cpu.h"
 #include "monitor/monitor.h"
 #include "monitor/hmp-target.h"
-#include "hmp.h"
+#include "monitor/hmp.h"
 
 
 void hmp_info_tlb(Monitor *mon, const QDict *qdict)

diff --git a/target/xtensa/monitor.c b/target/xtensa/monitor.c
index cf7957bb630359aa1288504c22a3edefe2701b58..608173c238f9a6c60f8c97f4d53e432cea52e733 100644 (file)
--- a/target/xtensa/monitor.c
+++ b/target/xtensa/monitor.c
@@ -25,7 +25,7 @@
 #include "cpu.h"
 #include "monitor/monitor.h"
 #include "monitor/hmp-target.h"
-#include "hmp.h"
+#include "monitor/hmp.h"
 
 void hmp_info_tlb(Monitor *mon, const QDict *qdict)
 {