[PULL 00/35] Monitor patches for 2023-02-03

Markus Armbruster posted 35 patches 1 year, 2 months ago
There is a newer version of this series
MAINTAINERS                          |   14 +-
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, 4577 insertions(+), 4287 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
[PULL 00/35] Monitor patches for 2023-02-03
Posted by Markus Armbruster 1 year, 2 months ago
The following changes since commit deabea6e88f7c4c3c12a36ee30051c6209561165:

  Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2023-02-02 10:10:07 +0000)

are available in the Git repository at:

  https://repo.or.cz/qemu/armbru.git tags/pull-monitor-2023-02-03

for you to fetch changes up to 3a1cecf486ee97d5750931f81706c6d447615f17:

  monitor: Rename misc.c to hmp-target.c (2023-02-03 09:14:17 +0100)

----------------------------------------------------------------
Monitor patches for 2023-02-03

----------------------------------------------------------------
Markus Armbruster (35):
      MAINTAINERS: Cover userfaultfd
      MAINTAINERS: Cover include/sysemu/accel-blocker.h
      MAINTAINERS: Cover tpm.c again
      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                          |   14 +-
 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, 4577 insertions(+), 4287 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
Re: [PULL 00/35] Monitor patches for 2023-02-03
Posted by Peter Maydell 1 year, 2 months ago
On Fri, 3 Feb 2023 at 08:45, Markus Armbruster <armbru@redhat.com> wrote:
>
>
> The following changes since commit deabea6e88f7c4c3c12a36ee30051c6209561165:
>
>   Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2023-02-02 10:10:07 +0000)
>
> are available in the Git repository at:
>
>   https://repo.or.cz/qemu/armbru.git tags/pull-monitor-2023-02-03
>
> for you to fetch changes up to 3a1cecf486ee97d5750931f81706c6d447615f17:
>
>   monitor: Rename misc.c to hmp-target.c (2023-02-03 09:14:17 +0100)
>
> ----------------------------------------------------------------
> Monitor patches for 2023-02-03
>
> ----------------------------------------------------------------

Compile failures, multiple jobs, eg:
https://gitlab.com/qemu-project/qemu/-/jobs/3711453887

../monitor/monitor.c:292:5: error: no previous prototype for
‘error_vprintf’ [-Werror=missing-prototypes]
int error_vprintf(const char *fmt, va_list ap)
^~~~~~~~~~~~~
../monitor/monitor.c: In function ‘error_vprintf’:
../monitor/monitor.c:297:9: error: function ‘error_vprintf’ might be a
candidate for ‘gnu_printf’ format attribute
[-Werror=suggest-attribute=format]
return monitor_vprintf(cur_mon, fmt, ap);
^~~~~~
../monitor/monitor.c:299:5: error: function ‘error_vprintf’ might be a
candidate for ‘gnu_printf’ format attribute
[-Werror=suggest-attribute=format]
return vfprintf(stderr, fmt, ap);
^~~~~~

The cross-win32-system job has more issues:
https://gitlab.com/qemu-project/qemu/-/jobs/3711453827

../monitor/hmp.c:1203:5: error: unknown type name 'DIR'
../monitor/hmp.c:1225:11: error: implicit declaration of function
'opendir'; did you mean 'open'?
[-Werror=implicit-function-declaration]

etc -- looks like some POSIX-only code is being built
when it shouldn't?

thanks
-- PMM