Skip to content

ui: Move and clean up monitor command code

Markus Armbruster qemu-devel 5 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest17 patches 7 repliesIn review
  2. v318 patches 19 repliesSuperseded
  3. v2 posting 2/214 patches 12 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v2 posting 1/213 patches0 repliesSuperseded
v19 patches21 repliesSuperseded

Changes in v4 from the cover letter

* PATCH 02: Use strtoi() [David]
* PATCH 11: Old PATCH 12 squashed in
* PATCH 15+16: Swapped for a simple new PATCH 16
* PATCH 16: Use Error properly in qemu_mouse_set() [Daniel], return bool [Philippe]

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/17ui: Check numeric part of expire_password argument @time properlymonitor/qmp-cmds.c+15 -20 replies
2/17ui: Fix silent truncation of numeric keys in HMP sendkeymonitor/hmp-cmds.c+6 -21 reply
3/17ui/spice: Require spice-protocol >= 0.14.0meson.build ui/vdagent.c+1 -50 replies
4/17Revert "hmp: info spice: take out webdav"monitor/hmp-cmds.c+0 -50 replies
5/17ui/spice: Require spice-server >= 0.14.0chardev/spice.c hw/display/qxl.c hw/display/qxl.h +3 more+3 -180 replies
6/17ui/spice: QXLInterface method set_mm_time() is now dead, drophw/display/qxl.c hw/display/trace-events include/ui/qemu-spice.h +1 more+0 -320 replies
7/17ui/spice: Give hmp_info_spice()'s channel_names[] static linkagemonitor/hmp-cmds.c+1 -10 replies
8/17ui: Clean up a few things checkpatch.pl would flag later onmonitor/hmp-cmds.c monitor/qmp-cmds.c+15 -130 replies
9/17ui: Move QMP commands from monitor to new ui/ui-qmp-cmds.cmonitor/qmp-cmds.c ui/meson.build ui/ui-qmp-cmds.c+137 -1180 replies
10/17ui: Factor out qmp_add_client() parts and move to ui/ui-qmp-cmds.cinclude/monitor/qmp-helpers.h monitor/qmp-cmds.c ui/ui-qmp-cmds.c+100 -410 replies
11/17ui: Move HMP commands from monitor to new ui/ui-hmp-cmds.cinclude/monitor/hmp.h monitor/hmp-cmds.c monitor/misc.c +2 more+425 -4040 replies
12/17ui: Improve "change vnc" error reportingmonitor/hmp-cmds.c+4 -40 replies
13/17ui: Factor out hmp_change_vnc(), and move to ui/ui-hmp-cmds.cinclude/monitor/hmp.h monitor/hmp-cmds.c monitor/qmp-cmds.c +1 more+42 -300 replies
14/17ui: Reduce nesting in hmp_change_vnc() slightlyui/ui-hmp-cmds.c+7 -100 replies
15/17ui: Don't check for mode change after mouse_set errorui/input.c+1 -02 replies
16/17ui: Split hmp_mouse_set() and move the HMP part to ui/include/monitor/hmp.h include/ui/console.h monitor/misc.c +2 more+17 -102 replies
17/17ui: Simplify control flow in qemu_mouse_set()ui/input.c+11 -132 replies

Reviews trailers per patch

All 17 patches have a Reviewed-by or Acked-by.

PatchDaniel P. BerrangéPhilippe Mathieu-Daudé
1/17R-b
2/17R-b R-b
3/17R-b R-b
4/17R-b
5/17R-b R-b
6/17R-b R-b
7/17R-b
8/17R-b R-b
9/17R-b R-b
10/17R-b
11/17R-b R-b
12/17R-b R-b
13/17R-b R-b
14/17R-b R-b
15/17R-b R-b
16/17R-b R-b
17/17R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [PATCH v4 00/17] ui: Move and clean up monitor command code

This is mainly about splitting off monitor-related code. There's also a minimum Spice version bump, and a few UI improvements to HMP commands sendkey, change vnc, and info spice.

v4:
* PATCH 02: Use strtoi() [David]
* PATCH 11: Old PATCH 12 squashed in
* PATCH 15+16: Swapped for a simple new PATCH 16
* PATCH 16: Use Error properly in qemu_mouse_set() [Daniel], return bool [Philippe]

v3:
* Rebased, straighforward conflicts with "qapi: Elide redundant has_FOO in generated C" (merge commit ae2b87341b5)
* PATCH 09: Commit message pasto fixed
* PATCH 11: Comment tweaked
* PATCH 12: New
* PATCH 13: protocol_table[] made const [Philippe], #include tweaked
* PATCH 16-18: New

Markus Armbruster (17):
ui: Check numeric part of expire_password argument @time properly
ui: Fix silent truncation of numeric keys in HMP sendkey ui/spice: Require spice-protocol >= 0.14.0
Revert "hmp: info spice: take out webdav"
ui/spice: Require spice-server >= 0.14.0
ui/spice: QXLInterface method set_mm_time() is now dead, drop ui/spice: Give hmp_info_spice()'s channel_names[] static linkage
ui: Clean up a few things checkpatch.pl would flag later on
ui: Move QMP commands from monitor to new ui/ui-qmp-cmds.c
ui: Factor out qmp_add_client() parts and move to ui/ui-qmp-cmds.c
ui: Move HMP commands from monitor to new ui/ui-hmp-cmds.c
ui: Improve "change vnc" error reporting
ui: Factor out hmp_change_vnc(), and move to ui/ui-hmp-cmds.c
ui: Reduce nesting in hmp_change_vnc() slightly
ui: Don't check for mode change after mouse_set error
ui: Split hmp_mouse_set() and move the HMP part to ui/
ui: Simplify control flow in qemu_mouse_set()

 meson.build                   |   4 +-
 hw/display/qxl.h              |   2 -
 include/monitor/hmp.h         |   8 +
 include/monitor/qmp-helpers.h |  26 ++
 include/ui/console.h          |   2 +-
 include/ui/qemu-spice.h       |   8 +-
 include/ui/spice-display.h    |   2 -
 chardev/spice.c               |   2 -
 hw/display/qxl.c              |  26 +-
 monitor/hmp-cmds.c            | 368 +--------------------------
 monitor/misc.c                |  67 -----
 monitor/qmp-cmds.c            | 176 +++----------
 ui/input.c                    |  32 ++-
 ui/spice-display.c            |  10 -
 ui/ui-hmp-cmds.c              | 460 ++++++++++++++++++++++++++++++++++
 ui/ui-qmp-cmds.c              | 177 +++++++++++++
 ui/vdagent.c                  |   4 -
 hw/display/trace-events       |   1 -
 ui/meson.build                |   2 +
 19 files changed, 727 insertions(+), 650 deletions(-)
 create mode 100644 include/monitor/qmp-helpers.h
 create mode 100644 ui/ui-hmp-cmds.c
 create mode 100644 ui/ui-qmp-cmds.c
Signature · 1 line
2.39.0