From nobody Mon Feb 9 16:45:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490303357836378.3744521295024; Thu, 23 Mar 2017 14:09:17 -0700 (PDT) Received: from localhost ([::1]:58651 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cr9yu-000341-Er for importer@patchew.org; Thu, 23 Mar 2017 17:09:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45896) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cr9d8-0008Jp-FV for qemu-devel@nongnu.org; Thu, 23 Mar 2017 16:46:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cr9d7-0000c0-D4 for qemu-devel@nongnu.org; Thu, 23 Mar 2017 16:46:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47636) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cr9d7-0000bs-4O for qemu-devel@nongnu.org; Thu, 23 Mar 2017 16:46:45 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 21721C05AA48 for ; Thu, 23 Mar 2017 20:46:45 +0000 (UTC) Received: from secure.mitica (ovpn-116-230.ams2.redhat.com [10.36.116.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id 22A4953; Thu, 23 Mar 2017 20:46:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 21721C05AA48 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=quintela@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 21721C05AA48 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 23 Mar 2017 21:45:32 +0100 Message-Id: <20170323204544.12015-40-quintela@redhat.com> In-Reply-To: <20170323204544.12015-1-quintela@redhat.com> References: <20170323204544.12015-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 23 Mar 2017 20:46:45 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 39/51] ram: We don't need MigrationState parameter anymore X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dgilbert@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Remove it from callers and callees. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu --- migration/ram.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index cb5f06f..064b2c0 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -796,13 +796,11 @@ static void ram_release_pages(const char *rbname, uin= t64_t offset, int pages) * if xbzrle noticed the page was the same. * * @rs: current RAM state - * @ms: current migration state * @block: block that contains the page we want to send * @offset: offset inside the block for the page * @last_stage: if we are at the completion stage */ -static int ram_save_page(RAMState *rs, MigrationState *ms, - PageSearchStatus *pss, bool last_stage) +static int ram_save_page(RAMState *rs, PageSearchStatus *pss, bool last_st= age) { int pages =3D -1; uint64_t bytes_xmit; @@ -976,13 +974,12 @@ static int compress_page_with_multi_thread(RAMState *= rs, RAMBlock *block, * Returns the number of pages written. * * @rs: current RAM state - * @ms: current migration state * @block: block that contains the page we want to send * @offset: offset inside the block for the page * @last_stage: if we are at the completion stage */ -static int ram_save_compressed_page(RAMState *rs, MigrationState *ms, - PageSearchStatus *pss, bool last_stage) +static int ram_save_compressed_page(RAMState *rs, PageSearchStatus *pss, + bool last_stage) { int pages =3D -1; uint64_t bytes_xmit =3D 0; @@ -1312,10 +1309,8 @@ err: * @last_stage: if we are at the completion stage * @dirty_ram_abs: address of the start of the dirty page in ram_addr_t sp= ace */ -static int ram_save_target_page(RAMState *rs, MigrationState *ms, - PageSearchStatus *pss, - bool last_stage, - ram_addr_t dirty_ram_abs) +static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss, + bool last_stage, ram_addr_t dirty_ram_abs) { int res =3D 0; =20 @@ -1323,9 +1318,9 @@ static int ram_save_target_page(RAMState *rs, Migrati= onState *ms, if (migration_bitmap_clear_dirty(rs, dirty_ram_abs)) { unsigned long *unsentmap; if (!rs->preffer_xbzrle && migrate_use_compression()) { - res =3D ram_save_compressed_page(rs, ms, pss, last_stage); + res =3D ram_save_compressed_page(rs, pss, last_stage); } else { - res =3D ram_save_page(rs, ms, pss, last_stage); + res =3D ram_save_page(rs, pss, last_stage); } =20 if (res < 0) { @@ -1364,8 +1359,7 @@ static int ram_save_target_page(RAMState *rs, Migrati= onState *ms, * @last_stage: if we are at the completion stage * @dirty_ram_abs: Address of the start of the dirty page in ram_addr_t sp= ace */ -static int ram_save_host_page(RAMState *rs, MigrationState *ms, - PageSearchStatus *pss, +static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss, bool last_stage, ram_addr_t dirty_ram_abs) { @@ -1373,7 +1367,7 @@ static int ram_save_host_page(RAMState *rs, Migration= State *ms, size_t pagesize =3D qemu_ram_pagesize(pss->block); =20 do { - tmppages =3D ram_save_target_page(rs, ms, pss, last_stage, dirty_r= am_abs); + tmppages =3D ram_save_target_page(rs, pss, last_stage, dirty_ram_a= bs); if (tmppages < 0) { return tmppages; } @@ -1405,7 +1399,6 @@ static int ram_save_host_page(RAMState *rs, Migration= State *ms, static int ram_find_and_save_block(RAMState *rs, bool last_stage) { PageSearchStatus pss; - MigrationState *ms =3D migrate_get_current(); int pages =3D 0; bool again, found; ram_addr_t dirty_ram_abs; /* Address of the start of the dirty page in @@ -1434,7 +1427,7 @@ static int ram_find_and_save_block(RAMState *rs, bool= last_stage) } =20 if (found) { - pages =3D ram_save_host_page(rs, ms, &pss, last_stage, dirty_r= am_abs); + pages =3D ram_save_host_page(rs, &pss, last_stage, dirty_ram_a= bs); } } while (!pages && again); =20 --=20 2.9.3