From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzSa3-0000Nd-P4 for qemu-devel@nongnu.org; Wed, 26 Oct 2016 14:05:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzSZy-0006Qf-PB for qemu-devel@nongnu.org; Wed, 26 Oct 2016 14:05:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38046) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzSZy-0006QJ-Hb for qemu-devel@nongnu.org; Wed, 26 Oct 2016 14:05:34 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 B36DA3B3F9 for ; Wed, 26 Oct 2016 18:05:33 +0000 (UTC) Date: Wed, 26 Oct 2016 19:05:30 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20161026180529.GF6456@work-vm> References: <1477078935-7182-1-git-send-email-quintela@redhat.com> <1477078935-7182-2-git-send-email-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1477078935-7182-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 > --- > include/migration/migration.h | 1 - > migration/migration.c | 38 +++++++++++++++++--------------------- > migration/savevm.c | 4 ++-- > 3 files changed, 19 insertions(+), 24 deletions(-) > > diff --git a/include/migration/migration.h b/include/migration/migration.h > index 2791b90..37ef4f2 100644 > --- a/include/migration/migration.h > +++ b/include/migration/migration.h > @@ -112,7 +112,6 @@ struct MigrationIncomingState { > }; > > MigrationIncomingState *migration_incoming_get_current(void); > -MigrationIncomingState *migration_incoming_state_new(QEMUFile *f); > void migration_incoming_state_destroy(void); > > /* > diff --git a/migration/migration.c b/migration/migration.c > index 4d417b7..a71921f 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -104,32 +104,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); > } > > > @@ -375,11 +371,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 a831ec2..de84be5 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -2107,7 +2107,6 @@ void qmp_xen_load_devices_state(const char *filename, Error **errp) > } > f = qemu_fopen_channel_input(QIO_CHANNEL(ioc)); > > - migration_incoming_state_new(f); It's curious that this one is the odd case of not setting mis->from_src_file. Anyway, I think it's OK but please test it with -incoming defer. Reviewed-by: Dr. David Alan Gilbert > ret = qemu_loadvm_state(f); > qemu_fclose(f); > if (ret < 0) { > @@ -2123,6 +2122,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.", > @@ -2173,7 +2173,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.7.4 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK