From nobody Sun Feb 8 18:29:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602691161; cv=none; d=zohomail.com; s=zohoarc; b=HWNblJncrFaR9btFukQai43g4prdYsy9MmH19JCDsVzQUsJ5cOTVpaMEUkDcg+RfW1QgOvvggjQhDPYS2Fk30f96oEge8LGjnqJkeBYAv9fbMzCh0X1cyJdzhSbyvTq7oRm+vRoEyTfnroWqtA0YkbDdigvA7ApVuCmDz/GtOFk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602691161; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=YLxkAx2Y6NEXeaia5IYrWdVkNlawKHl6NTNLCcRm+HM=; b=W/vXUQB9lisIQX/BL5AhSOzp9Dfkic/6csF7RZKBhv/39fqamvToWCEEV4FNdUaewcFB/8VVDBE/ROxmTKvOlRtJGXjdf6gzBad3YtsvgY1lbtgrww6e9E5nNpMAIlo5XFyuXUrc12M0m6WhA4Ea882EE9vsXP9HMOdfT1JPwj0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602691161699153.63372910020894; Wed, 14 Oct 2020 08:59:21 -0700 (PDT) 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-12-Er_c0MtMOLmAzy4f2PnHSQ-1; Wed, 14 Oct 2020 11:59:19 -0400 Received: by mail-wm1-f71.google.com with SMTP id z7so33301wme.8 for ; Wed, 14 Oct 2020 08:59:18 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id b63sm140620wme.9.2020.10.14.08.59.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2020 08:59:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602691160; 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=YLxkAx2Y6NEXeaia5IYrWdVkNlawKHl6NTNLCcRm+HM=; b=eCw39aui4rW+qALP06qu0jbZAMem/pdXIdaHK2Ln2Lx2YAyRAAwo8upSJprbNHp0kfyCFH v+I9qUJrcuSg2JO2za/8EbaM4ttrWZmQiDfG35kSZbQDddvCnmRQWR3o0+j9TUGIVzPkpt QVfZLytEXF/i+iiLzPuuvBXi4EtkKOE= X-MC-Unique: Er_c0MtMOLmAzy4f2PnHSQ-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=YLxkAx2Y6NEXeaia5IYrWdVkNlawKHl6NTNLCcRm+HM=; b=B0SqXhc1ZVo5OUPX70OKMuhn6VLSEwKXAr7hsosxFRlbU6bLJKNb103ojkOkxfZexa m4At1QHv2wSxsa9giSee3YUvR45Eu13pXIFQQk+xEqS4VkMBTaJ5v4QUVARJvpG8KBG7 UPtJ8pEFs7KpzjlutDrp/H7NpBzkMdlzPX2XeW9lQloswcac3WE7ZcgNwiI+6N9Fw3on fUhYdFVP+yya/56QVvsizFrc6Ul9AmLsNtLHrawMpEvZPMAyjBlwLVSPGPo4pRpegRMx 1KtOUdAG9dvLSYtGzEcaNUSzTiUpuMLmK93xyzDAYasC6d8mKYlDgrlX7lUaOJopIhxG jHqA== X-Gm-Message-State: AOAM5325d3LnRZUMDDewigyleXSqNh/TiLVE8Ygq+o+/+K/7VPieNU0r 6JSeEfaxLzg6cy+LCg0S89wvQq/X2Jb9jyhZd53AsteFlbhuOd037FO5KW1Dp940B08Nral6WF7 SgVB1zmLuuU95jA== X-Received: by 2002:adf:fc51:: with SMTP id e17mr6110752wrs.45.1602691157631; Wed, 14 Oct 2020 08:59:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyAAwx+uTHoB0/5UNZAAiU8ffhFaePPO/3N56ZhAQ7f9v+cQmbMDDmAHAii2DzE/YyqdXlApA== X-Received: by 2002:adf:fc51:: with SMTP id e17mr6110732wrs.45.1602691157409; Wed, 14 Oct 2020 08:59:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Fam Zheng , Stefan Hajnoczi , Kevin Wolf , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 13/15] block/nvme: Simplify ADMIN queue access Date: Wed, 14 Oct 2020 17:58:08 +0200 Message-Id: <20201014155810.102841-14-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201014155810.102841-1-philmd@redhat.com> References: <20201014155810.102841-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" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) We don't need to dereference from BDRVNVMeState each time. Use a NVMeQueuePair pointer to the admin queue and use it. The nvme_init() becomes easier to review, matching the style of nvme_add_io_queue(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- block/nvme.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/block/nvme.c b/block/nvme.c index 299fc82f40f..ea5180d8a27 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -690,6 +690,7 @@ static int nvme_init(BlockDriverState *bs, const char *= device, int namespace, Error **errp) { BDRVNVMeState *s =3D bs->opaque; + NVMeQueuePair *q; AioContext *aio_context =3D bdrv_get_aio_context(bs); int ret; uint64_t cap; @@ -769,19 +770,20 @@ static int nvme_init(BlockDriverState *bs, const char= *device, int namespace, =20 /* Set up admin queue. */ s->queues =3D g_new(NVMeQueuePair *, 1); - s->queues[INDEX_ADMIN] =3D nvme_create_queue_pair(s, aio_context, 0, + q =3D nvme_create_queue_pair(s, aio_context, 0, NVME_QUEUE_SIZE, errp); - if (!s->queues[INDEX_ADMIN]) { + if (!q) { ret =3D -EINVAL; goto out; } + s->queues[INDEX_ADMIN] =3D q; s->nr_queues =3D 1; QEMU_BUILD_BUG_ON(NVME_QUEUE_SIZE & 0xF000); regs->aqa =3D cpu_to_le32((NVME_QUEUE_SIZE << AQA_ACQS_SHIFT) | (NVME_QUEUE_SIZE << AQA_ASQS_SHIFT)); - regs->asq =3D cpu_to_le64(s->queues[INDEX_ADMIN]->sq.iova); - regs->acq =3D cpu_to_le64(s->queues[INDEX_ADMIN]->cq.iova); + regs->asq =3D cpu_to_le64(q->sq.iova); + regs->acq =3D cpu_to_le64(q->cq.iova); =20 /* After setting up all control registers we can enable device now. */ regs->cc =3D cpu_to_le32((ctz32(NVME_CQ_ENTRY_BYTES) << CC_IOCQES_SHIF= T) | --=20 2.26.2