Skip to content

monitor: Reduce headers included in 'monitor/monitor.h'

Philippe Mathieu-Daudé qemu-devel 3 versions In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest23 patches 13 repliesIn review
  2. v216 patches 17 repliesSuperseded
  3. v114 patches 1 replySuperseded

Changes in v3 from the cover letter

- Fixed net/vhost-vdpa (new patch)
- Use QOM-cast macros (bonus)

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/23hexagon: Remove unnecessary 'monitor/monitor.h' headerinclude/hw/hexagon/hexagon_tlb.h target/hexagon/hex_mmu.h+3 -20 replies
2/23net/vhost-vdpa: Include missing 'qemu/iov.h' headernet/vhost-vdpa.c+1 -02 replies
3/23tests/unit: Include 'qemu/main-loop.h' header in test-util-sockets.ctests/unit/test-util-sockets.c+1 -00 replies
4/23qapi/qmp-dispatch: Include 'qemu/aio-wait.h' and 'monitor/monitor.h'qapi/qmp-dispatch.c+2 -00 replies
5/23qapi/qmp-registry: Remove unnecessary 'monitor/monitor.h' headerinclude/qapi/qmp-registry.h+0 -10 replies
6/23migration/hmp-cmds: Include 'block/block-global-state.h' headermigration/migration-hmp-cmds.c+1 -01 reply
7/23monitor: Include missing 'qemu/aio-wait.h' headermonitor/monitor.c monitor/qmp.c+2 -10 replies
8/23monitor: Include missing 'qemu/lockable.h' headermonitor/fds.c monitor/monitor.c monitor/qmp.c+3 -00 replies
9/23monitor: Include missing 'qemu/coroutine-core.h' headerinclude/monitor/monitor.h+1 -00 replies
10/23monitor: Reduce inclusion of 'qapi/qapi-emit-events.h' headerinclude/monitor/monitor.h monitor/monitor-internal.h+1 -10 replies
11/23monitor: Remove unnecessary 'block/block.h' headerinclude/monitor/monitor.h+0 -11 reply
12/23system: Remove unnecessary 'monitor/monitor.h' headersystem/device_tree.c system/physmem.c+0 -30 replies
13/23system/dirtylimit: Extract HMP code to dirtylimit-hmp-cmds.cMAINTAINERS system/dirtylimit-hmp-cmds.c system/dirtylimit.c +1 more+76 -601 reply
14/23system: Move qmp_inject_nmi() to hw/core/machine-qmp-cmds.chw/core/machine-qmp-cmds.c system/cpus.c+6 -80 replies
15/23system: Extract QMP memsave/pmemsave commands to physmem-qmp-cmds.cMAINTAINERS system/cpus.c system/meson.build +1 more+109 -920 replies
16/23system: Move runstate-related code from cpus.c to runstate.csystem/cpus.c system/runstate.c+154 -1470 replies
17/23monitor: Rename MonitorQMP @mon -> @qmonmonitor/monitor-internal.h monitor/qmp-cmds-control.c monitor/qmp.c+139 -1396 replies
18/23monitor: Rename MonitorHMP @mon -> @hmoninclude/monitor/monitor.h migration/migration-hmp-cmds.c monitor/hmp-cmds.c +4 more+96 -950 replies
19/23monitor: Better express monitor_read()'s opaque arg is of Monitor typemonitor/hmp.c+2 -11 reply
20/23monitor: Use QOM MONITOR() macro to access MonitorQMP->parent_objmonitor/qmp.c+28 -170 replies
21/23monitor: Use QOM MONITOR() macro to access MonitorHMP->parent_objmonitor/hmp.c monitor/qmp-cmds.c+30 -210 replies
22/23monitor: Replace container_of(MonitorHMP, parent_obj) -> MONITOR_HMP()monitor/hmp-cmds.c monitor/hmp.c ui/ui-hmp-cmds.c+4 -41 reply
23/23monitor/hmp: Remove unnecessary 'monitor/monitor.h' headerinclude/monitor/hmp.h+0 -10 replies

Reviews trailers per patch

18 of 23 patches have a Reviewed-by or Acked-by.

PatchMarc-André LureauMichael S. TsirkinDr. David Alan GilbertHyman Huang
1/23R-b
2/23R-b A-b
3/23R-b
4/23R-b
5/23R-b
6/23R-b R-b
7/23R-b
8/23R-b
9/23R-b
10/23R-b
11/23R-b
12/23R-b
13/23R-b R-b
14/23R-b
15/23R-b
16/23R-b
17/23
18/23
19/23R-b
20/23
21/23
22/23R-b
23/23

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v3 thread

Cover letter [PATCH v3 00/23] monitor: Reduce headers included in 'monitor/monitor.h'

Missing review: 2, 11, 17+

Since v2:
- Fixed net/vhost-vdpa (new patch)
- Use QOM-cast macros (bonus)

Since v1:
- extract QMP inject_nmi/memsave/pmemsave out of cpus.c (first 12 patches left unchanged).

Another HMP cleanup series to help Marc-André with his 'Make HMP optional' series [*].

We could also remove "exec/hwaddr.h" by moving gpa2hva() declaration elsewhere, and "qapi/qapi-types-misc.h" by moving monitor_fdset_add_fd() out to some "monitor/fdset.h" header.

[*] [email protected]
Based-on: <[email protected]>

Philippe Mathieu-Daudé (23):
hexagon: Remove unnecessary 'monitor/monitor.h' header net/vhost-vdpa: Include missing 'qemu/iov.h' header tests/unit: Include 'qemu/main-loop.h' header in test-util-sockets.c qapi/qmp-dispatch: Include 'qemu/aio-wait.h' and 'monitor/monitor.h' qapi/qmp-registry: Remove unnecessary 'monitor/monitor.h' header migration/hmp-cmds: Include 'block/block-global-state.h' header
monitor: Include missing 'qemu/aio-wait.h' header
monitor: Include missing 'qemu/lockable.h' header
monitor: Include missing 'qemu/coroutine-core.h' header
monitor: Reduce inclusion of 'qapi/qapi-emit-events.h' header
monitor: Remove unnecessary 'block/block.h' header
system: Remove unnecessary 'monitor/monitor.h' header system/dirtylimit: Extract HMP code to dirtylimit-hmp-cmds.c
system: Move qmp_inject_nmi() to hw/core/machine-qmp-cmds.c
system: Extract QMP memsave/pmemsave commands to physmem-qmp-cmds.c
system: Move runstate-related code from cpus.c to runstate.c
monitor: Rename MonitorQMP @mon -> @qmon
monitor: Rename MonitorHMP @mon -> @hmon
monitor: Better express monitor_read()'s opaque arg is of Monitor type
monitor: Use QOM MONITOR() macro to access MonitorQMP->parent_obj
monitor: Use QOM MONITOR() macro to access MonitorHMP->parent_obj
monitor: Replace container_of(MonitorHMP, parent_obj) -> MONITOR_HMP() monitor/hmp: Remove unnecessary 'monitor/monitor.h' header

 MAINTAINERS                      |   2 +
 include/hw/hexagon/hexagon_tlb.h |   2 +-
 include/monitor/hmp.h            |   1 -
 include/monitor/monitor.h        |   7 +-
 include/qapi/qmp-registry.h      |   1 -
 monitor/monitor-internal.h       |   7 +-
 target/hexagon/hex_mmu.h         |   3 +-
 hw/core/machine-qmp-cmds.c       |   6 +
 migration/migration-hmp-cmds.c   |   5 +-
 monitor/fds.c                    |   1 +
 monitor/hmp-cmds.c               |  10 +-
 monitor/hmp.c                    | 164 ++++++++++---------
 monitor/monitor.c                |   2 +
 monitor/qmp-cmds-control.c       |  18 +--
 monitor/qmp-cmds.c               |  13 +-
 monitor/qmp.c                    | 270 ++++++++++++++++---------------
 net/vhost-vdpa.c                 |   1 +
 qapi/qmp-dispatch.c              |   2 +
 system/cpus.c                    | 247 ----------------------------
 system/device_tree.c             |   1 -
 system/dirtylimit-hmp-cmds.c     |  74 +++++++++
 system/dirtylimit.c              |  60 -------
 system/physmem-qmp-cmds.c        | 107 ++++++++++++
 system/physmem.c                 |   2 -
 system/runstate.c                | 154 ++++++++++++++++++
 tests/unit/test-util-sockets.c   |   1 +
 ui/ui-hmp-cmds.c                 |   6 +-
 system/meson.build               |   2 +
 28 files changed, 617 insertions(+), 552 deletions(-)
 create mode 100644 system/dirtylimit-hmp-cmds.c
 create mode 100644 system/physmem-qmp-cmds.c
Signature · 1 line
2.53.0