diff options
| author | Kevin Wolf | 2020-01-29 11:22:37 +0100 |
|---|---|---|
| committer | Markus Armbruster | 2020-02-17 13:53:47 +0100 |
| commit | fa4dcf577ea61758bf55b64c8f9590c29897fb82 (patch) | |
| tree | 63e88be69cb440706a74fa684beae890d7941457 /monitor | |
| parent | monitor: Move monitor option parsing to monitor/monitor.c (diff) | |
| download | qemu-fa4dcf577ea61758bf55b64c8f9590c29897fb82.tar.gz qemu-fa4dcf577ea61758bf55b64c8f9590c29897fb82.tar.xz qemu-fa4dcf577ea61758bf55b64c8f9590c29897fb82.zip | |
qapi: Split control.json off misc.json
misc.json contains definitions that are related to the system emulator,
so it can't be used for other tools like the storage daemon. This patch
moves basic functionality that is shared between all tools (and mostly
related to the monitor itself) into a new control.json, which could be
used in tools as well.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200129102239.31435-3-kwolf@redhat.com>
[Commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'monitor')
| -rw-r--r-- | monitor/hmp-cmds.c | 1 | ||||
| -rw-r--r-- | monitor/misc.c | 1 | ||||
| -rw-r--r-- | monitor/monitor-internal.h | 1 | ||||
| -rw-r--r-- | monitor/qmp-cmds.c | 1 | ||||
| -rw-r--r-- | monitor/qmp.c | 2 |
5 files changed, 5 insertions, 1 deletions
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 558fe06b8f..b237613e0d 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -31,6 +31,7 @@ #include "qapi/qapi-builtin-visit.h" #include "qapi/qapi-commands-block.h" #include "qapi/qapi-commands-char.h" +#include "qapi/qapi-commands-control.h" #include "qapi/qapi-commands-migration.h" #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-net.h" diff --git a/monitor/misc.c b/monitor/misc.c index 9c3484d0a7..b4303d42d0 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -67,6 +67,7 @@ #include "qemu/thread.h" #include "block/qapi.h" #include "qapi/qapi-commands-char.h" +#include "qapi/qapi-commands-control.h" #include "qapi/qapi-commands-migration.h" #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-qom.h" diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index d78f5ca190..4d402ded85 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -27,6 +27,7 @@ #include "chardev/char-fe.h" #include "monitor/monitor.h" +#include "qapi/qapi-types-control.h" #include "qapi/qmp/dispatch.h" #include "qapi/qmp/json-parser.h" #include "qemu/readline.h" diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index c6faa3eaf0..a55d2dffc2 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -32,6 +32,7 @@ #include "sysemu/block-backend.h" #include "qapi/error.h" #include "qapi/qapi-commands-block-core.h" +#include "qapi/qapi-commands-control.h" #include "qapi/qapi-commands-machine.h" #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-ui.h" diff --git a/monitor/qmp.c b/monitor/qmp.c index 54c06ba824..8379c8f96e 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -27,7 +27,7 @@ #include "chardev/char-io.h" #include "monitor-internal.h" #include "qapi/error.h" -#include "qapi/qapi-commands-misc.h" +#include "qapi/qapi-commands-control.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qlist.h" |