From nobody Mon Feb 9 03:12:49 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597258635; cv=none; d=zohomail.com; s=zohoarc; b=H+uEcs805VRhcgq4ALg1nbqm2FusBXUAWBMZkoRCrqaE1fzHOWqF/T79Qu305hb6+TFtXr/sxEh/w8DbUNStrWxNPpWji+lDtZGlpbxnsFdS6ymJw3YZBBsvDPfCIyKhQL9McDTLq0RfxU9xodwsOhFMEWyO3+bWJz2cwzyx33w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597258635; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SEv01UlOWkkBHI+HUgfHlgknxCIpEGzNYGd43Sq3Mjg=; b=jPlpiCMk/WtKfTwoSTDFYcoPctDPcXPQu031VIRNMv0EMEJj4vvu9O539qus6SvJqZquBAI8NQ5WVCP09nWQCk1MYJ9GrLUfnHugZpWjKzmvVi1bijBZ8Cy9AiPtelccMNIQvp3q9OfKRXC7iPRPT/4OfS6uvvIVUqLmfRzcnjM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597258635195506.0533647375387; Wed, 12 Aug 2020 11:57:15 -0700 (PDT) Received: from localhost ([::1]:50802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5vw1-0003iO-Kq for importer@patchew.org; Wed, 12 Aug 2020 14:57:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5vpz-0000VT-Jh for qemu-devel@nongnu.org; Wed, 12 Aug 2020 14:50:59 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:41655 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k5vpx-0004fm-Uq for qemu-devel@nongnu.org; Wed, 12 Aug 2020 14:50:59 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-349-gqGyqAX2Ml6MAFaZOTgAsg-1; Wed, 12 Aug 2020 14:50:54 -0400 Received: by mail-wm1-f71.google.com with SMTP id u14so1710731wml.0 for ; Wed, 12 Aug 2020 11:50:54 -0700 (PDT) Received: from x1w.redhat.com (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id 3sm4830894wms.36.2020.08.12.11.50.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2020 11:50:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597258257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SEv01UlOWkkBHI+HUgfHlgknxCIpEGzNYGd43Sq3Mjg=; b=XIKePYyFSeLTwavwwOwLAxgTM8LnEXJbfm6HTVR9zmqHSl9TpRYugiGH1TLZwbE0Rvavei 32LrCW1lzvz/ym+szQ+rzAG2wYIBty/zpowDJAbaLIZtPH/Cz2FRXATZUnGSDWaFh0KllZ +RoYz0rKKrgHIjxrTjkADzb9DTDg8QI= X-MC-Unique: gqGyqAX2Ml6MAFaZOTgAsg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SEv01UlOWkkBHI+HUgfHlgknxCIpEGzNYGd43Sq3Mjg=; b=jj/fA3sVtfDOF1CXB1hFyDURrpUR3SCwrYDORoeLs3ArwP70P6LL1Oe1Zu5UxKDSXX s32b6WiJtnazk8ooEMaYQnZYAPfBJFfqac8D+YNxIiqcy+D9K2wbuCBJklQY9AN7isYb wRwUvsGhe7D23Gm6gCmoIRImeyHDijlK5RvyvX4EM4jKMN/1QJgEk5wXQYYWAolhJ/JT o08zp5jq/dr2I9DCqMPN5sdpx+sjqDeFBlMuVNpCN8jDNDxc2ErOo3t5rBpild+JK1+B OHwJEkn93WY2IQuL32GP4gstybPfLxwCax8dq9rlK7Ef9o15WdlrvIIMb8bNCyTZ6XT0 upGA== X-Gm-Message-State: AOAM532plfcDgmh/pEtdx3cPhdZFZynl/cgrxZS/rC6GSUiuWsnlxe08 +oQUPvKz1fN+Oua+lMcBxs2uN9kktXw2hesK1oDKqipqAfgm23ntCqn4gRA4lXQ50qDA6tpqeDa QvT+YWAaxlO9S/78= X-Received: by 2002:a1c:4d12:: with SMTP id o18mr922164wmh.55.1597258253588; Wed, 12 Aug 2020 11:50:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpP3+0VFdyIseq2AoOQSg64+0+52YugevHoKb/SnHflllS3/LZuFBIgtOwmyP2vmgT/51eWg== X-Received: by 2002:a1c:4d12:: with SMTP id o18mr922151wmh.55.1597258253408; Wed, 12 Aug 2020 11:50:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 07/14] block/nvme: Rename local variable Date: Wed, 12 Aug 2020 20:50:07 +0200 Message-Id: <20200812185014.18267-8-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200812185014.18267-1-philmd@redhat.com> References: <20200812185014.18267-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/12 06:16:38 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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, Max Reitz , Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We are going to modify the code in the next commit. Renaming the 'resp' variable to 'id' first makes the next commit easier to review. No logical changes. Reviewed-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- block/nvme.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/block/nvme.c b/block/nvme.c index 3101f1ad55..99822d9fd3 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -510,8 +510,8 @@ static void nvme_identify(BlockDriverState *bs, int nam= espace, Error **errp) BDRVNVMeState *s =3D bs->opaque; NvmeIdCtrl *idctrl; NvmeIdNs *idns; + uint8_t *id; NvmeLBAF *lbaf; - uint8_t *resp; uint16_t oncs; int r; uint64_t iova; @@ -520,14 +520,14 @@ static void nvme_identify(BlockDriverState *bs, int n= amespace, Error **errp) .cdw10 =3D cpu_to_le32(0x1), }; =20 - resp =3D qemu_try_blockalign0(bs, sizeof(NvmeIdCtrl)); - if (!resp) { + id =3D qemu_try_blockalign0(bs, sizeof(NvmeIdCtrl)); + if (!id) { error_setg(errp, "Cannot allocate buffer for identify response"); goto out; } - idctrl =3D (NvmeIdCtrl *)resp; - idns =3D (NvmeIdNs *)resp; - r =3D qemu_vfio_dma_map(s->vfio, resp, sizeof(NvmeIdCtrl), true, &iova= ); + idctrl =3D (NvmeIdCtrl *)id; + idns =3D (NvmeIdNs *)id; + r =3D qemu_vfio_dma_map(s->vfio, id, sizeof(NvmeIdCtrl), true, &iova); if (r) { error_setg(errp, "Cannot map buffer for DMA"); goto out; @@ -554,8 +554,7 @@ static void nvme_identify(BlockDriverState *bs, int nam= espace, Error **errp) s->supports_write_zeroes =3D !!(oncs & NVME_ONCS_WRITE_ZEROS); s->supports_discard =3D !!(oncs & NVME_ONCS_DSM); =20 - memset(resp, 0, 4096); - + memset(id, 0, 4096); cmd.cdw10 =3D 0; cmd.nsid =3D cpu_to_le32(namespace); if (nvme_cmd_sync(bs, s->queues[INDEX_ADMIN], &cmd)) { @@ -587,8 +586,8 @@ static void nvme_identify(BlockDriverState *bs, int nam= espace, Error **errp) =20 s->blkshift =3D lbaf->ds; out: - qemu_vfio_dma_unmap(s->vfio, resp); - qemu_vfree(resp); + qemu_vfio_dma_unmap(s->vfio, id); + qemu_vfree(id); } =20 static bool nvme_poll_queues(BDRVNVMeState *s) --=20 2.21.3