From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35155) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crN8V-0004FU-BP for qemu-devel@nongnu.org; Fri, 24 Mar 2017 07:12:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1crN8S-000648-53 for qemu-devel@nongnu.org; Fri, 24 Mar 2017 07:12:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39742) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1crN8R-00063v-Vb for qemu-devel@nongnu.org; Fri, 24 Mar 2017 07:12:00 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1D09D3B717 for ; Fri, 24 Mar 2017 11:12:00 +0000 (UTC) Date: Fri, 24 Mar 2017 11:11:54 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20170324111154.GA16047@work-vm> References: <20170323204544.12015-1-quintela@redhat.com> <20170323204544.12015-3-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170323204544.12015-3-quintela@redhat.com> Subject: Re: [Qemu-devel] [PATCH 02/51] ram: rename block_name to rbname 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: > So all places are consisten on the nambing of a block name parameter. > > Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert > --- > migration/ram.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > > diff --git a/migration/ram.c b/migration/ram.c > index 76f1fc4..21047c5 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -743,14 +743,14 @@ static int save_zero_page(QEMUFile *f, RAMBlock *block, ram_addr_t offset, > return pages; > } > > -static void ram_release_pages(MigrationState *ms, const char *block_name, > +static void ram_release_pages(MigrationState *ms, const char *rbname, > uint64_t offset, int pages) > { > if (!migrate_release_ram() || !migration_in_postcopy(ms)) { > return; > } > > - ram_discard_range(NULL, block_name, offset, pages << TARGET_PAGE_BITS); > + ram_discard_range(NULL, rbname, offset, pages << TARGET_PAGE_BITS); > } > > /** > @@ -1942,25 +1942,24 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms) > * Returns zero on success > * > * @mis: current migration incoming state > - * @block_name: Name of the RAMBLock of the request. NULL means the > - * same that last one. > + * @rbname: name of the RAMBLock of the request. NULL means the > + * same that last one. > * @start: RAMBlock starting page > * @length: RAMBlock size > */ > int ram_discard_range(MigrationIncomingState *mis, > - const char *block_name, > + const char *rbname, > uint64_t start, size_t length) > { > int ret = -1; > > - trace_ram_discard_range(block_name, start, length); > + trace_ram_discard_range(rbname, start, length); > > rcu_read_lock(); > - RAMBlock *rb = qemu_ram_block_by_name(block_name); > + RAMBlock *rb = qemu_ram_block_by_name(rbname); > > if (!rb) { > - error_report("ram_discard_range: Failed to find block '%s'", > - block_name); > + error_report("ram_discard_range: Failed to find block '%s'", rbname); > goto err; > } > > -- > 2.9.3 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK