On 2012-07-06 11:41, Wen Congyang wrote:
> The action is the same as -onpanic parameter.
As explained in patch 5, now that we have a related device, this no
longer needs to be a machine property.
Would could be a machine property is enabling/disabling this device.
That's probably useful as it uses a fixed PIO port that might conflict
with (non-Linux) guest expectations and/or future device models.
Jan
>
> Signed-off-by: Wen Congyang <wency@xxxxxxxxxxxxxx>
> ---
> 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 = "";
> }
>
--
Siemens AG, Corporate Technology, CT RTC ITP SDP-DE
Corporate Competence Center Embedded Linux
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
