[PULL 00/18] HMP-to-QMP info command patches

Daniel P. Berrangé posted 18 patches 4 years, 3 months ago
Failed in applying to current master (apply log)
accel/tcg/cpu-exec.c                          |  51 +++++-
accel/tcg/hmp.c                               |  22 +--
accel/tcg/translate-all.c                     |  84 +++++----
docs/devel/index.rst                          |   2 +-
...mands.rst => writing-monitor-commands.rst} | 167 ++++++++++++++++--
hmp-commands-info.hx                          |  29 +--
hw/core/loader.c                              |  39 ++--
hw/core/machine-hmp-cmds.c                    |  38 +---
hw/core/machine-qmp-cmds.c                    |  40 +++++
hw/rdma/rdma_rm.c                             | 104 +++++------
hw/rdma/rdma_rm.h                             |   2 +-
hw/rdma/vmw/pvrdma_main.c                     |  31 ++--
hw/usb/bus.c                                  |  24 ++-
include/exec/cpu-all.h                        |   6 +-
include/exec/ramlist.h                        |   2 +-
include/hw/rdma/rdma.h                        |   2 +-
include/monitor/hmp-target.h                  |   1 -
include/monitor/hmp.h                         |   5 +-
include/monitor/monitor.h                     |   2 +
include/qapi/type-helpers.h                   |  14 ++
include/tcg/tcg.h                             |   4 +-
monitor/hmp-cmds.c                            |  99 ++---------
monitor/hmp.c                                 |  32 +++-
monitor/misc.c                                |  46 ++---
monitor/monitor-internal.h                    |   7 +
monitor/qmp-cmds.c                            | 116 ++++++++++++
qapi/common.json                              |  11 ++
qapi/machine.json                             | 110 ++++++++++++
qapi/meson.build                              |   3 +
qapi/qapi-type-helpers.c                      |  23 +++
softmmu/physmem.c                             |  19 +-
stubs/usb-dev-stub.c                          |   8 +
target/i386/monitor.c                         |   6 -
tcg/tcg.c                                     |  98 +++++-----
tests/qtest/qmp-cmd-test.c                    |   8 +
35 files changed, 829 insertions(+), 426 deletions(-)
rename docs/devel/{writing-qmp-commands.rst => writing-monitor-commands.rst} (75%)
create mode 100644 include/qapi/type-helpers.h
create mode 100644 qapi/qapi-type-helpers.c
[PULL 00/18] HMP-to-QMP info command patches
Posted by Daniel P. Berrangé 4 years, 3 months ago
The following changes since commit 91e8394415f9bc9cd81c02bfafe02012855d4f98:

  Merge remote-tracking branch 'remotes/juanquintela/tags/migration-20211031-pull-request' into staging (2021-11-02 10:07:27 -0400)

are available in the Git repository at:

  https://gitlab.com/berrange/qemu tags/hmp-x-qmp-620-pull-request

for you to fetch changes up to b6a7f3e0d28248861cf46f59521129b179e8748d:

  qapi: introduce x-query-opcount QMP command (2021-11-02 15:57:20 +0000)

----------------------------------------------------------------
Initial conversion of HMP debugging commands to QMP

This introduces a new policy that all HMP commands will be converted to
have QMP equivalents, marked unstable if no formal QAPI modelling is
intended to be done.

New unstable commands are added as follows:

  - HMP "info roms" => QMP "x-query-roms"
  - HMP "info profile" => QMP "x-query-profile"
  - HMP "info numa" => QMP "x-query-numa"
  - HMP "info usb" => QMP "x-query-usb"
  - HMP "info rdma" => QMP "x-query-rdma"
  - HMP "info ramblock" => QMP "x-query-ramblock"
  - HMP "info irq" => QMP "x-query-irq"
  - HMP "info jit" => QMP "x-query-jit"
  - HMP "info opcount" => QMP "x-query-opcount"

----------------------------------------------------------------

Daniel P. Berrangé (18):
  monitor: remove 'info ioapic' HMP command
  monitor: make hmp_handle_error return a boolean
  docs/devel: rename file for writing monitor commands
  docs/devel: tweak headings in monitor command docs
  docs/devel: update error handling guidance for HMP commands
  monitor: introduce HumanReadableText and HMP support
  docs/devel: document expectations for QAPI data modelling for QMP
  docs/devel: add example of command returning unstructured text
  docs/devel: document expectations for HMP commands in the future
  qapi: introduce x-query-roms QMP command
  qapi: introduce x-query-profile QMP command
  qapi: introduce x-query-numa QMP command
  qapi: introduce x-query-usb QMP command
  qapi: introduce x-query-rdma QMP command
  qapi: introduce x-query-ramblock QMP command
  qapi: introduce x-query-irq QMP command
  qapi: introduce x-query-jit QMP command
  qapi: introduce x-query-opcount QMP command

 accel/tcg/cpu-exec.c                          |  51 +++++-
 accel/tcg/hmp.c                               |  22 +--
 accel/tcg/translate-all.c                     |  84 +++++----
 docs/devel/index.rst                          |   2 +-
 ...mands.rst => writing-monitor-commands.rst} | 167 ++++++++++++++++--
 hmp-commands-info.hx                          |  29 +--
 hw/core/loader.c                              |  39 ++--
 hw/core/machine-hmp-cmds.c                    |  38 +---
 hw/core/machine-qmp-cmds.c                    |  40 +++++
 hw/rdma/rdma_rm.c                             | 104 +++++------
 hw/rdma/rdma_rm.h                             |   2 +-
 hw/rdma/vmw/pvrdma_main.c                     |  31 ++--
 hw/usb/bus.c                                  |  24 ++-
 include/exec/cpu-all.h                        |   6 +-
 include/exec/ramlist.h                        |   2 +-
 include/hw/rdma/rdma.h                        |   2 +-
 include/monitor/hmp-target.h                  |   1 -
 include/monitor/hmp.h                         |   5 +-
 include/monitor/monitor.h                     |   2 +
 include/qapi/type-helpers.h                   |  14 ++
 include/tcg/tcg.h                             |   4 +-
 monitor/hmp-cmds.c                            |  99 ++---------
 monitor/hmp.c                                 |  32 +++-
 monitor/misc.c                                |  46 ++---
 monitor/monitor-internal.h                    |   7 +
 monitor/qmp-cmds.c                            | 116 ++++++++++++
 qapi/common.json                              |  11 ++
 qapi/machine.json                             | 110 ++++++++++++
 qapi/meson.build                              |   3 +
 qapi/qapi-type-helpers.c                      |  23 +++
 softmmu/physmem.c                             |  19 +-
 stubs/usb-dev-stub.c                          |   8 +
 target/i386/monitor.c                         |   6 -
 tcg/tcg.c                                     |  98 +++++-----
 tests/qtest/qmp-cmd-test.c                    |   8 +
 35 files changed, 829 insertions(+), 426 deletions(-)
 rename docs/devel/{writing-qmp-commands.rst => writing-monitor-commands.rst} (75%)
 create mode 100644 include/qapi/type-helpers.h
 create mode 100644 qapi/qapi-type-helpers.c

-- 
2.31.1



Re: [PULL 00/18] HMP-to-QMP info command patches
Posted by Richard Henderson 4 years, 3 months ago
On 11/2/21 1:56 PM, Daniel P. Berrangé wrote:
> The following changes since commit 91e8394415f9bc9cd81c02bfafe02012855d4f98:
> 
>    Merge remote-tracking branch 'remotes/juanquintela/tags/migration-20211031-pull-request' into staging (2021-11-02 10:07:27 -0400)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/berrange/qemu tags/hmp-x-qmp-620-pull-request
> 
> for you to fetch changes up to b6a7f3e0d28248861cf46f59521129b179e8748d:
> 
>    qapi: introduce x-query-opcount QMP command (2021-11-02 15:57:20 +0000)
> 
> ----------------------------------------------------------------
> Initial conversion of HMP debugging commands to QMP
> 
> This introduces a new policy that all HMP commands will be converted to
> have QMP equivalents, marked unstable if no formal QAPI modelling is
> intended to be done.
> 
> New unstable commands are added as follows:
> 
>    - HMP "info roms" => QMP "x-query-roms"
>    - HMP "info profile" => QMP "x-query-profile"
>    - HMP "info numa" => QMP "x-query-numa"
>    - HMP "info usb" => QMP "x-query-usb"
>    - HMP "info rdma" => QMP "x-query-rdma"
>    - HMP "info ramblock" => QMP "x-query-ramblock"
>    - HMP "info irq" => QMP "x-query-irq"
>    - HMP "info jit" => QMP "x-query-jit"
>    - HMP "info opcount" => QMP "x-query-opcount"
> 
> ----------------------------------------------------------------
> 
> Daniel P. Berrangé (18):
>    monitor: remove 'info ioapic' HMP command
>    monitor: make hmp_handle_error return a boolean
>    docs/devel: rename file for writing monitor commands
>    docs/devel: tweak headings in monitor command docs
>    docs/devel: update error handling guidance for HMP commands
>    monitor: introduce HumanReadableText and HMP support
>    docs/devel: document expectations for QAPI data modelling for QMP
>    docs/devel: add example of command returning unstructured text
>    docs/devel: document expectations for HMP commands in the future
>    qapi: introduce x-query-roms QMP command
>    qapi: introduce x-query-profile QMP command
>    qapi: introduce x-query-numa QMP command
>    qapi: introduce x-query-usb QMP command
>    qapi: introduce x-query-rdma QMP command
>    qapi: introduce x-query-ramblock QMP command
>    qapi: introduce x-query-irq QMP command
>    qapi: introduce x-query-jit QMP command
>    qapi: introduce x-query-opcount QMP command
> 
>   accel/tcg/cpu-exec.c                          |  51 +++++-
>   accel/tcg/hmp.c                               |  22 +--
>   accel/tcg/translate-all.c                     |  84 +++++----
>   docs/devel/index.rst                          |   2 +-
>   ...mands.rst => writing-monitor-commands.rst} | 167 ++++++++++++++++--
>   hmp-commands-info.hx                          |  29 +--
>   hw/core/loader.c                              |  39 ++--
>   hw/core/machine-hmp-cmds.c                    |  38 +---
>   hw/core/machine-qmp-cmds.c                    |  40 +++++
>   hw/rdma/rdma_rm.c                             | 104 +++++------
>   hw/rdma/rdma_rm.h                             |   2 +-
>   hw/rdma/vmw/pvrdma_main.c                     |  31 ++--
>   hw/usb/bus.c                                  |  24 ++-
>   include/exec/cpu-all.h                        |   6 +-
>   include/exec/ramlist.h                        |   2 +-
>   include/hw/rdma/rdma.h                        |   2 +-
>   include/monitor/hmp-target.h                  |   1 -
>   include/monitor/hmp.h                         |   5 +-
>   include/monitor/monitor.h                     |   2 +
>   include/qapi/type-helpers.h                   |  14 ++
>   include/tcg/tcg.h                             |   4 +-
>   monitor/hmp-cmds.c                            |  99 ++---------
>   monitor/hmp.c                                 |  32 +++-
>   monitor/misc.c                                |  46 ++---
>   monitor/monitor-internal.h                    |   7 +
>   monitor/qmp-cmds.c                            | 116 ++++++++++++
>   qapi/common.json                              |  11 ++
>   qapi/machine.json                             | 110 ++++++++++++
>   qapi/meson.build                              |   3 +
>   qapi/qapi-type-helpers.c                      |  23 +++
>   softmmu/physmem.c                             |  19 +-
>   stubs/usb-dev-stub.c                          |   8 +
>   target/i386/monitor.c                         |   6 -
>   tcg/tcg.c                                     |  98 +++++-----
>   tests/qtest/qmp-cmd-test.c                    |   8 +
>   35 files changed, 829 insertions(+), 426 deletions(-)
>   rename docs/devel/{writing-qmp-commands.rst => writing-monitor-commands.rst} (75%)
>   create mode 100644 include/qapi/type-helpers.h
>   create mode 100644 qapi/qapi-type-helpers.c

Applied, thanks.

r~