From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7PU0-0000uE-Of for qemu-devel@nongnu.org; Wed, 25 Oct 2017 13:28:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e7PTw-0000eg-QD for qemu-devel@nongnu.org; Wed, 25 Oct 2017 13:28:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45668) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e7PTw-0000cD-Gz for qemu-devel@nongnu.org; Wed, 25 Oct 2017 13:28:44 -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 E9F282CE91E for ; Wed, 25 Oct 2017 17:28:42 +0000 (UTC) Date: Wed, 25 Oct 2017 18:28:36 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20171025172835.GD2484@work-vm> References: <20171025054842.24883-1-quintela@redhat.com> <20171025054842.24883-4-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171025054842.24883-4-quintela@redhat.com> Subject: Re: [Qemu-devel] [PATCH v3 3/5] migration: No need to return the size of the cache List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org, lvivier@redhat.com, peterx@redhat.com * Juan Quintela (quintela@redhat.com) wrote: > After the previous commits, we make sure that the value passed is > right, or we just drop an error. So now we return if there is one > error or we have setup correctly the value passed. > > Signed-off-by: Juan Quintela > > -- > > Improve error messasge > Return 0 always for success > --- > migration/migration.c | 6 ++---- > migration/ram.c | 10 ++++------ > migration/ram.h | 2 +- > 3 files changed, 7 insertions(+), 11 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index 62761d5705..6bbd4715d3 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -1406,14 +1406,12 @@ void qmp_migrate_continue(MigrationStatus state, Error **errp) > void qmp_migrate_set_cache_size(int64_t value, Error **errp) > { > MigrationState *s = migrate_get_current(); > - int64_t new_size; > > - new_size = xbzrle_cache_resize(value, errp); > - if (new_size < 0) { > + if (xbzrle_cache_resize(value, errp) < 0) { > return; > } > > - s->xbzrle_cache_size = new_size; > + s->xbzrle_cache_size = value; > } > > int64_t qmp_query_migrate_cache_size(Error **errp) > diff --git a/migration/ram.c b/migration/ram.c > index 42f3b7cb28..997340c7c2 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -112,15 +112,15 @@ static void XBZRLE_cache_unlock(void) > * migration may be using the cache and might finish during this call, > * hence changes to the cache are protected by XBZRLE.lock(). > * > - * Returns the new_size or negative in case of error. > + * Returns 0 for success or -1 for error > * > * @new_size: new cache size > * @errp: set *errp if the check failed, with reason > */ > -int64_t xbzrle_cache_resize(int64_t new_size, Error **errp) > +int xbzrle_cache_resize(int64_t new_size, Error **errp) > { > PageCache *new_cache; > - int64_t ret; > + int64_t ret = 0; > > /* Check for truncation */ > if (new_size != (size_t)new_size) { > @@ -138,7 +138,7 @@ int64_t xbzrle_cache_resize(int64_t new_size, Error **errp) > > if (new_size == migrate_xbzrle_cache_size()) { > /* nothing to do */ > - return new_size; > + return 0; > } > > XBZRLE_cache_lock(); > @@ -153,8 +153,6 @@ int64_t xbzrle_cache_resize(int64_t new_size, Error **errp) > cache_fini(XBZRLE.cache); > XBZRLE.cache = new_cache; > } > - > - ret = new_size; > out: > XBZRLE_cache_unlock(); > return ret; OK, this shares the same oddity as the original which is XBZRLE.cache = NULL is not an error. but, since that is the same as the original; Reviewed-by: Dr. David Alan Gilbert > diff --git a/migration/ram.h b/migration/ram.h > index f9f7eef894..64d81e9f1d 100644 > --- a/migration/ram.h > +++ b/migration/ram.h > @@ -35,7 +35,7 @@ > extern MigrationStats ram_counters; > extern XBZRLECacheStats xbzrle_counters; > > -int64_t xbzrle_cache_resize(int64_t new_size, Error **errp); > +int xbzrle_cache_resize(int64_t new_size, Error **errp); > uint64_t ram_bytes_remaining(void); > uint64_t ram_bytes_total(void); > > -- > 2.13.6 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK