From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crSEl-0003OT-Bl for qemu-devel@nongnu.org; Fri, 24 Mar 2017 12:38:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1crSEi-0004mn-77 for qemu-devel@nongnu.org; Fri, 24 Mar 2017 12:38:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34592) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1crSEi-0004mO-1B for qemu-devel@nongnu.org; Fri, 24 Mar 2017 12:38:48 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BE81AC009A0F for ; Fri, 24 Mar 2017 16:38:47 +0000 (UTC) Date: Fri, 24 Mar 2017 16:38:43 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20170324163843.GH19076@work-vm> References: <20170323204544.12015-1-quintela@redhat.com> <20170323204544.12015-52-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170323204544.12015-52-quintela@redhat.com> Subject: Re: [Qemu-devel] [PATCH 51/51] migration: Remove MigrationState parameter from migration_is_idle() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org * Juan Quintela (quintela@redhat.com) wrote: > Only user don't have a MigrationState handly. > > Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert > --- > include/migration/migration.h | 2 +- > migration/migration.c | 8 +++----- > 2 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/include/migration/migration.h b/include/migration/migration.h > index 39a8e7e..6f7221f 100644 > --- a/include/migration/migration.h > +++ b/include/migration/migration.h > @@ -234,7 +234,7 @@ void remove_migration_state_change_notifier(Notifier *notify); > MigrationState *migrate_init(const MigrationParams *params); > bool migration_is_blocked(Error **errp); > bool migration_in_setup(MigrationState *); > -bool migration_is_idle(MigrationState *s); > +bool migration_is_idle(void); > bool migration_has_finished(MigrationState *); > bool migration_has_failed(MigrationState *); > /* True if outgoing migration has entered postcopy phase */ > diff --git a/migration/migration.c b/migration/migration.c > index fc19ba7..ba1d094 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -1067,11 +1067,9 @@ bool migration_in_postcopy_after_devices(MigrationState *s) > return migration_in_postcopy() && s->postcopy_after_devices; > } > > -bool migration_is_idle(MigrationState *s) > +bool migration_is_idle(void) > { > - if (!s) { > - s = migrate_get_current(); > - } > + MigrationState *s = migrate_get_current(); > > switch (s->state) { > case MIGRATION_STATUS_NONE: > @@ -1136,7 +1134,7 @@ int migrate_add_blocker(Error *reason, Error **errp) > return -EACCES; > } > > - if (migration_is_idle(NULL)) { > + if (migration_is_idle()) { > migration_blockers = g_slist_prepend(migration_blockers, reason); > return 0; > } > -- > 2.9.3 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK