From nobody Sat Nov 15 08:33:30 2025 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=1593898756; cv=none; d=zohomail.com; s=zohoarc; b=TleWDOMc42d8lnguamC5ueU6DSnr65ufeTZbf+Mb1k2ZQhDnU2YR8YI07LG5NUa4X4Y/t97w+ijo2OvKob7iC1ueUWQLa0YfA7okZtNPwblJmQk5TEXO7aFGeTdbviezGupWML4JcwLuK43zawuNF5WDko4PitfeVFMWFKkybbw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593898756; 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=g1c5IpvFtEmHb1Ar7U/yHo4EA4jabVRcmhD5AWDwl8w=; b=AQN8SQTJ845ruEzFT62yMzPsbj0jBK71UbteQywH9a6xI4d7tw8islR6cX7tmY8m9HwXBIZZIqskEzyizyvOdOuAqnMRA1sVzIuxnw7tLvOLkcAq5l9RZZO+cN+Kgm1BZ120Ss6EA4gGjGBJrpI5sIvGlIbq2Wz9RU70FNESuMo= 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 1593898756632598.1689754718317; Sat, 4 Jul 2020 14:39:16 -0700 (PDT) Received: from localhost ([::1]:52984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrpsR-0007la-Es for importer@patchew.org; Sat, 04 Jul 2020 17:39:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrpkz-0002Y0-6x for qemu-devel@nongnu.org; Sat, 04 Jul 2020 17:31:33 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:28048 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 1jrpkx-00042i-3C for qemu-devel@nongnu.org; Sat, 04 Jul 2020 17:31:32 -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-401-Uyt6LeGBOQ2PCetvpsNs5A-1; Sat, 04 Jul 2020 17:31:29 -0400 Received: by mail-wm1-f71.google.com with SMTP id t145so40858479wmt.2 for ; Sat, 04 Jul 2020 14:31:28 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id r3sm20317005wrg.70.2020.07.04.14.31.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jul 2020 14:31:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593898290; 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=g1c5IpvFtEmHb1Ar7U/yHo4EA4jabVRcmhD5AWDwl8w=; b=Jy2trg+Xktmb2E5vN38tl7Wi2oRcXCSoXlF9OjNcS8w+bwVqzed2fTGMQwPkbL8XciIDQL p+OlzhpZRphCIFVJeejJY39RSO4Lcz0/5qKQEKOyQe23lY6ORsfWFMNXAAFPnVJYk5cqmD xEDrwmSblBeWo+y8uy6KNvdCsXbjebY= X-MC-Unique: Uyt6LeGBOQ2PCetvpsNs5A-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=g1c5IpvFtEmHb1Ar7U/yHo4EA4jabVRcmhD5AWDwl8w=; b=VcjzsMjW+Agyv7QEUTO8s8UN6jV96hAtjwekKYpKzaeYbcH5MYbPaPS0xr10BiaKcC iV/HmoYE/94VOuJ5lkjkMZUor/ULyoUjFOnBf3VB2MGG9Zo3zg1Qr/ZdB3d4Y4MXooKu OC1CR7QhmZi0pDQVCllEn0fZvSg9sHHIiq45wW2b9YbVNwVlooVyvatTqEt/kOiPiLyR ZJBfDM5Z8TvJmpR2YkkmZca3x98QJFR5z7LINm7SX6brV1c4hsfQnjkaKvFTKB7ZRCqn dWiNPX0fJj6BhUkV0uF5k3Ajln7UrKlFnlVgwS3acgVZPdRyuL5lcW+kZ2JknHj+UkxS vwKQ== X-Gm-Message-State: AOAM532zL+MACuE/aXAEsIemnhYuNyof8ZhnuFPEJHP43x0Eat2yIrLL 9aWdgs5Bkv9/HZDpjad1BiC9tHD63xuo+vUbhEjf+nRVwnMRATYoxk7ZrjQuO5w1J6wddtpC/HQ RxV4YKVS9r1+02mw= X-Received: by 2002:a5d:4710:: with SMTP id y16mr43646065wrq.189.1593898287671; Sat, 04 Jul 2020 14:31:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5qBnEmPCl99zftVC0GuLy35BSXnn8vwFXd+qK5LBR4ARdr2sC5nZibzJ0bFhKOtP1QooR6g== X-Received: by 2002:a5d:4710:: with SMTP id y16mr43646056wrq.189.1593898287508; Sat, 04 Jul 2020 14:31:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [PATCH v3 07/16] block/nvme: Rename local variable Date: Sat, 4 Jul 2020 23:30:42 +0200 Message-Id: <20200704213051.19749-8-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200704213051.19749-1-philmd@redhat.com> References: <20200704213051.19749-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/07/04 17:30:56 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=_AUTOLEARN 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: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, Maxim Levitsky , Max Reitz , =?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 7bec52ca35..0e4e5ff107 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[QUEUE_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