Re: [Qemu-devel] [PATCH v2 06/11] Move monitor.c to monitor/misc.c

[Dr. David Alan Gilbert]

* Kevin Wolf (address@hidden) wrote:
> Create a new monitor/ subdirectory and move monitor.c there. As the plan
> is to move the monitor core into separate files, use the chance to
> rename it to misc.c.
> 
> Signed-off-by: Kevin Wolf <address@hidden>

Reviewed-by: Dr. David Alan Gilbert <address@hidden>

> ---
>  docs/devel/writing-qmp-commands.txt |  2 +-
>  monitor.c => monitor/misc.c         |  2 +-
>  MAINTAINERS                         |  4 ++--
>  Makefile.objs                       |  1 +
>  Makefile.target                     |  3 ++-
>  monitor/Makefile.objs               |  1 +
>  monitor/trace-events                | 11 +++++++++++
>  trace-events                        | 10 ----------
>  8 files changed, 19 insertions(+), 15 deletions(-)
>  rename monitor.c => monitor/misc.c (99%)
>  create mode 100644 monitor/Makefile.objs
>  create mode 100644 monitor/trace-events
> 
> diff --git a/docs/devel/writing-qmp-commands.txt 
> b/docs/devel/writing-qmp-commands.txt
> index 9dfc62bf5a..cc6ecd6d5d 100644
> --- a/docs/devel/writing-qmp-commands.txt
> +++ b/docs/devel/writing-qmp-commands.txt
> @@ -470,7 +470,7 @@ it's good practice to always check for errors.
>  
>  Another important detail is that HMP's "info" commands don't go into the
>  hmp-commands.hx. Instead, they go into the info_cmds[] table, which is 
> defined
> -in the monitor.c file. The entry for the "info alarmclock" follows:
> +in the monitor/misc.c file. The entry for the "info alarmclock" follows:
>  
>      {
>          .name       = "alarmclock",
> diff --git a/monitor.c b/monitor/misc.c
> similarity index 99%
> rename from monitor.c
> rename to monitor/misc.c
> index 56af8ed448..ea3de5cac1 100644
> --- a/monitor.c
> +++ b/monitor/misc.c
> @@ -62,7 +62,7 @@
>  #include "qapi/qmp/json-parser.h"
>  #include "qapi/qmp/qlist.h"
>  #include "qom/object_interfaces.h"
> -#include "trace-root.h"
> +#include "trace.h"
>  #include "trace/control.h"
>  #include "monitor/hmp-target.h"
>  #ifdef CONFIG_TRACE_SIMPLE
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 7be1225415..10c082314c 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1924,7 +1924,7 @@ F: qapi/run-state.json
>  Human Monitor (HMP)
>  M: Dr. David Alan Gilbert <address@hidden>
>  S: Maintained
> -F: monitor.c
> +F: monitor/misc.c
>  F: hmp.[ch]
>  F: hmp-commands*.hx
>  F: include/monitor/hmp-target.h
> @@ -2046,7 +2046,7 @@ QMP
>  M: Markus Armbruster <address@hidden>
>  S: Supported
>  F: qmp.c
> -F: monitor.c
> +F: monitor/misc.c
>  F: docs/devel/*qmp-*
>  F: docs/interop/*qmp-*
>  F: scripts/qmp/
> diff --git a/Makefile.objs b/Makefile.objs
> index c8337fa34b..dd39a70b48 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -130,6 +130,7 @@ trace-events-subdirs =
>  trace-events-subdirs += accel/kvm
>  trace-events-subdirs += accel/tcg
>  trace-events-subdirs += crypto
> +trace-events-subdirs += monitor
>  ifeq ($(CONFIG_USER_ONLY),y)
>  trace-events-subdirs += linux-user
>  endif
> diff --git a/Makefile.target b/Makefile.target
> index ecd856e3a3..72c267f7dc 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -148,9 +148,10 @@ endif #CONFIG_BSD_USER
>  #########################################################
>  # System emulator target
>  ifdef CONFIG_SOFTMMU
> -obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o
> +obj-y += arch_init.o cpus.o gdbstub.o balloon.o ioport.o numa.o
>  obj-y += qtest.o
>  obj-y += hw/
> +obj-y += monitor/
>  obj-y += qapi/
>  obj-y += memory.o
>  obj-y += memory_mapping.o
> diff --git a/monitor/Makefile.objs b/monitor/Makefile.objs
> new file mode 100644
> index 0000000000..e783b0616b
> --- /dev/null
> +++ b/monitor/Makefile.objs
> @@ -0,0 +1 @@
> +obj-y += misc.o
> diff --git a/monitor/trace-events b/monitor/trace-events
> new file mode 100644
> index 0000000000..abfdf20b14
> --- /dev/null
> +++ b/monitor/trace-events
> @@ -0,0 +1,11 @@
> +# See docs/devel/tracing.txt for syntax documentation.
> +
> +# misc.c
> +monitor_protocol_event_handler(uint32_t event, void *qdict) "event=%d 
> data=%p"
> +monitor_protocol_event_emit(uint32_t event, void *data) "event=%d data=%p"
> +monitor_protocol_event_queue(uint32_t event, void *qdict, uint64_t rate) 
> "event=%d data=%p rate=%" PRId64
> +handle_hmp_command(void *mon, const char *cmdline) "mon %p cmdline: %s"
> +handle_qmp_command(void *mon, const char *req) "mon %p req: %s"
> +monitor_suspend(void *ptr, int cnt) "mon %p: %d"
> +monitor_qmp_cmd_in_band(const char *id) "%s"
> +monitor_qmp_cmd_out_of_band(const char *id) "%s"
> diff --git a/trace-events b/trace-events
> index 844ee58dd9..aeea3c2bdb 100644
> --- a/trace-events
> +++ b/trace-events
> @@ -41,16 +41,6 @@ system_wakeup_request(int reason) "reason=%d"
>  qemu_system_shutdown_request(int reason) "reason=%d"
>  qemu_system_powerdown_request(void) ""
>  
> -# monitor.c
> -monitor_protocol_event_handler(uint32_t event, void *qdict) "event=%d 
> data=%p"
> -monitor_protocol_event_emit(uint32_t event, void *data) "event=%d data=%p"
> -monitor_protocol_event_queue(uint32_t event, void *qdict, uint64_t rate) 
> "event=%d data=%p rate=%" PRId64
> -handle_hmp_command(void *mon, const char *cmdline) "mon %p cmdline: %s"
> -handle_qmp_command(void *mon, const char *req) "mon %p req: %s"
> -monitor_suspend(void *ptr, int cnt) "mon %p: %d"
> -monitor_qmp_cmd_in_band(const char *id) "%s"
> -monitor_qmp_cmd_out_of_band(const char *id) "%s"
> -
>  # dma-helpers.c
>  dma_blk_io(void *dbs, void *bs, int64_t offset, bool to_dev) "dbs=%p bs=%p 
> offset=%" PRId64 " to_dev=%d"
>  dma_aio_cancel(void *dbs) "dbs=%p"
> -- 
> 2.20.1
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK