From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCoJb-0007wN-Pz for qemu-devel@nongnu.org; Wed, 08 Jul 2015 08:19:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCoJY-0003aZ-4M for qemu-devel@nongnu.org; Wed, 08 Jul 2015 08:19:03 -0400 Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:40099) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCoJX-0003aK-QQ for qemu-devel@nongnu.org; Wed, 08 Jul 2015 08:19:00 -0400 Received: from /spool/local by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 8 Jul 2015 13:18:58 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id E9A5F17D8062 for ; Wed, 8 Jul 2015 13:20:12 +0100 (BST) Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t68CIuMv29294656 for ; Wed, 8 Jul 2015 12:18:56 GMT Received: from d06av09.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t68CIupu000703 for ; Wed, 8 Jul 2015 06:18:56 -0600 Message-ID: <559D1530.7020006@de.ibm.com> Date: Wed, 08 Jul 2015 14:18:56 +0200 From: Christian Borntraeger MIME-Version: 1.0 References: <1436357310-3879-1-git-send-email-quintela@redhat.com> <1436357310-3879-2-git-send-email-quintela@redhat.com> In-Reply-To: <1436357310-3879-2-git-send-email-quintela@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/2] migration: Only change state after migration has finished List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela , qemu-devel@nongnu.org Cc: amit.shah@redhat.com, dgilbert@redhat.com Am 08.07.2015 um 14:08 schrieb Juan Quintela: > On previous change, we changed state at post load time if it was not > running, special casing the "running" change. Now, we change any states > at the end of the migration. > > Signed-off-by: Juan Quintela This fixes my s390 regression. Tested-by: Christian Borntraeger > --- > migration/migration.c | 48 +++++++++++++++++++++++++++--------------------- > 1 file changed, 27 insertions(+), 21 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index 45719a0..ede432e 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -104,6 +104,8 @@ typedef struct { > bool optional; > uint32_t size; > uint8_t runstate[100]; > + RunState state; > + bool received; > } GlobalState; > > static GlobalState global_state; > @@ -119,9 +121,14 @@ static int global_state_store(void) > return 0; > } > > -static char *global_state_get_runstate(void) > +static bool global_state_received(void) > { > - return (char *)global_state.runstate; > + return global_state.received; > +} > + > +static RunState global_state_get_runstate(void) > +{ > + return global_state.state; > } > > void global_state_set_optional(void) > @@ -154,26 +161,25 @@ static bool global_state_needed(void *opaque) > static int global_state_post_load(void *opaque, int version_id) > { > GlobalState *s = opaque; > - int ret = 0; > + Error *local_err = NULL; > + int r; > char *runstate = (char *)s->runstate; > > + s->received = true; > trace_migrate_global_state_post_load(runstate); > > - if (strcmp(runstate, "running") != 0) { > - Error *local_err = NULL; > - int r = qapi_enum_parse(RunState_lookup, runstate, RUN_STATE_MAX, > + r = qapi_enum_parse(RunState_lookup, runstate, RUN_STATE_MAX, > -1, &local_err); > > - if (r == -1) { > - if (local_err) { > - error_report_err(local_err); > - } > - return -EINVAL; > + if (r == -1) { > + if (local_err) { > + error_report_err(local_err); > } > - ret = vm_stop_force_state(r); > + return -EINVAL; > } > + s->state = r; > > - return ret; > + return 0; > } > > static void global_state_pre_save(void *opaque) > @@ -202,6 +208,7 @@ void register_global_state(void) > { > /* We would use it independently that we receive it */ > strcpy((char *)&global_state.runstate, ""); > + global_state.received = false; > vmstate_register(NULL, 0, &vmstate_globalstate, &global_state); > } > > @@ -283,20 +290,19 @@ static void process_incoming_migration_co(void *opaque) > exit(EXIT_FAILURE); > } > > - /* runstate == "" means that we haven't received it through the > - * wire, so we obey autostart. runstate == runing means that we > - * need to run it, we need to make sure that we do it after > - * everything else has finished. Every other state change is done > - * at the post_load function */ > + /* If global state section was not received or we are in running > + state, we need to obey autostart. Any other state is set with > + runstate_set. */ > > - if (strcmp(global_state_get_runstate(), "running") == 0) { > - vm_start(); > - } else if (strcmp(global_state_get_runstate(), "") == 0) { > + if (!global_state_received() || > + global_state_get_runstate() == RUN_STATE_RUNNING) { > if (autostart) { > vm_start(); > } else { > runstate_set(RUN_STATE_PAUSED); > } > + } else { > + runstate_set(global_state_get_runstate()); > } > migrate_decompress_threads_join(); > } >