[Qemu-devel] [PATCH 03/17] hmp: Move hmp.h to include/monitor/

Markus Armbruster posted 17 patches 6 years, 4 months ago
Maintainers: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Aleksandar Markovic <amarkovic@wavecomp.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Artyom Tarasenko <atar4qemu@gmail.com>, Aurelien Jarno <aurelien@aurel32.net>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Aleksandar Rikalo <arikalo@wavecomp.com>, Anthony Perard <anthony.perard@citrix.com>, Michael Roth <mdroth@linux.vnet.ibm.com>, Kevin Wolf <kwolf@redhat.com>, Christian Borntraeger <borntraeger@de.ibm.com>, Peter Maydell <peter.maydell@linaro.org>, Max Filippov <jcmvbkbc@gmail.com>, Cornelia Huck <cohuck@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, David Hildenbrand <david@redhat.com>, Richard Henderson <rth@twiddle.net>, Paul Durrant <paul.durrant@citrix.com>, Max Reitz <mreitz@redhat.com>, Marek Vasut <marex@denx.de>, David Gibson <david@gibson.dropbear.id.au>, Eduardo Habkost <ehabkost@redhat.com>, Igor Mammedov <imammedo@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Stefano Stabellini <sstabellini@kernel.org>, Chris Wulff <crwulff@gmail.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Halil Pasic <pasic@linux.ibm.com>, Markus Armbruster <armbru@redhat.com>, Eric Blake <eblake@redhat.com>
[Qemu-devel] [PATCH 03/17] hmp: Move hmp.h to include/monitor/
Posted by Markus Armbruster 6 years, 4 months ago
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hmp.h => include/monitor/hmp.h | 0
 monitor/hmp-cmds.c             | 2 +-
 monitor/misc.c                 | 2 +-
 target/i386/monitor.c          | 2 +-
 target/nios2/monitor.c         | 2 +-
 target/ppc/monitor.c           | 2 +-
 target/sh4/monitor.c           | 2 +-
 target/sparc/monitor.c         | 2 +-
 target/xtensa/monitor.c        | 2 +-
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename hmp.h => include/monitor/hmp.h (100%)

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 c283dde0e9..5082fcd016 100644
--- 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 bf9faceb86..2fb6896e84 100644
--- 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 56e2dbece7..1f3b532fc2 100644
--- 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 d5e3393716..6646836df5 100644
--- 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 7f8360d903..a5a177d717 100644
--- 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 4c7f36c9cc..918a5ccfc6 100644
--- 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 3ec3b51a3d..a7ea287cbc 100644
--- 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 cf7957bb63..608173c238 100644
--- 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)
 {
-- 
2.21.0


Re: [Qemu-devel] [PATCH 03/17] hmp: Move hmp.h to include/monitor/
Posted by Daniel P. Berrangé 6 years, 4 months ago
On Wed, Jun 19, 2019 at 10:10:36PM +0200, Markus Armbruster wrote:
> Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  hmp.h => include/monitor/hmp.h | 0
>  monitor/hmp-cmds.c             | 2 +-
>  monitor/misc.c                 | 2 +-
>  target/i386/monitor.c          | 2 +-
>  target/nios2/monitor.c         | 2 +-
>  target/ppc/monitor.c           | 2 +-
>  target/sh4/monitor.c           | 2 +-
>  target/sparc/monitor.c         | 2 +-
>  target/xtensa/monitor.c        | 2 +-
>  9 files changed, 8 insertions(+), 8 deletions(-)
>  rename hmp.h => include/monitor/hmp.h (100%)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 03/17] hmp: Move hmp.h to include/monitor/
Posted by Dr. David Alan Gilbert 6 years, 4 months ago
* Markus Armbruster (armbru@redhat.com) wrote:
> Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  hmp.h => include/monitor/hmp.h | 0
>  monitor/hmp-cmds.c             | 2 +-
>  monitor/misc.c                 | 2 +-
>  target/i386/monitor.c          | 2 +-
>  target/nios2/monitor.c         | 2 +-
>  target/ppc/monitor.c           | 2 +-
>  target/sh4/monitor.c           | 2 +-
>  target/sparc/monitor.c         | 2 +-
>  target/xtensa/monitor.c        | 2 +-
>  9 files changed, 8 insertions(+), 8 deletions(-)
>  rename hmp.h => include/monitor/hmp.h (100%)
> 
> 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 c283dde0e9..5082fcd016 100644
> --- 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 bf9faceb86..2fb6896e84 100644
> --- 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 56e2dbece7..1f3b532fc2 100644
> --- 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 d5e3393716..6646836df5 100644
> --- 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 7f8360d903..a5a177d717 100644
> --- 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 4c7f36c9cc..918a5ccfc6 100644
> --- 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 3ec3b51a3d..a7ea287cbc 100644
> --- 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 cf7957bb63..608173c238 100644
> --- 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)
>  {
> -- 
> 2.21.0
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK