Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D1F7C433E2 for ; Tue, 15 Sep 2020 17:55:05 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 93E642193E for ; Tue, 15 Sep 2020 17:55:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="UROpqpA4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 93E642193E Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass 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.92) (envelope-from ) id 1kIF9q-00028k-4N; Tue, 15 Sep 2020 17:54:22 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kIF9p-00028f-D4 for xen-devel@lists.xenproject.org; Tue, 15 Sep 2020 17:54:21 +0000 X-Inumbo-ID: b5078672-ffb9-4dc7-aeac-bf9d97f1c738 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id b5078672-ffb9-4dc7-aeac-bf9d97f1c738; Tue, 15 Sep 2020 17:54:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1600192460; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=cYgBo/legRsmshzadjlD/9u0F4bjdpl5whL/oK3wf5Q=; b=UROpqpA4+TZ3HOi134gdzm7f9JaW8qtD0rvPo1KXWytqLcyNUlrfXD08 YmeE3sYJ5eVibgxSZKob25TeXAQxgwHQMwSho3dOStPE9sHkJRfDOKz6e Wir9GXgoheUyG0m0bioj2Htk+VpJ71ikLlSgZV28NbLjW2gqXeFGQomh9 E=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: puOSgV0rpfkqzd0vZVPnNk79HLXGm5UGSYps9mX2ER5YWeQwtd4XP+QhIPTJQqBrQrZ4Me0ga9 C6h9xwVopDzcfdF6+ujzoSf0YTaXoGlIX+1vohrtO/S0LpWpOqYaUmTfz7MeJVhznjmCphFvz2 ku6mHy8DMGN2jtQ9PlTFoX2QYMBlsTXiuvbz1dCdSYpvBWw2RZ2/uwQdzz79ZbFOwJicFJi2r9 97k2i766C23T8f97yvrHdYJt0NabQMm8Hcm5c8VfSvOJZw8g1U1DpllATxUpgILpbql8wsKOtK rYE= X-SBRS: 2.7 X-MesageID: 26760908 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.76,430,1592884800"; d="scan'208";a="26760908" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [PATCH] x86/mm: Simplify expression in set_gpfn_from_mfn() Date: Tue, 15 Sep 2020 18:53:55 +0100 Message-ID: <20200915175355.32361-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Coverity points out that the "d &&" is redundant. Fixes: c9476c4ad72 ("x86: don't override INVALID_M2P_ENTRY with SHARED_M2P_ENTRY") Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Roger Pau Monné CC: Wei Liu --- xen/arch/x86/x86_64/mm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 0d1aadbfce..4c0a3a275c 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -1336,7 +1336,7 @@ void set_gpfn_from_mfn(unsigned long mfn, unsigned long pfn) { const struct domain *d = page_get_owner(mfn_to_page(_mfn(mfn))); - if ( d && (d == dom_cow) ) + if ( d == dom_cow ) entry = SHARED_M2P_ENTRY; } -- 2.11.0