From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58724) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atZFg-0005Kr-42 for qemu-devel@nongnu.org; Fri, 22 Apr 2016 07:28:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1atZFc-0005ls-3Y for qemu-devel@nongnu.org; Fri, 22 Apr 2016 07:28:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44071) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atZFb-0005le-Sa for qemu-devel@nongnu.org; Fri, 22 Apr 2016 07:27:56 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6BDE4201E8 for ; Fri, 22 Apr 2016 11:27:55 +0000 (UTC) Date: Fri, 22 Apr 2016 12:27:52 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20160422112751.GG2239@work-vm> References: <1461163481-11439-1-git-send-email-quintela@redhat.com> <1461163481-11439-2-git-send-email-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1461163481-11439-2-git-send-email-quintela@redhat.com> Subject: Re: [Qemu-devel] [PATCH 01/13] migration: create Migration Incoming State at init time List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org, amit.shah@redhat.com * Juan Quintela (quintela@redhat.com) wrote: > Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert > --- > migration/migration.c | 38 +++++++++++++++++--------------------- > migration/savevm.c | 3 ++- > 2 files changed, 19 insertions(+), 22 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index 991313a..314c5c0 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -100,32 +100,28 @@ MigrationState *migrate_get_current(void) > return ¤t_migration; > } > > -/* For incoming */ > -static MigrationIncomingState *mis_current; > - > MigrationIncomingState *migration_incoming_get_current(void) > { > - return mis_current; > -} > + static bool once; > + static MigrationIncomingState mis_current; > > -MigrationIncomingState *migration_incoming_state_new(QEMUFile* f) > -{ > - mis_current = g_new0(MigrationIncomingState, 1); > - mis_current->from_src_file = f; > - mis_current->state = MIGRATION_STATUS_NONE; > - QLIST_INIT(&mis_current->loadvm_handlers); > - qemu_mutex_init(&mis_current->rp_mutex); > - qemu_event_init(&mis_current->main_thread_load_event, false); > - > - return mis_current; > + if (!once) { > + mis_current.state = MIGRATION_STATUS_NONE; > + memset(&mis_current, 0, sizeof(MigrationIncomingState)); > + QLIST_INIT(&mis_current.loadvm_handlers); > + qemu_mutex_init(&mis_current.rp_mutex); > + qemu_event_init(&mis_current.main_thread_load_event, false); > + once = true; > + } > + return &mis_current; > } > > void migration_incoming_state_destroy(void) > { > - qemu_event_destroy(&mis_current->main_thread_load_event); > - loadvm_free_handlers(mis_current); > - g_free(mis_current); > - mis_current = NULL; > + struct MigrationIncomingState *mis = migration_incoming_get_current(); > + > + qemu_event_destroy(&mis->main_thread_load_event); > + loadvm_free_handlers(mis); > } > > > @@ -373,11 +369,11 @@ static void process_incoming_migration_bh(void *opaque) > static void process_incoming_migration_co(void *opaque) > { > QEMUFile *f = opaque; > - MigrationIncomingState *mis; > + MigrationIncomingState *mis = migration_incoming_get_current(); > PostcopyState ps; > int ret; > > - mis = migration_incoming_state_new(f); > + mis->from_src_file = f; > postcopy_state_set(POSTCOPY_INCOMING_NONE); > migrate_set_state(&mis->state, MIGRATION_STATUS_NONE, > MIGRATION_STATUS_ACTIVE); > diff --git a/migration/savevm.c b/migration/savevm.c > index 16ba443..49137a1 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -2091,6 +2091,7 @@ int load_vmstate(const char *name) > QEMUFile *f; > int ret; > AioContext *aio_context; > + MigrationIncomingState *mis = migration_incoming_get_current(); > > if (!bdrv_all_can_snapshot(&bs)) { > error_report("Device '%s' is writable but does not support snapshots.", > @@ -2141,7 +2142,7 @@ int load_vmstate(const char *name) > } > > qemu_system_reset(VMRESET_SILENT); > - migration_incoming_state_new(f); > + mis->from_src_file = f; > > aio_context_acquire(aio_context); > ret = qemu_loadvm_state(f); > -- > 2.5.5 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK