[PATCH 00/32] Move and clean up monitor command code

Markus Armbruster posted 32 patches 2 weeks, 1 day ago
MAINTAINERS                          |   10 +-
meson.build                          |    1 +
include/monitor/hmp-target.h         |    6 +
include/monitor/hmp.h                |   27 +
include/monitor/monitor.h            |    1 +
include/monitor/qmp-helpers.h        |    3 +
include/net/net.h                    |    4 +-
include/qemu/readline.h              |    2 +
include/{monitor => sysemu}/stats.h  |    0
monitor/monitor-internal.h           |    1 -
accel/kvm/kvm-all.c                  |    2 +-
audio/audio-hmp-cmds.c               |   83 +
block/monitor/block-hmp-cmds.c       |   21 +
chardev/char-hmp-cmds.c              |  220 +++
chardev/char.c                       |   20 +
hw/acpi/acpi-qmp-cmds.c              |   30 +
hw/core/machine-hmp-cmds.c           |  208 +++
hw/core/machine-qmp-cmds.c           |  144 ++
hw/net/rocker/rocker-hmp-cmds.c      |  316 ++++
hw/virtio/virtio-hmp-cmds.c          |  321 ++++
migration/migration-hmp-cmds.c       |  807 ++++++++++
migration/migration.c                |   30 +
monitor/fds.c                        |  468 ++++++
monitor/hmp-cmds-target.c            |  380 +++++
monitor/hmp-cmds.c                   | 2181 ++------------------------
monitor/hmp-target.c                 |  178 +++
monitor/hmp.c                        |   17 +-
monitor/misc.c                       | 1906 ----------------------
monitor/monitor.c                    |   30 +-
monitor/qmp-cmds-control.c           |    1 -
monitor/qmp-cmds.c                   |  355 +----
net/net-hmp-cmds.c                   |  170 ++
net/net.c                            |   28 +-
qom/qom-hmp-cmds.c                   |   67 +
softmmu/qdev-monitor.c               |   82 +
softmmu/runstate-hmp-cmds.c          |   82 +
softmmu/tpm-hmp-cmds.c               |   65 +
stats/stats-hmp-cmds.c               |  247 +++
stats/stats-qmp-cmds.c               |  162 ++
storage-daemon/qemu-storage-daemon.c |    4 +-
trace/trace-hmp-cmds.c               |  148 ++
util/readline.c                      |    8 +
audio/meson.build                    |    1 +
chardev/meson.build                  |    6 +-
hmp-commands.hx                      |    4 +-
hw/acpi/meson.build                  |    1 +
hw/net/meson.build                   |    1 +
hw/virtio/meson.build                |    1 +
migration/meson.build                |    1 +
monitor/meson.build                  |    4 +-
net/meson.build                      |    1 +
softmmu/meson.build                  |    2 +
stats/meson.build                    |    1 +
trace/meson.build                    |    1 +
54 files changed, 4574 insertions(+), 4286 deletions(-)
rename include/{monitor => sysemu}/stats.h (100%)
create mode 100644 audio/audio-hmp-cmds.c
create mode 100644 chardev/char-hmp-cmds.c
create mode 100644 hw/acpi/acpi-qmp-cmds.c
create mode 100644 hw/net/rocker/rocker-hmp-cmds.c
create mode 100644 hw/virtio/virtio-hmp-cmds.c
create mode 100644 migration/migration-hmp-cmds.c
create mode 100644 monitor/fds.c
create mode 100644 monitor/hmp-cmds-target.c
create mode 100644 monitor/hmp-target.c
delete mode 100644 monitor/misc.c
create mode 100644 net/net-hmp-cmds.c
create mode 100644 softmmu/runstate-hmp-cmds.c
create mode 100644 softmmu/tpm-hmp-cmds.c
create mode 100644 stats/stats-hmp-cmds.c
create mode 100644 stats/stats-qmp-cmds.c
create mode 100644 trace/trace-hmp-cmds.c
create mode 100644 stats/meson.build
[PATCH 00/32] Move and clean up monitor command code
Posted by Markus Armbruster 2 weeks, 1 day ago
Over the years, many commands got dumped into monitor/, where
MAINTAINERS blames them on Dave and me.  Recent "[PATCH v2 00/13] pci:
Move and clean up monitor command code" (merge commit 33698d3abf8)
evicted commands related to PCI (qapi/pci.json), and "[PATCH v4 00/17]
ui: Move and clean up monitor command code" (merge commit 70d17c3eede)
evicted commands rated to UI (qapi/ui.json) This series evicts most of
the rest.  Commands related to the monitor itself (qapi/control.json
qapi/introspect.json) and miscellaneous commands (qapi/misc.json) stay
in monitor/.

Together, these patches move almost 4000 lines from monitor/ to
subsystems where they belong.

Based-on: <20230119091545.3116376-1-armbru@redhat.com>

Markus Armbruster (32):
  monitor: Drop unnecessary includes
  audio: Move HMP commands from monitor/ to audio/
  char: Move HMP commands from monitor/ to chardev/
  char: Factor out qmp_add_client() parts and move to chardev/
  hmp: Drop redundant argument check from add_completion_option()
  readline: Extract readline_add_completion_of() from monitor
  hmp: Rename help_cmd() to hmp_help_cmd(), move declaration to hmp.h
  trace: Move HMP commands from monitor/ to trace/
  machine: Move QMP commands from monitor/ to hw/core/
  machine: Move HMP commands from monitor/ to hw/core/
  qom: Move HMP commands from monitor/ to qom/
  block: Factor out hmp_change_medium(), and move to block/monitor/
  rocker: Move HMP commands from monitor to hw/net/rocker/
  hmp: Rewrite strlist_from_comma_list() as hmp_split_at_comma()
  net: Move HMP commands from monitor to net/
  net: Move hmp_info_network() to net-hmp-cmds.c
  migration: Move HMP commands from monitor/ to migration/
  migration: Move the QMP command from monitor/ to migration/
  virtio: Move HMP commands from monitor/ to hw/virtio/
  tpm: Move HMP commands from monitor/ to softmmu/
  runstate: Move HMP commands from monitor/ to softmmu/
  stats: Move QMP commands from monitor/ to stats/
  stats: Move HMP commands from monitor/ to stats/
  acpi: Move the QMP command from monitor/ to hw/acpi/
  qdev: Move HMP command completion from monitor to softmmu/
  monitor: Split file descriptor passing stuff off misc.c
  monitor: Move monitor_putc() next to monitor_puts & external linkage
  monitor: Move target-dependent HMP commands to hmp-cmds-target.c
  monitor: Move remaining HMP commands from misc.c to hmp-cmds.c
  monitor: Move remaining QMP stuff from misc.c to qmp-cmds.c
  monitor: Loosen coupling between misc.c and monitor.c slightly
  monitor: Rename misc.c to hmp-target.c

 MAINTAINERS                          |   10 +-
 meson.build                          |    1 +
 include/monitor/hmp-target.h         |    6 +
 include/monitor/hmp.h                |   27 +
 include/monitor/monitor.h            |    1 +
 include/monitor/qmp-helpers.h        |    3 +
 include/net/net.h                    |    4 +-
 include/qemu/readline.h              |    2 +
 include/{monitor => sysemu}/stats.h  |    0
 monitor/monitor-internal.h           |    1 -
 accel/kvm/kvm-all.c                  |    2 +-
 audio/audio-hmp-cmds.c               |   83 +
 block/monitor/block-hmp-cmds.c       |   21 +
 chardev/char-hmp-cmds.c              |  220 +++
 chardev/char.c                       |   20 +
 hw/acpi/acpi-qmp-cmds.c              |   30 +
 hw/core/machine-hmp-cmds.c           |  208 +++
 hw/core/machine-qmp-cmds.c           |  144 ++
 hw/net/rocker/rocker-hmp-cmds.c      |  316 ++++
 hw/virtio/virtio-hmp-cmds.c          |  321 ++++
 migration/migration-hmp-cmds.c       |  807 ++++++++++
 migration/migration.c                |   30 +
 monitor/fds.c                        |  468 ++++++
 monitor/hmp-cmds-target.c            |  380 +++++
 monitor/hmp-cmds.c                   | 2181 ++------------------------
 monitor/hmp-target.c                 |  178 +++
 monitor/hmp.c                        |   17 +-
 monitor/misc.c                       | 1906 ----------------------
 monitor/monitor.c                    |   30 +-
 monitor/qmp-cmds-control.c           |    1 -
 monitor/qmp-cmds.c                   |  355 +----
 net/net-hmp-cmds.c                   |  170 ++
 net/net.c                            |   28 +-
 qom/qom-hmp-cmds.c                   |   67 +
 softmmu/qdev-monitor.c               |   82 +
 softmmu/runstate-hmp-cmds.c          |   82 +
 softmmu/tpm-hmp-cmds.c               |   65 +
 stats/stats-hmp-cmds.c               |  247 +++
 stats/stats-qmp-cmds.c               |  162 ++
 storage-daemon/qemu-storage-daemon.c |    4 +-
 trace/trace-hmp-cmds.c               |  148 ++
 util/readline.c                      |    8 +
 audio/meson.build                    |    1 +
 chardev/meson.build                  |    6 +-
 hmp-commands.hx                      |    4 +-
 hw/acpi/meson.build                  |    1 +
 hw/net/meson.build                   |    1 +
 hw/virtio/meson.build                |    1 +
 migration/meson.build                |    1 +
 monitor/meson.build                  |    4 +-
 net/meson.build                      |    1 +
 softmmu/meson.build                  |    2 +
 stats/meson.build                    |    1 +
 trace/meson.build                    |    1 +
 54 files changed, 4574 insertions(+), 4286 deletions(-)
 rename include/{monitor => sysemu}/stats.h (100%)
 create mode 100644 audio/audio-hmp-cmds.c
 create mode 100644 chardev/char-hmp-cmds.c
 create mode 100644 hw/acpi/acpi-qmp-cmds.c
 create mode 100644 hw/net/rocker/rocker-hmp-cmds.c
 create mode 100644 hw/virtio/virtio-hmp-cmds.c
 create mode 100644 migration/migration-hmp-cmds.c
 create mode 100644 monitor/fds.c
 create mode 100644 monitor/hmp-cmds-target.c
 create mode 100644 monitor/hmp-target.c
 delete mode 100644 monitor/misc.c
 create mode 100644 net/net-hmp-cmds.c
 create mode 100644 softmmu/runstate-hmp-cmds.c
 create mode 100644 softmmu/tpm-hmp-cmds.c
 create mode 100644 stats/stats-hmp-cmds.c
 create mode 100644 stats/stats-qmp-cmds.c
 create mode 100644 trace/trace-hmp-cmds.c
 create mode 100644 stats/meson.build

-- 
2.39.0