From patchwork Mon Jun 3 16:03:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 165667 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp4660669ili; Mon, 3 Jun 2019 09:05:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqwjpB8i/ppxkB6ym4/2dHy8Xttn8bcQBQD2+szJ/zHqci6VdsH1pC4V7aZ2ShuMDlm7N/j0 X-Received: by 2002:a02:ccd2:: with SMTP id k18mr3169143jaq.3.1559577936110; Mon, 03 Jun 2019 09:05:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559577936; cv=none; d=google.com; s=arc-20160816; b=WaAqA8jL/M12sPgqKZAtvJyqfbSclKqk8qip9sMAPxWtadoa++ISer3lcb8Q7Wn9Lg dnaHxn/UoGqZR7M7YJh0FbREgpORSMMJ1CaAH33+YlA3WfrZP225GqivhrCIh3FDJk7r LhQdhDVg4Yyc5rU2Dug7FvaYCaIfjXmsf1rQn7Ka+Xgw+Ze0QIPVCoJGGmYDIbbbvgJc 7u0VYnvxsEUz6ON/UAcbZsdRMHALYFQmciyv266k1hbtYExquBX4ut4+lTZJU6U1rAsn /YWa5NMY/EB7pPeDfMnPF5D2g+BucV4M3opbFhH/lgb2W3xLrAawm/j2olu+k+jqVCHS CgrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:references:in-reply-to:message-id:date:to:from; bh=msWBYayx3x8aN1jrN1e+Vjbza5UY1Xdfts352ZyLccw=; b=PHghLCvbF30bidt6DjbegMdwbt4HCHTb5CylzZlBj5M3+O+jhhjysTJdKNHaExdCqP jIhQ4a6hpZsEoTIbCGvGiWereDsDjrgT231QFBi57kMeCFQq0VBdANummnpLnLjDeq+N k+szUxUJm7WP7/7FW46rxDBskINwhQmTvlw/RZRdAsjKQsPhA7E+wqa+laCcgDIL/A9z 8cqpXxX7l/aRZKjD9ouOzhswLALLThuiOSDypUXFoZ57M+cDqd3QFJfc3JQd/NKyflkz dKjUK1DbzsTtJB5UO0IUFIYrSdtiYkgZxX8R/xlRZq5gGpu+39Th0shBlv7aX1WWpuiR +tfQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id c26si8943052ioa.88.2019.06.03.09.05.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jun 2019 09:05:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hXpRe-00028z-77; Mon, 03 Jun 2019 16:04:22 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hXpRd-00028P-MD for xen-devel@lists.xenproject.org; Mon, 03 Jun 2019 16:04:21 +0000 X-Inumbo-ID: 3f1a3a0a-8619-11e9-8e8e-7fb61b469f17 Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 3f1a3a0a-8619-11e9-8e8e-7fb61b469f17; Mon, 03 Jun 2019 16:04:20 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 021F6A78; Mon, 3 Jun 2019 09:04:20 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.196.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9E0273F246; Mon, 3 Jun 2019 09:04:18 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Mon, 3 Jun 2019 17:03:47 +0100 Message-Id: <20190603160350.29806-12-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190603160350.29806-1-julien.grall@arm.com> References: <20190603160350.29806-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH v3 11/14] xen/x86: p2m: Remove duplicate error message in p2m_pt_audit_p2m() 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: Wei Liu , George Dunlap , Andrew Cooper , Julien Grall , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" p2m_pt_audit_p2m() has one place where the same message may be printed twice via printk and P2M_PRINTK. Remove the one printed using printk to stay consistent with the rest of the code. Take the opportunity to reflow the format of P2M_PRINTK. Signed-off-by: Julien Grall --- Changes in v3: - Patch added --- xen/arch/x86/mm/p2m-pt.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index cafc9f299b..84ddc1834b 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -1041,9 +1041,8 @@ long p2m_pt_audit_p2m(struct p2m_domain *p2m) if ( m2pfn != (gfn + i2) ) { pmbad++; - P2M_PRINTK("mismatch: gfn %#lx -> mfn %#lx" - " -> gfn %#lx\n", gfn+i2, mfn+i2, - m2pfn); + P2M_PRINTK("mismatch: gfn %#lx -> mfn %#lx -> gfn %#lx\n", + gfn + i2, mfn + i2, m2pfn); BUG(); } gfn += 1 << (L3_PAGETABLE_SHIFT - PAGE_SHIFT); @@ -1108,8 +1107,6 @@ long p2m_pt_audit_p2m(struct p2m_domain *p2m) !p2m_is_shared(type) ) { pmbad++; - printk("mismatch: gfn %#lx -> mfn %#lx" - " -> gfn %#lx\n", gfn, mfn, m2pfn); P2M_PRINTK("mismatch: gfn %#lx -> mfn %#lx" " -> gfn %#lx\n", gfn, mfn, m2pfn); BUG();