monitor: Split monitor.c in core/HMP/QMP/misc
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v3 Latest15 patches 23 repliesIn review
- v211 patches 30 repliesSuperseded
- v1 RFC10 patches 18 repliesSuperseded
Changes in v3 from the cover letter
- Assert monitor_is_qmp() before casting to MonitorQMP in two places
- Added note that HMP doesn't currently use iothread to the documentation of MonitorHMP
- Removed unnecessary memset() in monitor_data_init()
- Removed Monitor.cmd_table instead of moving it to MonitorHMP. Renamed the tables to have an hmp_ prefix.
- monitor_int.h of v2 becomes monitor-internal.h now
- Cleaned up #include directives in new files
- Moved some more functions between files
- Removed monitor_init() in favour of public monitor_init_hmp/qmp()
- Deprecate -mon control=readline,pretty=on|off
- Improved several commit messages
Patches in v3 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/15 | monitor: Remove unused password prompting fieldsmonitor.c | +0 | 0 replies | |
| 2/15 | monitor: Split monitor_init in HMP and QMP functionmonitor.c | +52 | 1 reply | |
| 3/15 | monitor: Make MonitorQMP a child class of Monitormonitor.c | +124 | 1 reply | |
| 4/15 | monitor: Create MonitorHMP with readline statehmp.c include/ monitor.c | +79 | 1 reply | |
| 5/15 | monitor: Remove Monitor.cmd_table indirectionmonitor.c | +3 | 1 reply | |
| 6/15 | monitor: Rename HMP command type and tableshmp-commands.hx monitor.c | +35 | 2 replies | |
| 7/15 | Move monitor.c to monitor/misc.cMAINTAINERS Makefile.objs Makefile.target +5 more | +19 | 2 replies | |
| 8/15 | monitor: Move {hmp, qmp}.c to monitor/{hmp, qmp}-cmds.cMAINTAINERS Makefile.objs docs/ +3 more | +12 | 0 replies | |
| 9/15 | monitor: Create monitor-internal.h with common definitionsMAINTAINERS monitor/ monitor/ | +151 | 2 replies | |
| 10/15 | monitor: Split out monitor/qmp.cMakefile.objs monitor/ monitor/ +3 more | +448 | 1 reply | |
| 11/15 | monitor: Split out monitor/hmp.cmonitor/ monitor/ monitor/ +2 more | +1443 | 2 replies | |
| 12/15 | monitor: Split out monitor/monitor.cMAINTAINERS include/ monitor/ +4 more | +644 | 1 reply | |
| 13/15 | monitor: Split Monitor.flags into separate boolsmonitor/ monitor/ monitor/ +2 more | +22 | 1 reply | |
| 14/15 | monitor: Replace monitor_init() with monitor_init_{hmp, qmp}()chardev/ gdbstub.c include/ +7 more | +27 | 1 reply | |
| 15/15 | vl: Deprecate -mon pretty=... for HMP monitorsqemu-deprecated.texi vl.c | +15 | 3 replies |
Reviews trailers per patch
All 15 patches have a Reviewed-by or Acked-by.
| Patch | Dr. David Alan Gilbert | Markus Armbruster |
|---|---|---|
| 1/15 | R-b | R-b |
| 2/15 | R-b | R-b |
| 3/15 | R-b | R-b |
| 4/15 | R-b | R-b |
| 5/15 | R-b | |
| 6/15 | R-b | |
| 7/15 | R-b | R-b |
| 8/15 | R-b | R-b |
| 9/15 | R-b | R-b |
| 10/15 | R-b | R-b |
| 11/15 | R-b | |
| 12/15 | R-b | |
| 13/15 | R-b | |
| 14/15 | R-b | |
| 15/15 | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [Qemu-devel] [PATCH v3 00/15] monitor: Split monitor.c in core/HMP/QMP/misc
monitor.c mixes a lot of different things in a single file: The core monitor infrastructure, HMP infrastrcture, QMP infrastructure, and the implementation of several HMP and QMP commands. Almost worse, struct Monitor mixes state for HMP, for QMP, and state actually shared between all monitors. monitor.c must be linked with a system emulator and even requires per-target compilation because some of the commands it implements access system emulator state.
The reason why I care about this is that I'm working on a protoype for a storage daemon, which wants to use QMP (but probably not HMP) and obviously doesn't have any system emulator state. So I'm interested in some core monitor parts that can be linked to non-system-emulator tools.
This series first creates separate structs MonitorQMP and MonitorHMP which inherit from Monitor, and then moves the associated infrastructure code into separate source files.
While the split is probably not perfect, I think it's an improvement of the current state even for QEMU proper, and it's good enough so I can link my storage daemon against just monitor/core.o and monitor/qmp.o and get a useless QMP monitor that parses the JSON input and rejects everything as an unknown command.
Next I'll try to teach it a subset of QMP commands that can actually be supported in a tool, but while there will be a few follow-up patches to achieve this, I don't expect that this work will bring up much that needs to be changed in the splitting process done in this series.
v3:
- Assert monitor_is_qmp() before casting to MonitorQMP in two places
- Added note that HMP doesn't currently use iothread to the documentation of MonitorHMP
- Removed unnecessary memset() in monitor_data_init()
- Removed Monitor.cmd_table instead of moving it to MonitorHMP. Renamed the tables to have an hmp_ prefix.
- monitor_int.h of v2 becomes monitor-internal.h now
- Cleaned up #include directives in new files
- Moved some more functions between files
- Removed monitor_init() in favour of public monitor_init_hmp/qmp()
- Deprecate -mon control=readline,pretty=on|off
- Improved several commit messages
v2:
- Fix coding style while moving files to make checkpatch happier
- Updated file name references in docs/devel/writing-qmp-commands.txt
- Updated MAINTAINERS for moved and newly created files
- Created monitor/trace-events instead of using the root directory one
- Move {hmp,qmp}.c to monitor/{hmp,qmp}-cmds.c
Kevin Wolf (15):
monitor: Remove unused password prompting fields
monitor: Split monitor_init in HMP and QMP function
monitor: Make MonitorQMP a child class of Monitor
monitor: Create MonitorHMP with readline state
monitor: Remove Monitor.cmd_table indirection
monitor: Rename HMP command type and tables
Move monitor.c to monitor/misc.c
monitor: Move {hmp,qmp}.c to monitor/{hmp,qmp}-cmds.c
monitor: Create monitor-internal.h with common definitions
monitor: Split out monitor/qmp.c
monitor: Split out monitor/hmp.c
monitor: Split out monitor/monitor.c
monitor: Split Monitor.flags into separate bools
monitor: Replace monitor_init() with monitor_init_{hmp,qmp}()
vl: Deprecate -mon pretty=... for HMP monitors
docs/devel/writing-qmp-commands.txt | 11 +- include/monitor/monitor.h | 15 +- monitor/monitor-internal.h | 187 ++ chardev/char.c | 2 +- gdbstub.c | 2 +- monitor.c | 4729 --------------------------- hmp.c => monitor/hmp-cmds.c | 6 +- monitor/hmp.c | 1415 ++++++++ monitor/misc.c | 2368 ++++++++++++++ monitor/monitor.c | 632 ++++ qmp.c => monitor/qmp-cmds.c | 2 +- monitor/qmp.c | 403 +++ stubs/monitor.c | 6 +- tests/test-util-sockets.c | 3 +- vl.c | 28 +- MAINTAINERS | 13 +- Makefile.objs | 4 +- Makefile.target | 3 +- hmp-commands.hx | 2 +- monitor/Makefile.objs | 3 + monitor/trace-events | 15 + qemu-deprecated.texi | 6 + trace-events | 10 - 23 files changed, 5091 insertions(+), 4774 deletions(-) create mode 100644 monitor/monitor-internal.h delete mode 100644 monitor.c rename hmp.c => monitor/hmp-cmds.c (99%) create mode 100644 monitor/hmp.c create mode 100644 monitor/misc.c create mode 100644 monitor/monitor.c rename qmp.c => monitor/qmp-cmds.c (99%) create mode 100644 monitor/qmp.c create mode 100644 monitor/Makefile.objs create mode 100644 monitor/trace-events
Signature · 1 line
2.20.1