From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52581) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZLfF-0004Yw-Bg for qemu-devel@nongnu.org; Thu, 24 Oct 2013 10:13:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VZLf6-0004Ay-Ts for qemu-devel@nongnu.org; Thu, 24 Oct 2013 10:13:29 -0400 Received: from mail-wg0-x233.google.com ([2a00:1450:400c:c00::233]:52576) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZLf6-0004Al-Ib for qemu-devel@nongnu.org; Thu, 24 Oct 2013 10:13:20 -0400 Received: by mail-wg0-f51.google.com with SMTP id l18so2334030wgh.18 for ; Thu, 24 Oct 2013 07:13:19 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <52692AFD.7060505@redhat.com> Date: Thu, 24 Oct 2013 15:13:17 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1382412341-1173-1-git-send-email-lilei@linux.vnet.ibm.com> <1382412341-1173-15-git-send-email-lilei@linux.vnet.ibm.com> In-Reply-To: <1382412341-1173-15-git-send-email-lilei@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 14/17] add new RanState RAN_STATE_FLIPPING_MIGRATE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Lei Li Cc: aarcange@redhat.com, aliguori@us.ibm.com, quintela@redhat.com, qemu-devel@nongnu.org, mrhines@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com, lagarcia@br.ibm.com, rcj@linux.vnet.ibm.com Il 22/10/2013 04:25, Lei Li ha scritto: > Introduce new RanState RAN_STATE_FLIPPING_MIGRATE and > add it to runstate_needs_reset(). I am not sure about the name; for one thing, the new state would apply also to postcopy migration. But the code looks ok. Paolo > Signed-off-by: Lei Li > --- > qapi-schema.json | 11 +++++++---- > vl.c | 12 +++++++++++- > 2 files changed, 18 insertions(+), 5 deletions(-) > > diff --git a/qapi-schema.json b/qapi-schema.json > index 523a5b2..8178d0c 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -176,12 +176,15 @@ > # @watchdog: the watchdog action is configured to pause and has been triggered > # > # @guest-panicked: guest has been panicked as a result of guest OS panic > +# > +# @flipping-migrate: guest is paused to start unix_page_flipping migration > +# process > ## > { 'enum': 'RunState', > - 'data': [ 'debug', 'inmigrate', 'internal-error', 'io-error', 'paused', > - 'postmigrate', 'prelaunch', 'finish-migrate', 'restore-vm', > - 'running', 'save-vm', 'shutdown', 'suspended', 'watchdog', > - 'guest-panicked' ] } > + 'data': [ 'debug', 'flipping-migrate', 'inmigrate', 'internal-error', > + 'io-error', 'paused', 'postmigrate', 'prelaunch', 'finish-migrate', > + 'restore-vm', 'running', 'save-vm', 'shutdown', 'suspended', > + 'watchdog', 'guest-panicked' ] } > > ## > # @SnapshotInfo > diff --git a/vl.c b/vl.c > index b42ac67..fcdf981 100644 > --- a/vl.c > +++ b/vl.c > @@ -601,6 +601,7 @@ static const RunStateTransition runstate_transitions_def[] = { > > { RUN_STATE_PAUSED, RUN_STATE_RUNNING }, > { RUN_STATE_PAUSED, RUN_STATE_FINISH_MIGRATE }, > + { RUN_STATE_PAUSED, RUN_STATE_FLIPPING_MIGRATE }, > > { RUN_STATE_POSTMIGRATE, RUN_STATE_RUNNING }, > { RUN_STATE_POSTMIGRATE, RUN_STATE_FINISH_MIGRATE }, > @@ -624,23 +625,31 @@ static const RunStateTransition runstate_transitions_def[] = { > { RUN_STATE_RUNNING, RUN_STATE_SHUTDOWN }, > { RUN_STATE_RUNNING, RUN_STATE_WATCHDOG }, > { RUN_STATE_RUNNING, RUN_STATE_GUEST_PANICKED }, > + { RUN_STATE_RUNNING, RUN_STATE_FLIPPING_MIGRATE }, > > { RUN_STATE_SAVE_VM, RUN_STATE_RUNNING }, > > { RUN_STATE_SHUTDOWN, RUN_STATE_PAUSED }, > { RUN_STATE_SHUTDOWN, RUN_STATE_FINISH_MIGRATE }, > + { RUN_STATE_SHUTDOWN, RUN_STATE_FLIPPING_MIGRATE }, > > { RUN_STATE_DEBUG, RUN_STATE_SUSPENDED }, > { RUN_STATE_RUNNING, RUN_STATE_SUSPENDED }, > { RUN_STATE_SUSPENDED, RUN_STATE_RUNNING }, > { RUN_STATE_SUSPENDED, RUN_STATE_FINISH_MIGRATE }, > + { RUN_STATE_SUSPENDED, RUN_STATE_FLIPPING_MIGRATE }, > > { RUN_STATE_WATCHDOG, RUN_STATE_RUNNING }, > { RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE }, > + { RUN_STATE_WATCHDOG, RUN_STATE_FLIPPING_MIGRATE }, > > { RUN_STATE_GUEST_PANICKED, RUN_STATE_PAUSED }, > { RUN_STATE_GUEST_PANICKED, RUN_STATE_FINISH_MIGRATE }, > { RUN_STATE_GUEST_PANICKED, RUN_STATE_DEBUG }, > + { RUN_STATE_GUEST_PANICKED, RUN_STATE_FLIPPING_MIGRATE }, > + > + { RUN_STATE_FLIPPING_MIGRATE, RUN_STATE_RUNNING }, > + { RUN_STATE_FLIPPING_MIGRATE, RUN_STATE_POSTMIGRATE }, > > { RUN_STATE_MAX, RUN_STATE_MAX }, > }; > @@ -687,7 +696,8 @@ bool runstate_needs_reset(void) > { > return runstate_check(RUN_STATE_INTERNAL_ERROR) || > runstate_check(RUN_STATE_SHUTDOWN) || > - runstate_check(RUN_STATE_GUEST_PANICKED); > + runstate_check(RUN_STATE_GUEST_PANICKED) || > + runstate_check(RUN_STATE_FLIPPING_MIGRATE); > } > > StatusInfo *qmp_query_status(Error **errp) >