提交 38d22653 编写于 作者: L Luiz Capitulino

qapi: Convert system_reset

Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
Signed-off-by: NLuiz Capitulino <lcapitulino@redhat.com>
上级 5f158f21
...@@ -477,8 +477,7 @@ ETEXI ...@@ -477,8 +477,7 @@ ETEXI
.args_type = "", .args_type = "",
.params = "", .params = "",
.help = "reset the system", .help = "reset the system",
.user_print = monitor_user_noop, .mhandler.cmd = hmp_system_reset,
.mhandler.cmd_new = do_system_reset,
}, },
STEXI STEXI
......
...@@ -104,3 +104,8 @@ void hmp_stop(Monitor *mon, const QDict *qdict) ...@@ -104,3 +104,8 @@ void hmp_stop(Monitor *mon, const QDict *qdict)
{ {
qmp_stop(NULL); 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); ...@@ -25,5 +25,6 @@ void hmp_info_uuid(Monitor *mon);
void hmp_info_chardev(Monitor *mon); void hmp_info_chardev(Monitor *mon);
void hmp_quit(Monitor *mon, const QDict *qdict); void hmp_quit(Monitor *mon, const QDict *qdict);
void hmp_stop(Monitor *mon, const QDict *qdict); void hmp_stop(Monitor *mon, const QDict *qdict);
void hmp_system_reset(Monitor *mon, const QDict *qdict);
#endif #endif
...@@ -1929,16 +1929,6 @@ static void do_boot_set(Monitor *mon, const QDict *qdict) ...@@ -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 * do_system_powerdown(): Issue a machine powerdown
*/ */
......
...@@ -248,3 +248,12 @@ ...@@ -248,3 +248,12 @@
# state # state
## ##
{ 'command': 'stop' } { 'command': 'stop' }
##
# @system_reset:
#
# Performs a hard reset of a guest.
#
# Since: 0.14.0
##
{ 'command': 'system_reset' }
...@@ -223,10 +223,7 @@ EQMP ...@@ -223,10 +223,7 @@ EQMP
{ {
.name = "system_reset", .name = "system_reset",
.args_type = "", .args_type = "",
.params = "", .mhandler.cmd_new = qmp_marshal_input_system_reset,
.help = "reset the system",
.user_print = monitor_user_noop,
.mhandler.cmd_new = do_system_reset,
}, },
SQMP SQMP
......
...@@ -81,3 +81,7 @@ void qmp_stop(Error **errp) ...@@ -81,3 +81,7 @@ void qmp_stop(Error **errp)
vm_stop(RUN_STATE_PAUSED); vm_stop(RUN_STATE_PAUSED);
} }
void qmp_system_reset(Error **errp)
{
qemu_system_reset_request();
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册