@@ -477,8 +477,7 @@ ETEXI
.args_type = "",
.params = "",
.help = "reset the system",
- .user_print = monitor_user_noop,
- .mhandler.cmd_new = do_system_reset,
+ .mhandler.cmd = hmp_system_reset,
},
STEXI
@@ -104,3 +104,8 @@ void hmp_stop(Monitor *mon, const QDict *qdict)
{
qmp_stop(NULL);
}
+
+void hmp_system_reset(Monitor *mon, const QDict *qdict)
+{
+ qmp_system_reset(NULL);
+}
@@ -25,5 +25,6 @@ void hmp_info_uuid(Monitor *mon);
void hmp_info_chardev(Monitor *mon);
void hmp_quit(Monitor *mon, const QDict *qdict);
void hmp_stop(Monitor *mon, const QDict *qdict);
+void hmp_system_reset(Monitor *mon, const QDict *qdict);
#endif
@@ -1929,16 +1929,6 @@ static void do_boot_set(Monitor *mon, const QDict *qdict)
}
/**
- * do_system_reset(): Issue a machine reset
- */
-static int do_system_reset(Monitor *mon, const QDict *qdict,
- QObject **ret_data)
-{
- qemu_system_reset_request();
- return 0;
-}
-
-/**
* do_system_powerdown(): Issue a machine powerdown
*/
static int do_system_powerdown(Monitor *mon, const QDict *qdict,
@@ -248,3 +248,12 @@
# state
##
{ 'command': 'stop' }
+
+##
+# @system_reset:
+#
+# Performs a hard reset of a guest.
+#
+# Since: 0.14.0
+##
+{ 'command': 'system_reset' }
@@ -223,10 +223,7 @@ EQMP
{
.name = "system_reset",
.args_type = "",
- .params = "",
- .help = "reset the system",
- .user_print = monitor_user_noop,
- .mhandler.cmd_new = do_system_reset,
+ .mhandler.cmd_new = qmp_marshal_input_system_reset,
},
SQMP
@@ -81,3 +81,7 @@ void qmp_stop(Error **errp)
vm_stop(RSTATE_PAUSED);
}
+void qmp_system_reset(Error **errp)
+{
+ qemu_system_reset_request();
+}
The original conversion was done by Anthony Liguori. This commit is just a rebase. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> --- hmp-commands.hx | 3 +-- hmp.c | 5 +++++ hmp.h | 1 + monitor.c | 10 ---------- qapi-schema.json | 9 +++++++++ qmp-commands.hx | 5 +---- qmp.c | 4 ++++ 7 files changed, 21 insertions(+), 16 deletions(-)