Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756742Ab3CDJl1 (ORCPT ); Mon, 4 Mar 2013 04:41:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45171 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755016Ab3CDJlZ (ORCPT ); Mon, 4 Mar 2013 04:41:25 -0500 Message-ID: <51346BFF.5000704@redhat.com> Date: Mon, 04 Mar 2013 10:40:15 +0100 From: Paolo Bonzini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: Hu Tao CC: kvm list , qemu-devel , "linux-kernel@vger.kernel.org" , "Daniel P. Berrange" , KAMEZAWA Hiroyuki , Jan Kiszka , Gleb Natapov , Blue Swirl , Eric Blake , Andrew Jones , Marcelo Tosatti , Sasha Levin , Luiz Capitulino , Anthony Liguori , Markus Armbruster , Stefan Hajnoczi , Juan Quintela , Orit Wasserman , Kevin Wolf , Wen Congyang , "Michael S. Tsirkin" , Alexander Graf , Alex Williamson , Peter Maydell Subject: Re: [PATCH v13 4/8] add a new runstate: RUN_STATE_GUEST_PANICKED References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5610 Lines: 146 Il 28/02/2013 13:13, Hu Tao ha scritto: > The guest will be in this state when it is panicked. > > Signed-off-by: Wen Congyang > Signed-off-by: Hu Tao > --- > migration.c | 1 + > qapi-schema.json | 6 +++++- > qmp.c | 3 ++- > vl.c | 11 ++++++++++- > 4 files changed, 18 insertions(+), 3 deletions(-) > > diff --git a/migration.c b/migration.c > index c29830e..fa17b82 100644 > --- a/migration.c > +++ b/migration.c > @@ -698,6 +698,7 @@ static void *buffered_file_thread(void *opaque) > int64_t start_time, end_time; > > DPRINTF("done iterating\n"); > + save_run_state(); > start_time = qemu_get_clock_ms(rt_clock); > qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); > if (old_vm_running) { > diff --git a/qapi-schema.json b/qapi-schema.json > index 28b070f..8f1d138 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -174,11 +174,15 @@ > # @suspended: guest is suspended (ACPI S3) > # > # @watchdog: the watchdog action is configured to pause and has been triggered > +# > +# @guest-panicked: the panicked action is configured to pause and has been > +# triggered. > ## > { 'enum': 'RunState', > 'data': [ 'debug', 'inmigrate', 'internal-error', 'io-error', 'paused', > 'postmigrate', 'prelaunch', 'finish-migrate', 'restore-vm', > - 'running', 'save-vm', 'shutdown', 'suspended', 'watchdog' ] } > + 'running', 'save-vm', 'shutdown', 'suspended', 'watchdog', > + 'guest-panicked' ] } > > ## > # @SnapshotInfo > diff --git a/qmp.c b/qmp.c > index 5f1bed1..f5027f6 100644 > --- a/qmp.c > +++ b/qmp.c > @@ -150,7 +150,8 @@ void qmp_cont(Error **errp) > Error *local_err = NULL; > > if (runstate_check(RUN_STATE_INTERNAL_ERROR) || > - runstate_check(RUN_STATE_SHUTDOWN)) { > + runstate_check(RUN_STATE_SHUTDOWN) || > + runstate_check(RUN_STATE_GUEST_PANICKED)) { > error_set(errp, QERR_RESET_REQUIRED); > return; > } else if (runstate_check(RUN_STATE_SUSPENDED)) { > diff --git a/vl.c b/vl.c > index 3d08e1a..51d4922 100644 > --- a/vl.c > +++ b/vl.c > @@ -536,6 +536,7 @@ static const RunStateTransition runstate_transitions_def[] = { > > { RUN_STATE_INMIGRATE, RUN_STATE_RUNNING }, > { RUN_STATE_INMIGRATE, RUN_STATE_PAUSED }, > + { RUN_STATE_INMIGRATE, RUN_STATE_GUEST_PANICKED }, Is this a consequence of the first patch? > { RUN_STATE_INTERNAL_ERROR, RUN_STATE_RUNNING }, > { RUN_STATE_INTERNAL_ERROR, RUN_STATE_FINISH_MIGRATE }, > @@ -549,6 +550,7 @@ static const RunStateTransition runstate_transitions_def[] = { > { RUN_STATE_POSTMIGRATE, RUN_STATE_RUNNING }, > { RUN_STATE_POSTMIGRATE, RUN_STATE_PAUSED }, > { RUN_STATE_POSTMIGRATE, RUN_STATE_FINISH_MIGRATE }, > + { RUN_STATE_POSTMIGRATE, RUN_STATE_GUEST_PANICKED }, Impossible. GUEST_PANICKED requires an instruction to be executed in the guest, so it should first go to RUNNING. > { RUN_STATE_PRELAUNCH, RUN_STATE_RUNNING }, > { RUN_STATE_PRELAUNCH, RUN_STATE_FINISH_MIGRATE }, > @@ -559,6 +561,7 @@ static const RunStateTransition runstate_transitions_def[] = { > > { RUN_STATE_RESTORE_VM, RUN_STATE_RUNNING }, > { RUN_STATE_RESTORE_VM, RUN_STATE_PAUSED }, > + { RUN_STATE_RESTORE_VM, RUN_STATE_GUEST_PANICKED }, Is it also for the first patch? > { RUN_STATE_RUNNING, RUN_STATE_DEBUG }, > { RUN_STATE_RUNNING, RUN_STATE_INTERNAL_ERROR }, > @@ -569,6 +572,7 @@ static const RunStateTransition runstate_transitions_def[] = { > { RUN_STATE_RUNNING, RUN_STATE_SAVE_VM }, > { RUN_STATE_RUNNING, RUN_STATE_SHUTDOWN }, > { RUN_STATE_RUNNING, RUN_STATE_WATCHDOG }, > + { RUN_STATE_RUNNING, RUN_STATE_GUEST_PANICKED }, This one is obviously ok. > { RUN_STATE_SAVE_VM, RUN_STATE_RUNNING }, > > @@ -583,6 +587,10 @@ static const RunStateTransition runstate_transitions_def[] = { > { RUN_STATE_WATCHDOG, RUN_STATE_RUNNING }, > { RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE }, > > + { RUN_STATE_GUEST_PANICKED, RUN_STATE_RUNNING }, > + { RUN_STATE_GUEST_PANICKED, RUN_STATE_PAUSED }, > + { RUN_STATE_GUEST_PANICKED, RUN_STATE_FINISH_MIGRATE }, Like SHUTDOWN, it should go first to PAUSED and then to RUNNING. A GUEST_PANICKED -> RUNNING transition is not possible. You're seeing it because you lack the addition of GUEST_PANICKED here: if (runstate_check(RUN_STATE_INTERNAL_ERROR) || runstate_check(RUN_STATE_SHUTDOWN)) { runstate_set(RUN_STATE_PAUSED); } I think you should first move the INTERNAL_ERROR || SHUTDOWN checks to a separate function, so that you can then add GUEST_PANICKED. Paolo > { RUN_STATE_MAX, RUN_STATE_MAX }, > }; > > @@ -2001,7 +2009,8 @@ static bool main_loop_should_exit(void) > qemu_system_reset(VMRESET_REPORT); > resume_all_vcpus(); > if (runstate_check(RUN_STATE_INTERNAL_ERROR) || > - runstate_check(RUN_STATE_SHUTDOWN)) { > + runstate_check(RUN_STATE_SHUTDOWN) || > + runstate_check(RUN_STATE_GUEST_PANICKED)) { > bdrv_iterate(iostatus_bdrv_it, NULL); > vm_start(); > } > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/