From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sn5Gp-000058-3u for qemu-devel@nongnu.org; Fri, 06 Jul 2012 05:56:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sn5Gi-0006bS-UF for qemu-devel@nongnu.org; Fri, 06 Jul 2012 05:56:14 -0400 Received: from [222.73.24.84] (port=15373 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sn5Gi-0006b9-Iu for qemu-devel@nongnu.org; Fri, 06 Jul 2012 05:56:08 -0400 Message-ID: <4FF6B2E7.2060405@cn.fujitsu.com> Date: Fri, 06 Jul 2012 17:41:59 +0800 From: Wen Congyang MIME-Version: 1.0 References: <4FF6B188.2060607@cn.fujitsu.com> In-Reply-To: <4FF6B188.2060607@cn.fujitsu.com> Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=ISO-8859-1 Subject: [Qemu-devel] [PATCH 7/7 v6] deal with panicked event accoring to '-machine panic_action=action' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm list , qemu-devel , "linux-kernel@vger.kernel.org" , Avi Kivity , "Daniel P. Berrange" , KAMEZAWA Hiroyuki , Jan Kiszka , Gleb Natapov The action is the same as -onpanic parameter. Signed-off-by: Wen Congyang --- qemu-config.c | 4 ++++ qemu-options.hx | 4 +++- vl.c | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/qemu-config.c b/qemu-config.c index 5c3296b..805e7c4 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -595,6 +595,10 @@ static QemuOptsList qemu_machine_opts = { .name = "dt_compatible", .type = QEMU_OPT_STRING, .help = "Overrides the \"compatible\" property of the dt root node", + }, { + .name = "panic_action", + .type = QEMU_OPT_STRING, + .help = "The action what QEMU will do when the guest is panicked", }, { /* End of list */ } }, diff --git a/qemu-options.hx b/qemu-options.hx index 4a061bf..083a21d 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -33,7 +33,9 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " property accel=accel1[:accel2[:...]] selects accelerator\n" " supported accelerators are kvm, xen, tcg (default: tcg)\n" " kernel_irqchip=on|off controls accelerated irqchip support\n" - " kvm_shadow_mem=size of KVM shadow MMU\n", + " kvm_shadow_mem=size of KVM shadow MMU\n" + " panic_action=none|pause|poweroff|reset controls what QEmu\n" + " will do when the guest is panicked", QEMU_ARCH_ALL) STEXI @item -machine [type=]@var{name}[,prop=@var{value}[,...]] diff --git a/vl.c b/vl.c index 1a68257..091c43b 100644 --- a/vl.c +++ b/vl.c @@ -2301,6 +2301,7 @@ int main(int argc, char **argv, char **envp) }; const char *trace_events = NULL; const char *trace_file = NULL; + const char *panic_action = NULL; atexit(qemu_run_exit_notifiers); error_set_progname(argv[0]); @@ -3372,10 +3373,16 @@ int main(int argc, char **argv, char **envp) kernel_filename = qemu_opt_get(machine_opts, "kernel"); initrd_filename = qemu_opt_get(machine_opts, "initrd"); kernel_cmdline = qemu_opt_get(machine_opts, "append"); + panic_action = qemu_opt_get(machine_opts, "panic_action"); } else { kernel_filename = initrd_filename = kernel_cmdline = NULL; } + if (panic_action && select_panicked_action(panic_action) == -1) { + fprintf(stderr, "Unknown -panic_action parameter\n"); + exit(1); + } + if (!kernel_cmdline) { kernel_cmdline = ""; } -- 1.7.1