From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42600) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDZJ1-0002Vc-1g for qemu-devel@nongnu.org; Fri, 10 Jul 2015 10:29:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZDZIx-0001xk-N8 for qemu-devel@nongnu.org; Fri, 10 Jul 2015 10:29:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44728) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDZIx-0001x5-HQ for qemu-devel@nongnu.org; Fri, 10 Jul 2015 10:29:31 -0400 Date: Fri, 10 Jul 2015 15:29:26 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20150710142925.GA2311@work-vm> References: <1436533106-17011-1-git-send-email-quintela@redhat.com> <1436533106-17011-3-git-send-email-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1436533106-17011-3-git-send-email-quintela@redhat.com> Subject: Re: [Qemu-devel] [PATCH 2/2] migration: store globalstate in pre_safe List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: amit.shah@redhat.com, borntraeger@de.ibm.com, qemu-devel@nongnu.org * Juan Quintela (quintela@redhat.com) wrote: > We use global state in both savevm & migration. The easiest way is to > put the setup in a single place. > > Signed-off-by: Juan Quintela I don't think this works; I think pre-save is called after the migration code has changed the runstate, so you end up saving the wrong runstate, and that explains the error Christian sees. Dave > --- > migration/migration.c | 30 ++++++++++++------------------ > 1 file changed, 12 insertions(+), 18 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index ba82ff6..d1421fe 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -110,17 +110,6 @@ typedef struct { > > static GlobalState global_state; > > -static int global_state_store(void) > -{ > - if (!runstate_store((char *)global_state.runstate, > - sizeof(global_state.runstate))) { > - error_report("runstate name too big: %s", global_state.runstate); > - trace_migrate_state_too_big(); > - return -EINVAL; > - } > - return 0; > -} > - > static bool global_state_received(void) > { > return global_state.received; > @@ -187,6 +176,14 @@ static void global_state_pre_save(void *opaque) > GlobalState *s = opaque; > > trace_migrate_global_state_pre_save((char *)s->runstate); > + > + if (!runstate_store((char *)global_state.runstate, > + sizeof(global_state.runstate))) { > + error_report("runstate name too big: %s", global_state.runstate); > + trace_migrate_state_too_big(); > + exit(EXIT_FAILURE); > + } > + > s->size = strlen((char *)s->runstate) + 1; > } > > @@ -940,13 +937,10 @@ static void *migration_thread(void *opaque) > qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); > old_vm_running = runstate_is_running(); > > - ret = global_state_store(); > - if (!ret) { > - ret = vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); > - if (ret >= 0) { > - qemu_file_set_rate_limit(s->file, INT64_MAX); > - qemu_savevm_state_complete(s->file); > - } > + ret = vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); > + if (ret >= 0) { > + qemu_file_set_rate_limit(s->file, INT64_MAX); > + qemu_savevm_state_complete(s->file); > } > qemu_mutex_unlock_iothread(); > > -- > 2.4.3 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK