Commit-ID: 2edff8885e1e887764ce4424cadb9699bb268ea5 Gitweb: http://git.kernel.org/tip/2edff8885e1e887764ce4424cadb9699bb268ea5 Author: Pekka Enberg <penberg@xxxxxxxxxx> AuthorDate: Sat, 18 Jun 2011 00:39:20 +0300 Committer: Pekka Enberg <penberg@xxxxxxxxxx> CommitDate: Sat, 18 Jun 2011 00:39:20 +0300 kvm run: Add 'panic=1' to default kernel options Now that we support machine reset via i8042, add 'panic=1' to default kernel options to make sure we exit the hypervisor if the guest kernel panics. Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx> --- tools/kvm/kvm-run.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/kvm/kvm-run.c b/tools/kvm/kvm-run.c index 9724e37..0dece2d 100644 --- a/tools/kvm/kvm-run.c +++ b/tools/kvm/kvm-run.c @@ -570,7 +570,7 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) vidmode = 0; memset(real_cmdline, 0, sizeof(real_cmdline)); - strcpy(real_cmdline, "notsc noapic noacpi pci=conf1 reboot=k"); + strcpy(real_cmdline, "notsc noapic noacpi pci=conf1 reboot=k panic=1"); if (vnc || sdl) { strcat(real_cmdline, " video=vesafb console=tty0"); } else -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html