From nobody Mon Feb 9 09:34:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1611975582; cv=none; d=zohomail.com; s=zohoarc; b=e1bwktn0O9XsUi2Y6cLeBrCvoatzux83nhdj8cfqoyaqBPIcdcGSbVui2ycjleDb0fA6Hm6iOmDzUYBPdu3aIb2wCnPy21mqE1YtxzRORM77KJF/+lB4647CF7GYp/IX2TbKYNg2HwdE00/8zhgpv6mWRLeTI/7E5KJNkFYkAgQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611975582; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=j3IZ9TNpXSOVhFi5HdKDCrt1VagKkALWMHhCv7+v5Fk=; b=iAOE6obe/30X36rZzFUviGXpu/BZdC/GfkuMgjuX4Ax9Lr9M6W/PubugDvf7nkxn2FgjtF/n4ynLvO/YHLQ1KVjWcGCHfs9C5CYNmPsjb/LGgJ8TDCjJDaE6GH5JszyMiWdjahHJ6M3BE5TIdM6fZRzXOAaZX/HkjyFtKqGied8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1611975582554932.313139751886; Fri, 29 Jan 2021 18:59:42 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.78635.143154 (Exim 4.92) (envelope-from ) id 1l5gTn-0000bR-Sn; Sat, 30 Jan 2021 02:59:19 +0000 Received: by outflank-mailman (output) from mailman id 78635.143154; Sat, 30 Jan 2021 02:59:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l5gTn-0000bI-O6; Sat, 30 Jan 2021 02:59:19 +0000 Received: by outflank-mailman (input) for mailman id 78635; Sat, 30 Jan 2021 02:59:17 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l5gTl-0000YD-Q1 for xen-devel@lists.xenproject.org; Sat, 30 Jan 2021 02:59:17 +0000 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 87103295-8722-45fe-93e4-48523448dbf0; Sat, 30 Jan 2021 02:59:11 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 87103295-8722-45fe-93e4-48523448dbf0 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1611975551; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=e4zMx+E+sDkOfYsWc3uNfBOCqVtwp50q1FWC0/NfoFo=; b=b9vwW3kMlln51eXd5+Nus27Sw9HkQVzrAIu0r3XqrywbQBiLvbZ6YLZB vCS0SvAHWQX+tcBdw8Tk+/CHWKGh2Sh3lPJtyqZa/dB7nwd2ZP1H3doIB IE8kkWDeuIK8/wCQ9XxGxxgk72z6CFlTaxVDDEjD3v2WyDHnNp2pzQ3ov o=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: fqRQ838jlXUOr6w4phFw7DfsVTtBRBeYx8Xnm+yrR/TKqNA2A/wK0OHKNcCzza04s0Td7dHxBO ttfg7cDc/HG/fvUc1QzLL6dLXqWJ+5nKph0gM5EdcO7YYl+8JVGN399eO8B/92BTLInGLDiCzP gXaOkmrIQbKsmgXwU8OZsqZlYR1g0bDJX9EhhznPA1TwYAMt0JJHVtYqxV9f+8mpgYtLbwEvX4 +0oZ94AqZOaXUBXzCw7WH46K8xNcdGWBEt9nljsLz3iq3lEymqRo4Cju18YBXsLTiednGO6Q1D 13M= X-SBRS: 5.1 X-MesageID: 36195184 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.79,387,1602561600"; d="scan'208";a="36195184" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Stefano Stabellini , Wei Liu , Julien Grall , Paul Durrant , =?UTF-8?q?Micha=C5=82=20Leszczy=C5=84ski?= , Hubert Jasudowicz , Tamas K Lengyel Subject: [PATCH v8 05/16] xen/memory: Indent part of acquire_resource() Date: Sat, 30 Jan 2021 02:58:41 +0000 Message-ID: <20210130025852.12430-6-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210130025852.12430-1-andrew.cooper3@citrix.com> References: <20210130025852.12430-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) Indent the middle of acquire_resource() inside a do {} while ( 0 ) loop. T= his is broken out specifically to make the following change readable. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Paul Durrant --- CC: George Dunlap CC: Ian Jackson CC: Jan Beulich CC: Stefano Stabellini CC: Wei Liu CC: Julien Grall CC: Paul Durrant CC: Micha=C5=82 Leszczy=C5=84ski CC: Hubert Jasudowicz CC: Tamas K Lengyel v8: * Rebase over ARM/IOREQ series. --- xen/common/memory.c | 72 +++++++++++++++++++++++++++----------------------= ---- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 9fb34eb4d0..01cab7e493 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -1187,48 +1187,50 @@ static int acquire_resource( goto out; } =20 - switch ( xmar.type ) - { - case XENMEM_resource_grant_table: - rc =3D gnttab_acquire_resource(d, xmar.id, xmar.frame, xmar.nr_fra= mes, - mfn_list); - break; + do { + switch ( xmar.type ) + { + case XENMEM_resource_grant_table: + rc =3D gnttab_acquire_resource(d, xmar.id, xmar.frame, xmar.nr= _frames, + mfn_list); + break; =20 - case XENMEM_resource_ioreq_server: - rc =3D acquire_ioreq_server(d, xmar.id, xmar.frame, xmar.nr_frames, - mfn_list); - break; + case XENMEM_resource_ioreq_server: + rc =3D acquire_ioreq_server(d, xmar.id, xmar.frame, xmar.nr_fr= ames, + mfn_list); + break; =20 - default: - rc =3D -EOPNOTSUPP; - break; - } + default: + rc =3D -EOPNOTSUPP; + break; + } =20 - if ( rc ) - goto out; + if ( rc ) + goto out; =20 - if ( !paging_mode_translate(currd) ) - { - if ( copy_to_guest(xmar.frame_list, mfn_list, xmar.nr_frames) ) - rc =3D -EFAULT; - } - else - { - xen_pfn_t gfn_list[ARRAY_SIZE(mfn_list)]; - unsigned int i; + if ( !paging_mode_translate(currd) ) + { + if ( copy_to_guest(xmar.frame_list, mfn_list, xmar.nr_frames) ) + rc =3D -EFAULT; + } + else + { + xen_pfn_t gfn_list[ARRAY_SIZE(mfn_list)]; + unsigned int i; =20 - if ( copy_from_guest(gfn_list, xmar.frame_list, xmar.nr_frames) ) - rc =3D -EFAULT; + if ( copy_from_guest(gfn_list, xmar.frame_list, xmar.nr_frames= ) ) + rc =3D -EFAULT; =20 - for ( i =3D 0; !rc && i < xmar.nr_frames; i++ ) - { - rc =3D set_foreign_p2m_entry(currd, d, gfn_list[i], - _mfn(mfn_list[i])); - /* rc should be -EIO for any iteration other than the first */ - if ( rc && i ) - rc =3D -EIO; + for ( i =3D 0; !rc && i < xmar.nr_frames; i++ ) + { + rc =3D set_foreign_p2m_entry(currd, d, gfn_list[i], + _mfn(mfn_list[i])); + /* rc should be -EIO for any iteration other than the firs= t */ + if ( rc && i ) + rc =3D -EIO; + } } - } + } while ( 0 ); =20 out: rcu_unlock_domain(d); --=20 2.11.0