From patchwork Fri Dec 18 13:29:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klaus Jensen X-Patchwork-Id: 1418296 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=irrelevant.dk Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=irrelevant.dk header.i=@irrelevant.dk header.a=rsa-sha256 header.s=fm1 header.b=K3G+Uv22; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.a=rsa-sha256 header.s=fm1 header.b=HQOyHdwl; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cy96V264yz9sWQ for ; Sat, 19 Dec 2020 00:42:58 +1100 (AEDT) Received: from localhost ([::1]:45308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqG24-0000xs-4U for incoming@patchwork.ozlabs.org; Fri, 18 Dec 2020 08:42:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqFpD-0003gB-PI; Fri, 18 Dec 2020 08:29:39 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:60035) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqFot-0002wY-3p; Fri, 18 Dec 2020 08:29:39 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 0F7BA8F2; Fri, 18 Dec 2020 08:29:16 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 18 Dec 2020 08:29:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=irrelevant.dk; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=wWv2fNjokaT46 09qW7onOktLNTiSjKrY8WjLJaLmM+M=; b=K3G+Uv22UjI7LrgR8mvE7ml3utlHj fkcrhyz1xoT6JSNwcooyVt+lF9xNb8vyQQ8QRuCkvN5N+w07Stykb8gGTbw1lrZ+ gGEmg7ZOB8raibH8Q3lA2epvQ51wGBNpGHouMJOgkZJW1bDpj+Jwx424CciZmz+9 5N8tVUIEuGqmukfGU69cGUAnSXLW/26f8hE5OG9Jsjn5E6NSWORcN7iP2Dcn78O0 +8sWz/iZ1lixw7DcUGQTs3/oFIt4dpN3uZCIQIPKWfZbcp8utZRCVpcsNtmzppO0 h5pjwG99VAL+w5FvSj02CAGNlaAHj/pDE6eREgf9oGcL5KQDAdRAnCBKw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=wWv2fNjokaT4609qW7onOktLNTiSjKrY8WjLJaLmM+M=; b=HQOyHdwl FDzJTVTqQ53+LD59k2Zq7tGGCY/JsCnXNgTfm712n2rNWzRA2fpDeciuxbI11vS/ loUsquUQpNmhNrYPIC7lil9hdEAacEd+Cp3Df1BNvfB5894GJH4AIEbc3uOzFulk Hbk+ic8/NXLGxJUC/wGmy2oPxG/8Yp+etMXNiqDuzQ2BRbSV/r3Q0PK5DyltzdME M6pNLCVIYSDhUo4blaLQJNRx+l5a4sRvjEiXzL/uLZlOe3jqSX2x2VM6Oc3D9kcm AhRvQ0zLJaRj6UWGC814SQj2u5nDAqomiKOV5lkh9GRUZTA0OXT/OkbpeoZwfXir 80xp9boRCWB+7A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudeliedghedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefmlhgruhhs ucflvghnshgvnhcuoehithhssehirhhrvghlvghvrghnthdrughkqeenucggtffrrghtth gvrhhnpeeuleetgeeiuefhgfekfefgveejiefgteekiedtgfdtieefhfdthfefueffvefg keenucfkphepkedtrdduieejrdelkedrudeltdenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpehithhssehirhhrvghlvghvrghnthdrughk X-ME-Proxy: Received: from apples.local (80-167-98-190-cable.dk.customer.tdc.net [80.167.98.190]) by mail.messagingengine.com (Postfix) with ESMTPA id B36F824005E; Fri, 18 Dec 2020 08:29:14 -0500 (EST) From: Klaus Jensen To: qemu-devel@nongnu.org Subject: [PATCH 5/8] hw/block/nvme: rename CAP_PMR_{SHIFT, MASK} to CAP_PMRS_{SHIFT, MASK} Date: Fri, 18 Dec 2020 14:29:02 +0100 Message-Id: <20201218132905.967326-6-its@irrelevant.dk> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201218132905.967326-1-its@irrelevant.dk> References: <20201218132905.967326-1-its@irrelevant.dk> MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.21; envelope-from=its@irrelevant.dk; helo=wout5-smtp.messagingengine.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Kevin Wolf , qemu-block@nongnu.org, Klaus Jensen , Max Reitz , Keith Busch , Andrzej Jakowski , Stefan Hajnoczi , Klaus Jensen Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Klaus Jensen Use the correct field name. Signed-off-by: Klaus Jensen --- include/block/nvme.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/block/nvme.h b/include/block/nvme.h index 24f3c256a7f9..686e2541a587 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -35,7 +35,7 @@ enum NvmeCapShift { CAP_CSS_SHIFT = 37, CAP_MPSMIN_SHIFT = 48, CAP_MPSMAX_SHIFT = 52, - CAP_PMR_SHIFT = 56, + CAP_PMRS_SHIFT = 56, CAP_CMB_SHIFT = 57, }; @@ -49,7 +49,7 @@ enum NvmeCapMask { CAP_CSS_MASK = 0xff, CAP_MPSMIN_MASK = 0xf, CAP_MPSMAX_MASK = 0xf, - CAP_PMR_MASK = 0x1, + CAP_PMRS_MASK = 0x1, CAP_CMB_MASK = 0x1, }; @@ -81,8 +81,8 @@ enum NvmeCapMask { << CAP_MPSMIN_SHIFT) #define NVME_CAP_SET_MPSMAX(cap, val) (cap |= (uint64_t)(val & CAP_MPSMAX_MASK)\ << CAP_MPSMAX_SHIFT) -#define NVME_CAP_SET_PMRS(cap, val) (cap |= (uint64_t)(val & CAP_PMR_MASK) \ - << CAP_PMR_SHIFT) +#define NVME_CAP_SET_PMRS(cap, val) (cap |= (uint64_t)(val & CAP_PMRS_MASK) \ + << CAP_PMRS_SHIFT) #define NVME_CAP_SET_CMBS(cap, val) (cap |= (uint64_t)(val & CAP_CMB_MASK) \ << CAP_CMB_SHIFT)