From nobody Tue May 7 17:09:25 2024 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.zohomail.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 1505830333313856.2905257976943; Tue, 19 Sep 2017 07:12:13 -0700 (PDT) Received: from localhost ([::1]:43156 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duJG0-0004vC-Bt for importer@patchew.org; Tue, 19 Sep 2017 10:12:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duJF7-0004Xk-J7 for qemu-devel@nongnu.org; Tue, 19 Sep 2017 10:11:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duJF4-000300-6p for qemu-devel@nongnu.org; Tue, 19 Sep 2017 10:11:17 -0400 Received: from 11.mo1.mail-out.ovh.net ([188.165.48.29]:34663) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1duJF3-0002z1-W4 for qemu-devel@nongnu.org; Tue, 19 Sep 2017 10:11:14 -0400 Received: from player691.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo1.mail-out.ovh.net (Postfix) with ESMTP id 4CA1A95A6A for ; Tue, 19 Sep 2017 16:11:12 +0200 (CEST) Received: from bahia.lab.toulouse-stg.fr.ibm.com (deibp9eh1--blueice1n3.emea.ibm.com [195.212.29.165]) (Authenticated sender: groug@kaod.org) by player691.ha.ovh.net (Postfix) with ESMTPA id CFA6A26007C; Tue, 19 Sep 2017 16:11:07 +0200 (CEST) From: Greg Kurz To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 16:11:07 +0200 Message-ID: <150583026752.26236.7284148199846043137.stgit@bahia.lab.toulouse-stg.fr.ibm.com> User-Agent: StGit/0.17.1-46-g6855-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Ovh-Tracer-Id: 2702159780474231285 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelledrheejgdejhecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 188.165.48.29 Subject: [Qemu-devel] [PATCH v2] spapr: introduce helpers to migrate HPT chunks and the end marker 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: Alexey Kardashevskiy , Thomas Huth , qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 This consolidates some duplicated code in a dedicated helpers. Signed-off-by: Greg Kurz --- v2: - open-code writes for the end marker --- hw/ppc/spapr.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index f680f28a15ea..c18c36da71d6 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1708,6 +1708,23 @@ static int htab_save_setup(QEMUFile *f, void *opaque) return 0; } =20 +static void htab_save_chunk(QEMUFile *f, sPAPRMachineState *spapr, + int chunkstart, int n_valid, int n_invalid) +{ + qemu_put_be32(f, chunkstart); + qemu_put_be16(f, n_valid); + qemu_put_be16(f, n_invalid); + qemu_put_buffer(f, HPTE(spapr->htab, chunkstart), + HASH_PTE_SIZE_64 * n_valid); +} + +static void htab_save_end_marker(QEMUFile *f) +{ + qemu_put_be32(f, 0); + qemu_put_be16(f, 0); + qemu_put_be16(f, 0); +} + static void htab_save_first_pass(QEMUFile *f, sPAPRMachineState *spapr, int64_t max_ns) { @@ -1739,11 +1756,7 @@ static void htab_save_first_pass(QEMUFile *f, sPAPRM= achineState *spapr, if (index > chunkstart) { int n_valid =3D index - chunkstart; =20 - qemu_put_be32(f, chunkstart); - qemu_put_be16(f, n_valid); - qemu_put_be16(f, 0); - qemu_put_buffer(f, HPTE(spapr->htab, chunkstart), - HASH_PTE_SIZE_64 * n_valid); + htab_save_chunk(f, spapr, chunkstart, n_valid, 0); =20 if (has_timeout && (qemu_clock_get_ns(QEMU_CLOCK_REALTIME) - starttime) > max= _ns) { @@ -1805,11 +1818,7 @@ static int htab_save_later_pass(QEMUFile *f, sPAPRMa= chineState *spapr, int n_valid =3D invalidstart - chunkstart; int n_invalid =3D index - invalidstart; =20 - qemu_put_be32(f, chunkstart); - qemu_put_be16(f, n_valid); - qemu_put_be16(f, n_invalid); - qemu_put_buffer(f, HPTE(spapr->htab, chunkstart), - HASH_PTE_SIZE_64 * n_valid); + htab_save_chunk(f, spapr, chunkstart, n_valid, n_invalid); sent +=3D index - chunkstart; =20 if (!final && (qemu_clock_get_ns(QEMU_CLOCK_REALTIME) - startt= ime) > max_ns) { @@ -1872,10 +1881,7 @@ static int htab_save_iterate(QEMUFile *f, void *opaq= ue) rc =3D htab_save_later_pass(f, spapr, MAX_ITERATION_NS); } =20 - /* End marker */ - qemu_put_be32(f, 0); - qemu_put_be16(f, 0); - qemu_put_be16(f, 0); + htab_save_end_marker(f); =20 return rc; } @@ -1915,9 +1921,7 @@ static int htab_save_complete(QEMUFile *f, void *opaq= ue) } =20 /* End marker */ - qemu_put_be32(f, 0); - qemu_put_be16(f, 0); - qemu_put_be16(f, 0); + htab_save_end_marker(f); =20 return 0; }