[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/6 v5] deal with panicked event accoring to '-machi
From: |
Wen Congyang |
Subject: |
[Qemu-devel] [PATCH 6/6 v5] deal with panicked event accoring to '-machine panic_action=action' |
Date: |
Wed, 27 Jun 2012 15:04:50 +0800 |
User-agent: |
Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100413 Fedora/3.0.4-2.fc13 Thunderbird/3.0.4 |
The action is the same as -onpanic parameter.
Signed-off-by: Wen Congyang <address@hidden>
---
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 address@hidden,address@hidden,...]]
diff --git a/vl.c b/vl.c
index 9164d29..7663699 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
- [Qemu-devel] [PATCH 1/6 v5] start vm after reseting it, (continued)
- [Qemu-devel] [PATCH 1/6 v5] start vm after reseting it, Wen Congyang, 2012/06/27
- [Qemu-devel] [PATCH 2/6 v5] update linux headers, Wen Congyang, 2012/06/27
- [Qemu-devel] [PATCH 3/6 v5] add a new runstate: RUN_STATE_GUEST_PANICKED, Wen Congyang, 2012/06/27
- [Qemu-devel] [PATCH 4/6 v5] add a new qevent: QEVENT_GUEST_PANICKED, Wen Congyang, 2012/06/27
- [Qemu-devel] [PATCH 5/6 v5] deal with guest panicked event accoring to -onpanic parameter, Wen Congyang, 2012/06/27
- Re: [Qemu-devel] [PATCH 5/6 v5] deal with guest panicked event accoring to -onpanic parameter, Cornelia Huck, 2012/06/27
- [Qemu-devel] [PATCH 6/6 v5] deal with panicked event accoring to '-machine panic_action=action',
Wen Congyang <=