From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56729) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRH8Q-0005VH-W4 for qemu-devel@nongnu.org; Fri, 08 Jun 2018 09:08:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRH8Q-0006i9-6O for qemu-devel@nongnu.org; Fri, 08 Jun 2018 09:08:54 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:41578 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fRH8Q-0006hy-1O for qemu-devel@nongnu.org; Fri, 08 Jun 2018 09:08:54 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AD444400E9BA for ; Fri, 8 Jun 2018 13:08:53 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" Date: Fri, 8 Jun 2018 14:08:45 +0100 Message-Id: <20180608130846.22234-7-dgilbert@redhat.com> In-Reply-To: <20180608130846.22234-1-dgilbert@redhat.com> References: <20180608130846.22234-1-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v3 6/7] hmp: add exit_preconfig List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, armbru@redhat.com, imammedo@redhat.com From: "Dr. David Alan Gilbert" Add the exit_preconfig command to return to normality. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu Reviewed-by: Igor Mammedov --- hmp-commands.hx | 15 +++++++++++++++ hmp.c | 7 +++++++ hmp.h | 1 + 3 files changed, 23 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index dc82ed526f..40e2f6ca08 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -55,6 +55,21 @@ STEXI @item q or quit @findex quit Quit the emulator. +ETEXI + + { + .name = "exit_preconfig", + .args_type = "", + .params = "", + .help = "exit the preconfig state", + .cmd = hmp_exit_preconfig, + .flags = "p", + }, + +STEXI +@item exit_preconfig +@findex exit_preconfig +Exit the preconfig state ETEXI { diff --git a/hmp.c b/hmp.c index ef93f4878b..c7be6ed394 100644 --- a/hmp.c +++ b/hmp.c @@ -1065,6 +1065,13 @@ void hmp_system_powerdown(Monitor *mon, const QDict *qdict) qmp_system_powerdown(NULL); } +void hmp_exit_preconfig(Monitor *mon, const QDict *qdict) +{ + Error *err = NULL; + qmp_exit_preconfig(&err); + hmp_handle_error(mon, &err); +} + void hmp_cpu(Monitor *mon, const QDict *qdict) { int64_t cpu_index; diff --git a/hmp.h b/hmp.h index 20f27439d3..33354f1bdd 100644 --- a/hmp.h +++ b/hmp.h @@ -44,6 +44,7 @@ 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); void hmp_system_powerdown(Monitor *mon, const QDict *qdict); +void hmp_exit_preconfig(Monitor *mon, const QDict *qdict); void hmp_cpu(Monitor *mon, const QDict *qdict); void hmp_memsave(Monitor *mon, const QDict *qdict); void hmp_pmemsave(Monitor *mon, const QDict *qdict); -- 2.17.0