This moves these commands from MAINTAINERS section "Human
Monitor (HMP)" and "QMP" to "Main loop".
Signed-off-by: Markus Armbruster <armbru@xxxxxxxxxx>
---
MAINTAINERS | 3 +-
include/monitor/hmp.h | 2 +
monitor/hmp-cmds.c | 20 ---------
monitor/misc.c | 42 -------------------
softmmu/runstate-hmp-cmds.c | 82 +++++++++++++++++++++++++++++++++++++
softmmu/meson.build | 1 +
6 files changed, 86 insertions(+), 64 deletions(-)
create mode 100644 softmmu/runstate-hmp-cmds.c
diff --git a/MAINTAINERS b/MAINTAINERS
index dab4def753..b2f1d2518b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2804,8 +2804,7 @@ F: softmmu/cpus.c
F: softmmu/cpu-throttle.c
F: softmmu/cpu-timers.c
F: softmmu/icount.c
-F: softmmu/runstate-action.c
-F: softmmu/runstate.c
+F: softmmu/runstate*
F: qapi/run-state.json
Read, Copy, Update (RCU)
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index a248ee9ed1..941da9fde6 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -156,6 +156,8 @@ void hmp_info_vcpu_dirty_limit(Monitor *mon, const QDict *qdict);
void hmp_human_readable_text_helper(Monitor *mon,
HumanReadableText *(*qmp_handler)(Error **));
void hmp_info_stats(Monitor *mon, const QDict *qdict);
+void hmp_singlestep(Monitor *mon, const QDict *qdict);
+void hmp_watchdog_action(Monitor *mon, const QDict *qdict);
void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict);
void hmp_info_capture(Monitor *mon, const QDict *qdict);
void hmp_stopcapture(Monitor *mon, const QDict *qdict);
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 81f63fa8ec..34e98b0e0b 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -20,7 +20,6 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-misc.h"
-#include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-commands-stats.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
@@ -80,25 +79,6 @@ void hmp_info_version(Monitor *mon, const QDict *qdict)
qapi_free_VersionInfo(info);
}
-void hmp_info_status(Monitor *mon, const QDict *qdict)
-{
- StatusInfo *info;
-
- info = qmp_query_status(NULL);
-
- monitor_printf(mon, "VM status: %s%s",
- info->running ? "running" : "paused",
- info->singlestep ? " (single step mode)" : "");
-
- if (!info->running && info->status != RUN_STATE_PAUSED) {
- monitor_printf(mon, " (%s)", RunState_str(info->status));
- }
-
- monitor_printf(mon, "\n");
-
- qapi_free_StatusInfo(info);
-}
-
static int hmp_info_pic_foreach(Object *obj, void *opaque)
{
InterruptStatsProvider *intc;
diff --git a/monitor/misc.c b/monitor/misc.c
index ff3002a880..a2584df0ca 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -43,7 +43,6 @@
#include "block/block-hmp-cmds.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-misc.h"
-#include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-commands-machine.h"
#include "qapi/qapi-init-commands.h"
#include "qapi/error.h"
@@ -319,18 +318,6 @@ static void hmp_log(Monitor *mon, const QDict *qdict)
}
}
-static void hmp_singlestep(Monitor *mon, const QDict *qdict)
-{
- const char *option = qdict_get_try_str(qdict, "option");
- if (!option || !strcmp(option, "on")) {
- singlestep = 1;
- } else if (!strcmp(option, "off")) {
- singlestep = 0;
- } else {
- monitor_printf(mon, "unexpected option %s\n", option);
- }
-}
-
static void hmp_gdbserver(Monitor *mon, const QDict *qdict)
{
const char *device = qdict_get_try_str(qdict, "device");
@@ -349,22 +336,6 @@ static void hmp_gdbserver(Monitor *mon, const QDict *qdict)
}
}
-static void hmp_watchdog_action(Monitor *mon, const QDict *qdict)
-{
- Error *err = NULL;
- WatchdogAction action;
- char *qapi_value;
-
- qapi_value = g_ascii_strdown(qdict_get_str(qdict, "action"), -1);
- action = qapi_enum_parse(&WatchdogAction_lookup, qapi_value, -1, &err);
- g_free(qapi_value);
- if (err) {
- hmp_handle_error(mon, err);
- return;
- }
- qmp_watchdog_set_action(action, &error_abort);
-}
-
static void monitor_printc(Monitor *mon, int c)
{
monitor_printf(mon, "'");
@@ -1317,19 +1288,6 @@ void device_del_completion(ReadLineState *rs, int nb_args, const char *str)
peripheral_device_del_completion(rs, str);
}
-void watchdog_action_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- int i;
-
- if (nb_args != 2) {
- return;
- }
- readline_set_completion_index(rs, strlen(str));
- for (i = 0; i < WATCHDOG_ACTION__MAX; i++) {
- readline_add_completion_of(rs, str, WatchdogAction_str(i));
- }
-}
-
static int
compare_mon_cmd(const void *a, const void *b)
{
diff --git a/softmmu/runstate-hmp-cmds.c b/softmmu/runstate-hmp-cmds.c
new file mode 100644
index 0000000000..d55a7d4db8
--- /dev/null
+++ b/softmmu/runstate-hmp-cmds.c
@@ -0,0 +1,82 @@
+/*
+ * HMP commands related to run state
+ *
+ * Copyright IBM, Corp. 2011
+ *
+ * Authors:
+ * Anthony Liguori <aliguori@xxxxxxxxxx>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
+ */
+
+#include "qemu/osdep.h"
+#include "exec/cpu-common.h"
+#include "monitor/hmp.h"
+#include "monitor/monitor.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-run-state.h"
+#include "qapi/qmp/qdict.h"
+
+void hmp_info_status(Monitor *mon, const QDict *qdict)
+{
+ StatusInfo *info;
+
+ info = qmp_query_status(NULL);
+
+ monitor_printf(mon, "VM status: %s%s",
+ info->running ? "running" : "paused",
+ info->singlestep ? " (single step mode)" : "");
+
+ if (!info->running && info->status != RUN_STATE_PAUSED) {
+ monitor_printf(mon, " (%s)", RunState_str(info->status));
+ }
+
+ monitor_printf(mon, "\n");
+
+ qapi_free_StatusInfo(info);
+}
+
+void hmp_singlestep(Monitor *mon, const QDict *qdict)
+{
+ const char *option = qdict_get_try_str(qdict, "option");
+ if (!option || !strcmp(option, "on")) {
+ singlestep = 1;
+ } else if (!strcmp(option, "off")) {
+ singlestep = 0;
+ } else {
+ monitor_printf(mon, "unexpected option %s\n", option);
+ }
+}
+
+void hmp_watchdog_action(Monitor *mon, const QDict *qdict)
+{
+ Error *err = NULL;
+ WatchdogAction action;
+ char *qapi_value;
+
+ qapi_value = g_ascii_strdown(qdict_get_str(qdict, "action"), -1);
+ action = qapi_enum_parse(&WatchdogAction_lookup, qapi_value, -1, &err);
+ g_free(qapi_value);
+ if (err) {
+ hmp_handle_error(mon, err);
+ return;
+ }
+ qmp_watchdog_set_action(action, &error_abort);
+}
+
+void watchdog_action_completion(ReadLineState *rs, int nb_args, const char *str)
+{
+ int i;
+
+ if (nb_args != 2) {
+ return;
+ }
+ readline_set_completion_index(rs, strlen(str));
+ for (i = 0; i < WATCHDOG_ACTION__MAX; i++) {
+ readline_add_completion_of(rs, str, WatchdogAction_str(i));
+ }
+}
diff --git a/softmmu/meson.build b/softmmu/meson.build
index efbf4ec029..1828db149c 100644
--- a/softmmu/meson.build
+++ b/softmmu/meson.build
@@ -24,6 +24,7 @@ softmmu_ss.add(files(
'qdev-monitor.c',
'rtc.c',
'runstate-action.c',
+ 'runstate-hmp-cmds.c',
'runstate.c',
'tpm-hmp-cmds.c',
'vl.c',
--
2.39.0
