mbox

[PULL,0/5] Monitor patches for 2020-02-15

Message ID 20200215130527.28861-1-armbru@redhat.com
State New
Headers show

Pull-request

git://repo.or.cz/qemu/armbru.git tags/pull-monitor-2020-02-15

Message

Markus Armbruster Feb. 15, 2020, 1:05 p.m. UTC
The following changes since commit b29c3e23f64938784c42ef9fca896829e3c19120:

  Merge remote-tracking branch 'remotes/juanquintela/tags/pull-migration-pull-request' into staging (2020-02-14 17:57:15 +0000)

are available in the Git repository at:

  git://repo.or.cz/qemu/armbru.git tags/pull-monitor-2020-02-15

for you to fetch changes up to 6fce5a08f89d4ebf197fca838d60239482db957f:

  qemu-doc: Clarify extent of build platform support (2020-02-15 12:44:28 +0100)

----------------------------------------------------------------
Monitor patches for 2020-02-15

* Refactoring in preparation for qemu-storage-daemon

* A doc clarification that's admittedly not about the monitor

----------------------------------------------------------------
Kevin Wolf (4):
      monitor: Move monitor option parsing to monitor/monitor.c
      qapi: Split control.json off misc.json
      monitor: Collect "control" command handlers in qmp-cmds.control.c
      monitor: Move qmp_query_qmp_schema to qmp-cmds-control.c

Markus Armbruster (1):
      qemu-doc: Clarify extent of build platform support

 qemu-doc.texi              |   9 +-
 qapi/control.json          | 218 +++++++++++++++++++++++++++++++++++++++++++++
 qapi/misc.json             | 212 -------------------------------------------
 qapi/qapi-schema.json      |   1 +
 include/monitor/monitor.h  |   3 +
 include/sysemu/sysemu.h    |   1 -
 monitor/monitor-internal.h |   4 +
 monitor/hmp-cmds.c         |   1 +
 monitor/misc.c             | 127 +-------------------------
 monitor/monitor.c          |  48 ++++++++++
 monitor/qmp-cmds-control.c | 169 +++++++++++++++++++++++++++++++++++
 monitor/qmp-cmds.c         |  15 +---
 monitor/qmp.c              |   2 +-
 tests/qtest/qmp-test.c     |   2 +-
 ui/gtk.c                   |   1 +
 vl.c                       |  45 +---------
 monitor/Makefile.objs      |   3 +-
 qapi/Makefile.objs         |   6 +-
 18 files changed, 460 insertions(+), 407 deletions(-)
 create mode 100644 qapi/control.json
 create mode 100644 monitor/qmp-cmds-control.c

Kevin Wolf (4):
  monitor: Move monitor option parsing to monitor/monitor.c
  qapi: Split control.json off misc.json
  monitor: Collect "control" command handlers in qmp-cmds.control.c
  monitor: Move qmp_query_qmp_schema to qmp-cmds-control.c

Markus Armbruster (1):
  qemu-doc: Clarify extent of build platform support

 qemu-doc.texi              |   9 +-
 qapi/control.json          | 218 +++++++++++++++++++++++++++++++++++++
 qapi/misc.json             | 212 ------------------------------------
 qapi/qapi-schema.json      |   1 +
 include/monitor/monitor.h  |   3 +
 include/sysemu/sysemu.h    |   1 -
 monitor/monitor-internal.h |   4 +
 monitor/hmp-cmds.c         |   1 +
 monitor/misc.c             | 127 +--------------------
 monitor/monitor.c          |  48 ++++++++
 monitor/qmp-cmds-control.c | 169 ++++++++++++++++++++++++++++
 monitor/qmp-cmds.c         |  15 +--
 monitor/qmp.c              |   2 +-
 tests/qtest/qmp-test.c     |   2 +-
 ui/gtk.c                   |   1 +
 vl.c                       |  45 +-------
 monitor/Makefile.objs      |   3 +-
 qapi/Makefile.objs         |   6 +-
 18 files changed, 460 insertions(+), 407 deletions(-)
 create mode 100644 qapi/control.json
 create mode 100644 monitor/qmp-cmds-control.c

Comments

Peter Maydell Feb. 17, 2020, 10 a.m. UTC | #1
On Sat, 15 Feb 2020 at 13:08, Markus Armbruster <armbru@redhat.com> wrote:
>
> The following changes since commit b29c3e23f64938784c42ef9fca896829e3c19120:
>
>   Merge remote-tracking branch 'remotes/juanquintela/tags/pull-migration-pull-request' into staging (2020-02-14 17:57:15 +0000)
>
> are available in the Git repository at:
>
>   git://repo.or.cz/qemu/armbru.git tags/pull-monitor-2020-02-15
>
> for you to fetch changes up to 6fce5a08f89d4ebf197fca838d60239482db957f:
>
>   qemu-doc: Clarify extent of build platform support (2020-02-15 12:44:28 +0100)
>
> ----------------------------------------------------------------
> Monitor patches for 2020-02-15
>
> * Refactoring in preparation for qemu-storage-daemon
>
> * A doc clarification that's admittedly not about the monitor
>
> ----------------------------------------------------------------
> Kevin Wolf (4):
>       monitor: Move monitor option parsing to monitor/monitor.c
>       qapi: Split control.json off misc.json
>       monitor: Collect "control" command handlers in qmp-cmds.control.c
>       monitor: Move qmp_query_qmp_schema to qmp-cmds-control.c
>
> Markus Armbruster (1):
>       qemu-doc: Clarify extent of build platform support

Hi; I'm afraid this has merge conflicts with your other
qapi pullreq. Could you respin, please?

thanks
-- PMM