qapi: Convert system_reset

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 3ad1ce7df9d2772e8f436113b266bfab23a0b04e..b2f5cd1f47ce045a40fbbbae91d2509ca7eb09c4 100644 (file)
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -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

diff --git a/hmp.c b/hmp.c
index efcb74456210d8920c2d6efca0824e1baeb854d1..24f30bc948288b60ebfd997ef6faed4511496013 100644 (file)
--- a/hmp.c
+++ b/hmp.c
@@ -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);
+}

diff --git a/hmp.h b/hmp.h
index cb21ccea94ecb40df487805df7ba0866a58bc206..a49a6e674b55623915bedc34aab6c2004982c0f4 100644 (file)
--- a/hmp.h
+++ b/hmp.h
@@ -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

diff --git a/monitor.c b/monitor.c
index 2a5230caa51aa289e94bb05b2abefec91f213996..c22687924fdae17fad0c5e1246fea5d321a83223 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -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
  */

diff --git a/qapi-schema.json b/qapi-schema.json
index cd05034953b2241a762b7ff652c24dc986069019..02de4b55c66d571a4e22df6d42ed83ba0c96ab88 100644 (file)
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -248,3 +248,12 @@
 #         state
 ##
 { 'command': 'stop' }
+
+##
+# @system_reset:
+#
+# Performs a hard reset of a guest.
+#
+# Since: 0.14.0
+##
+{ 'command': 'system_reset' }

diff --git a/qmp-commands.hx b/qmp-commands.hx
index 2ccddeed2ad541a65910063e0f876e4db2aead00..ea96191c12830deb5f72de3a2cb6cf674c9a2ba2 100644 (file)
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -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

diff --git a/qmp.c b/qmp.c
index 6c464792ece127ff5c040b2326a439ed190e6b0b..51d93832a19fc8d743c27888c0275c7519c0f732 100644 (file)
--- a/qmp.c
+++ b/qmp.c
@@ -81,3 +81,7 @@ void qmp_stop(Error **errp)
     vm_stop(RUN_STATE_PAUSED);
 }
 
+void qmp_system_reset(Error **errp)
+{
+    qemu_system_reset_request();
+}