[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 33/35] monitor: Move remaining QMP stuff from misc.c to qmp-cmds.c
From: |
Markus Armbruster |
Subject: |
[PULL 33/35] monitor: Move remaining QMP stuff from misc.c to qmp-cmds.c |
Date: |
Fri, 3 Feb 2023 09:45:47 +0100 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230124121946.1139465-31-armbru@redhat.com>
---
monitor/misc.c | 51 --------------------------------------------
monitor/qmp-cmds.c | 53 +++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/monitor/misc.c b/monitor/misc.c
index 52a7d7686e..9ddf32da97 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -27,14 +27,12 @@
#include "monitor/qdev.h"
#include "net/slirp.h"
#include "sysemu/device_tree.h"
-#include "qapi/qmp/qerror.h"
#include "monitor/hmp-target.h"
#include "monitor/hmp.h"
#include "block/block-hmp-cmds.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-commands-machine.h"
-#include "qapi/qapi-init-commands.h"
#include "qapi/error.h"
#include "qemu/cutils.h"
@@ -48,34 +46,6 @@
static HMPCommand hmp_info_cmds[];
-char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,
- int64_t cpu_index, Error **errp)
-{
- char *output = NULL;
- MonitorHMP hmp = {};
-
- monitor_data_init(&hmp.common, false, true, false);
-
- if (has_cpu_index) {
- int ret = monitor_set_cpu(&hmp.common, cpu_index);
- if (ret < 0) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index",
- "a CPU number");
- goto out;
- }
- }
-
- handle_hmp_command(&hmp, command_line);
-
- WITH_QEMU_LOCK_GUARD(&hmp.common.mon_lock) {
- output = g_strdup(hmp.common.outbuf->str);
- }
-
-out:
- monitor_data_destroy(&hmp.common);
- return output;
-}
-
/**
* Is @name in the '|' separated list of names @list?
*/
@@ -99,26 +69,6 @@ int hmp_compare_cmd(const char *name, const char *list)
return 0;
}
-static void monitor_init_qmp_commands(void)
-{
- /*
- * Two command lists:
- * - qmp_commands contains all QMP commands
- * - qmp_cap_negotiation_commands contains just
- * "qmp_capabilities", to enforce capability negotiation
- */
-
- qmp_init_marshal(&qmp_commands);
-
- qmp_register_command(&qmp_commands, "device_add",
- qmp_device_add, 0, 0);
-
- QTAILQ_INIT(&qmp_cap_negotiation_commands);
- qmp_register_command(&qmp_cap_negotiation_commands, "qmp_capabilities",
- qmp_marshal_qmp_capabilities,
- QCO_ALLOW_PRECONFIG, 0);
-}
-
/* Please update hmp-commands.hx when adding or changing commands */
static HMPCommand hmp_info_cmds[] = {
#include "hmp-commands-info.h"
@@ -230,6 +180,5 @@ void monitor_register_hmp_info_hrt(const char *name,
void monitor_init_globals(void)
{
monitor_init_globals_core();
- monitor_init_qmp_commands();
sortcmdlist();
}
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index cc22f3fcc7..859012aef4 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -14,7 +14,8 @@
*/
#include "qemu/osdep.h"
-#include "monitor/monitor.h"
+#include "monitor-internal.h"
+#include "monitor/qdev.h"
#include "monitor/qmp-helpers.h"
#include "sysemu/sysemu.h"
#include "sysemu/kvm.h"
@@ -22,8 +23,10 @@
#include "sysemu/runstate-action.h"
#include "sysemu/block-backend.h"
#include "qapi/error.h"
+#include "qapi/qapi-init-commands.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-misc.h"
+#include "qapi/qmp/qerror.h"
#include "qapi/type-helpers.h"
#include "hw/mem/memory-device.h"
#include "hw/intc/intc.h"
@@ -151,3 +154,51 @@ void qmp_add_client(const char *protocol, const char
*fdname,
close(fd);
}
}
+
+char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,
+ int64_t cpu_index, Error **errp)
+{
+ char *output = NULL;
+ MonitorHMP hmp = {};
+
+ monitor_data_init(&hmp.common, false, true, false);
+
+ if (has_cpu_index) {
+ int ret = monitor_set_cpu(&hmp.common, cpu_index);
+ if (ret < 0) {
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index",
+ "a CPU number");
+ goto out;
+ }
+ }
+
+ handle_hmp_command(&hmp, command_line);
+
+ WITH_QEMU_LOCK_GUARD(&hmp.common.mon_lock) {
+ output = g_strdup(hmp.common.outbuf->str);
+ }
+
+out:
+ monitor_data_destroy(&hmp.common);
+ return output;
+}
+
+static void __attribute__((__constructor__)) monitor_init_qmp_commands(void)
+{
+ /*
+ * Two command lists:
+ * - qmp_commands contains all QMP commands
+ * - qmp_cap_negotiation_commands contains just
+ * "qmp_capabilities", to enforce capability negotiation
+ */
+
+ qmp_init_marshal(&qmp_commands);
+
+ qmp_register_command(&qmp_commands, "device_add",
+ qmp_device_add, 0, 0);
+
+ QTAILQ_INIT(&qmp_cap_negotiation_commands);
+ qmp_register_command(&qmp_cap_negotiation_commands, "qmp_capabilities",
+ qmp_marshal_qmp_capabilities,
+ QCO_ALLOW_PRECONFIG, 0);
+}
--
2.39.0
- [PULL 03/35] MAINTAINERS: Cover tpm.c again, (continued)
- [PULL 03/35] MAINTAINERS: Cover tpm.c again, Markus Armbruster, 2023/02/03
- [PULL 24/35] runstate: Move HMP commands from monitor/ to softmmu/, Markus Armbruster, 2023/02/03
- [PULL 15/35] block: Factor out hmp_change_medium(), and move to block/monitor/, Markus Armbruster, 2023/02/03
- [PULL 30/35] monitor: Move monitor_putc() next to monitor_puts & external linkage, Markus Armbruster, 2023/02/03
- [PULL 18/35] net: Move HMP commands from monitor to net/, Markus Armbruster, 2023/02/03
- [PULL 28/35] qdev: Move HMP command completion from monitor to softmmu/, Markus Armbruster, 2023/02/03
- [PULL 35/35] monitor: Rename misc.c to hmp-target.c, Markus Armbruster, 2023/02/03
- [PULL 08/35] hmp: Drop redundant argument check from add_completion_option(), Markus Armbruster, 2023/02/03
- [PULL 31/35] monitor: Move target-dependent HMP commands to hmp-cmds-target.c, Markus Armbruster, 2023/02/03
- [PULL 01/35] MAINTAINERS: Cover userfaultfd, Markus Armbruster, 2023/02/03
- [PULL 33/35] monitor: Move remaining QMP stuff from misc.c to qmp-cmds.c,
Markus Armbruster <=
- [PULL 25/35] stats: Move QMP commands from monitor/ to stats/, Markus Armbruster, 2023/02/03
- [PULL 34/35] monitor: Loosen coupling between misc.c and monitor.c slightly, Markus Armbruster, 2023/02/03
- [PULL 20/35] migration: Move HMP commands from monitor/ to migration/, Markus Armbruster, 2023/02/03
- [PULL 05/35] audio: Move HMP commands from monitor/ to audio/, Markus Armbruster, 2023/02/03
- [PULL 26/35] stats: Move HMP commands from monitor/ to stats/, Markus Armbruster, 2023/02/03
- [PULL 23/35] tpm: Move HMP commands from monitor/ to softmmu/, Markus Armbruster, 2023/02/03
- [PULL 17/35] hmp: Rewrite strlist_from_comma_list() as hmp_split_at_comma(), Markus Armbruster, 2023/02/03
- [PULL 16/35] rocker: Move HMP commands from monitor to hw/net/rocker/, Markus Armbruster, 2023/02/03
- [PULL 32/35] monitor: Move remaining HMP commands from misc.c to hmp-cmds.c, Markus Armbruster, 2023/02/03
- [PULL 19/35] net: Move hmp_info_network() to net-hmp-cmds.c, Markus Armbruster, 2023/02/03