From nobody Mon May 6 02:56:46 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1559103885; cv=none; d=zoho.com; s=zohoarc; b=Kc1EBBa3BxdvD7VIDb0KjsMDzzzH7hy1q/vsYhnj26lYbXBkdfChyytOFUlDn36Mp7Iht6PVWzFqhaWZYM6U/KYAwl/IKhzzvXEUhvcbjJBbkdra/IHO8uzKz5uMXxoQTh9z4qSepiMw19aJdBGsx7FBaYmzGhHaDee7Y7dFjFo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559103885; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=fIfN9uByYbCNPA7UImBMwZIariwT3mI6UUwuk5Dk6ps=; b=ReIWZUtaf1ogXexsu5BJZjLKlYzZGfMCoMbDUY6o+48AnpIhgQlm7c6h5B9xAmSSGDltL9/vljZJ7fypfUN9aliCiG3emGZbxliFmjTNK82AezzIBskQ9PNd/rde5ppgO0ECCt85sXR2wiIr8URGYLQwc3WC4AH7KdeVE45ZBH0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1559103885347178.80449192016818; Tue, 28 May 2019 21:24:45 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hVq7N-0007Ri-NK; Wed, 29 May 2019 04:23:13 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hVq7N-0007Rd-9C for xen-devel@lists.xenproject.org; Wed, 29 May 2019 04:23:13 +0000 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 77e27aa4-81c9-11e9-8980-bc764e045a96; Wed, 29 May 2019 04:23:11 +0000 (UTC) X-Inumbo-ID: 77e27aa4-81c9-11e9-8980-bc764e045a96 Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@MIAPEX02MSOL02.citrite.net Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=23.29.105.83; receiver=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa2.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 23.29.105.83 as permitted sender) identity=mailfrom; client-ip=23.29.105.83; receiver=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:23.29.105.83 ip4:162.221.156.50 ~all" Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@MIAPEX02MSOL02.citrite.net) identity=helo; client-ip=23.29.105.83; receiver=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@MIAPEX02MSOL02.citrite.net"; x-conformance=sidf_compatible IronPort-SDR: IJDR6ceTI/1up2X2njyBRC3lg55n9KOR05RHYrGj9akX8uuNCdwdsgdR0WPWz3RG6KI6VAAGqQ C4Zu1KxaU4DSHoBGszry95hDZ5RaKateazdy+1pbkC3ATpLgM9HpGoSkZKRpNBDXXMNgwPGURQ 7eTk41tqTNXT2lI9rvx0WOqNEE20C2z7fJtpFGXf/f/dP5mhOcSl+3sjs3xztFMGAFfiU02Jka OuhCdXCOoXhXNyMWG51c2vlozvg8MyZp4Toi4ge0yQHM6T+9ZWJYcp5Yk4mND87Xaj0Ps7FXpA AVA= X-SBRS: 2.7 X-MesageID: 1021925 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 23.29.105.83 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.60,525,1549947600"; d="scan'208";a="1021925" From: Andrew Cooper To: Xen-devel Date: Wed, 29 May 2019 05:23:04 +0100 Message-ID: <1559103784-23731-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] x86/altp2m: Fix style errors introduced with c/s 9abcac7ff X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Tamas K Lengyel , Wei Liu , George Dunlap , Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Drop introduced trailing whitespace, excessively long lines, mal-indention, superfluous use of PRI macros for int-or-smaller types, and incorrect PRI macros for gfns and mfns. Signed-off-by: Andrew Cooper Acked-by: George Dunlap Reviewed-by: Jan Beulich --- CC: George Dunlap CC: Tamas K Lengyel CC: Jan Beulich CC: Wei Liu CC: Roger Pau Monn=C3=A9 --- xen/arch/x86/hvm/hvm.c | 5 +++-- xen/arch/x86/mm/p2m.c | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 0e33e04..a44944b 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1765,12 +1765,13 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned= long gla, { p2m =3D p2m_get_altp2m(curr); =20 - /*=20 + /* * Get the altp2m entry if present; or if not, propagate from * the host p2m. NB that this returns with gfn locked in the * altp2m. */ - if ( p2m_altp2m_get_or_propagate(p2m, gfn, &mfn, &p2mt, &p2ma, pag= e_order) ) + if ( p2m_altp2m_get_or_propagate(p2m, gfn, &mfn, &p2mt, + &p2ma, page_order) ) { /* Entry was copied from host -- retry fault */ rc =3D 1; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 0ea8941..4c99548 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -2440,7 +2440,7 @@ bool p2m_altp2m_get_or_propagate(struct p2m_domain *a= p2m, unsigned long gfn_l, * gfns below. */ p2m_lock(ap2m); - =20 + amfn =3D get_gfn_type_access(ap2m, gfn_l, &ap2mt, &ap2ma, 0, NULL); =20 if ( !mfn_eq(amfn, INVALID_MFN) ) @@ -2474,11 +2474,11 @@ bool p2m_altp2m_get_or_propagate(struct p2m_domain = *ap2m, unsigned long gfn_l, if ( rc ) { gprintk(XENLOG_ERR, - "failed to set entry for %#"PRIx64" -> %#"PRIx64" altp2m %#"PRIx16= ". rc: %"PRIi32"\n", - gfn_l, mfn_x(amfn), vcpu_altp2m(current).p2midx, rc); + "failed to set entry for %"PRI_gfn" -> %"PRI_mfn" altp2m %= u, rc %d\n", + gfn_l, mfn_x(amfn), vcpu_altp2m(current).p2midx, rc); domain_crash(ap2m->domain); } - =20 + return true; } =20 --=20 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel