[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/4] monitor: Create monitor/qmp-cmds-monitor.c
|
From: |
Kevin Wolf |
|
Subject: |
[PATCH 3/4] monitor: Create monitor/qmp-cmds-monitor.c |
|
Date: |
Wed, 18 Dec 2019 17:19:51 +0100 |
Move all of the QMP commands handlers to implement the 'monitor' module
(qapi/monitor.json) that can be shared between the system emulator and
tools such as a storage daemon to a new file monitor/qmp-cmds-monitor.c.
Signed-off-by: Kevin Wolf <address@hidden>
---
monitor/misc.c | 110 --------------------------
monitor/qmp-cmds-monitor.c | 153 +++++++++++++++++++++++++++++++++++++
monitor/qmp-cmds.c | 14 ----
monitor/Makefile.objs | 3 +-
4 files changed, 155 insertions(+), 125 deletions(-)
create mode 100644 monitor/qmp-cmds-monitor.c
diff --git a/monitor/misc.c b/monitor/misc.c
index 3baa15f3bf..c647ba6313 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -67,7 +67,6 @@
#include "qemu/thread.h"
#include "block/qapi.h"
#include "qapi/qapi-commands.h"
-#include "qapi/qapi-emit-events.h"
#include "qapi/error.h"
#include "qapi/qmp-event.h"
#include "qapi/qapi-introspect.h"
@@ -230,58 +229,6 @@ static void hmp_info_help(Monitor *mon, const QDict *qdict)
help_cmd(mon, "info");
}
-static void query_commands_cb(QmpCommand *cmd, void *opaque)
-{
- CommandInfoList *info, **list = opaque;
-
- if (!cmd->enabled) {
- return;
- }
-
- info = g_malloc0(sizeof(*info));
- info->value = g_malloc0(sizeof(*info->value));
- info->value->name = g_strdup(cmd->name);
- info->next = *list;
- *list = info;
-}
-
-CommandInfoList *qmp_query_commands(Error **errp)
-{
- CommandInfoList *list = NULL;
- MonitorQMP *mon;
-
- assert(monitor_is_qmp(cur_mon));
- mon = container_of(cur_mon, MonitorQMP, common);
-
- qmp_for_each_command(mon->commands, query_commands_cb, &list);
-
- return list;
-}
-
-EventInfoList *qmp_query_events(Error **errp)
-{
- /*
- * TODO This deprecated command is the only user of
- * QAPIEvent_str() and QAPIEvent_lookup[]. When the command goes,
- * they should go, too.
- */
- EventInfoList *info, *ev_list = NULL;
- QAPIEvent e;
-
- for (e = 0 ; e < QAPI_EVENT__MAX ; e++) {
- const char *event_name = QAPIEvent_str(e);
- assert(event_name != NULL);
- info = g_malloc0(sizeof(*info));
- info->value = g_malloc0(sizeof(*info->value));
- info->value->name = g_strdup(event_name);
-
- info->next = ev_list;
- ev_list = info;
- }
-
- return ev_list;
-}
-
/*
* Minor hack: generated marshalling suppressed for this command
* ('gen': false in the schema) so we can parse the JSON string
@@ -320,63 +267,6 @@ static void monitor_init_qmp_commands(void)
qmp_marshal_qmp_capabilities, QCO_ALLOW_PRECONFIG);
}
-/*
- * Accept QMP capabilities in @list for @mon.
- * On success, set mon->qmp.capab[], and return true.
- * On error, set @errp, and return false.
- */
-static bool qmp_caps_accept(MonitorQMP *mon, QMPCapabilityList *list,
- Error **errp)
-{
- GString *unavailable = NULL;
- bool capab[QMP_CAPABILITY__MAX];
-
- memset(capab, 0, sizeof(capab));
-
- for (; list; list = list->next) {
- if (!mon->capab_offered[list->value]) {
- if (!unavailable) {
- unavailable = g_string_new(QMPCapability_str(list->value));
- } else {
- g_string_append_printf(unavailable, ", %s",
- QMPCapability_str(list->value));
- }
- }
- capab[list->value] = true;
- }
-
- if (unavailable) {
- error_setg(errp, "Capability %s not available", unavailable->str);
- g_string_free(unavailable, true);
- return false;
- }
-
- memcpy(mon->capab, capab, sizeof(capab));
- return true;
-}
-
-void qmp_qmp_capabilities(bool has_enable, QMPCapabilityList *enable,
- Error **errp)
-{
- MonitorQMP *mon;
-
- assert(monitor_is_qmp(cur_mon));
- mon = container_of(cur_mon, MonitorQMP, common);
-
- if (mon->commands == &qmp_commands) {
- error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
- "Capabilities negotiation is already complete, command "
- "ignored");
- return;
- }
-
- if (!qmp_caps_accept(mon, enable, errp)) {
- return;
- }
-
- mon->commands = &qmp_commands;
-}
-
/* Set the current CPU defined by the user. Callers must hold BQL. */
int monitor_set_cpu(int cpu_index)
{
diff --git a/monitor/qmp-cmds-monitor.c b/monitor/qmp-cmds-monitor.c
new file mode 100644
index 0000000000..acebfd3716
--- /dev/null
+++ b/monitor/qmp-cmds-monitor.c
@@ -0,0 +1,153 @@
+/*
+ * QMP commands related to the monitor (common functions for sysemu and tools)
+ *
+ * Copyright (c) 2003-2004 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "qemu/osdep.h"
+
+#include "monitor-internal.h"
+#include "qemu-version.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-monitor.h"
+#include "qapi/qapi-emit-events.h"
+
+/*
+ * Accept QMP capabilities in @list for @mon.
+ * On success, set mon->qmp.capab[], and return true.
+ * On error, set @errp, and return false.
+ */
+static bool qmp_caps_accept(MonitorQMP *mon, QMPCapabilityList *list,
+ Error **errp)
+{
+ GString *unavailable = NULL;
+ bool capab[QMP_CAPABILITY__MAX];
+
+ memset(capab, 0, sizeof(capab));
+
+ for (; list; list = list->next) {
+ if (!mon->capab_offered[list->value]) {
+ if (!unavailable) {
+ unavailable = g_string_new(QMPCapability_str(list->value));
+ } else {
+ g_string_append_printf(unavailable, ", %s",
+ QMPCapability_str(list->value));
+ }
+ }
+ capab[list->value] = true;
+ }
+
+ if (unavailable) {
+ error_setg(errp, "Capability %s not available", unavailable->str);
+ g_string_free(unavailable, true);
+ return false;
+ }
+
+ memcpy(mon->capab, capab, sizeof(capab));
+ return true;
+}
+
+void qmp_qmp_capabilities(bool has_enable, QMPCapabilityList *enable,
+ Error **errp)
+{
+ MonitorQMP *mon;
+
+ assert(monitor_is_qmp(cur_mon));
+ mon = container_of(cur_mon, MonitorQMP, common);
+
+ if (mon->commands == &qmp_commands) {
+ error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
+ "Capabilities negotiation is already complete, command "
+ "ignored");
+ return;
+ }
+
+ if (!qmp_caps_accept(mon, enable, errp)) {
+ return;
+ }
+
+ mon->commands = &qmp_commands;
+}
+
+VersionInfo *qmp_query_version(Error **errp)
+{
+ VersionInfo *info = g_new0(VersionInfo, 1);
+
+ info->qemu = g_new0(VersionTriple, 1);
+ info->qemu->major = QEMU_VERSION_MAJOR;
+ info->qemu->minor = QEMU_VERSION_MINOR;
+ info->qemu->micro = QEMU_VERSION_MICRO;
+ info->package = g_strdup(QEMU_PKGVERSION);
+
+ return info;
+}
+
+static void query_commands_cb(QmpCommand *cmd, void *opaque)
+{
+ CommandInfoList *info, **list = opaque;
+
+ if (!cmd->enabled) {
+ return;
+ }
+
+ info = g_malloc0(sizeof(*info));
+ info->value = g_malloc0(sizeof(*info->value));
+ info->value->name = g_strdup(cmd->name);
+ info->next = *list;
+ *list = info;
+}
+
+CommandInfoList *qmp_query_commands(Error **errp)
+{
+ CommandInfoList *list = NULL;
+ MonitorQMP *mon;
+
+ assert(monitor_is_qmp(cur_mon));
+ mon = container_of(cur_mon, MonitorQMP, common);
+
+ qmp_for_each_command(mon->commands, query_commands_cb, &list);
+
+ return list;
+}
+
+EventInfoList *qmp_query_events(Error **errp)
+{
+ /*
+ * TODO This deprecated command is the only user of
+ * QAPIEvent_str() and QAPIEvent_lookup[]. When the command goes,
+ * they should go, too.
+ */
+ EventInfoList *info, *ev_list = NULL;
+ QAPIEvent e;
+
+ for (e = 0 ; e < QAPI_EVENT__MAX ; e++) {
+ const char *event_name = QAPIEvent_str(e);
+ assert(event_name != NULL);
+ info = g_malloc0(sizeof(*info));
+ info->value = g_malloc0(sizeof(*info->value));
+ info->value->name = g_strdup(event_name);
+
+ info->next = ev_list;
+ ev_list = info;
+ }
+
+ return ev_list;
+}
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index b40a9b74de..22a3375194 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -15,7 +15,6 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "qemu-version.h"
#include "qemu/cutils.h"
#include "qemu/option.h"
#include "monitor/monitor.h"
@@ -52,19 +51,6 @@ NameInfo *qmp_query_name(Error **errp)
return info;
}
-VersionInfo *qmp_query_version(Error **errp)
-{
- VersionInfo *info = g_new0(VersionInfo, 1);
-
- info->qemu = g_new0(VersionTriple, 1);
- info->qemu->major = QEMU_VERSION_MAJOR;
- info->qemu->minor = QEMU_VERSION_MINOR;
- info->qemu->micro = QEMU_VERSION_MICRO;
- info->package = g_strdup(QEMU_PKGVERSION);
-
- return info;
-}
-
KvmInfo *qmp_query_kvm(Error **errp)
{
KvmInfo *info = g_malloc0(sizeof(*info));
diff --git a/monitor/Makefile.objs b/monitor/Makefile.objs
index e91a8581cd..15eb6380c5 100644
--- a/monitor/Makefile.objs
+++ b/monitor/Makefile.objs
@@ -1,3 +1,4 @@
obj-y += misc.o
common-obj-y += monitor.o qmp.o hmp.o
-common-obj-y += qmp-cmds.o hmp-cmds.o
+common-obj-y += qmp-cmds.o qmp-cmds-monitor.o
+common-obj-y += hmp-cmds.o
--
2.20.1