From nobody Sun Apr 12 00:55:10 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=mihalicyn.com ARC-Seal: i=1; a=rsa-sha256; t=1772615583; cv=none; d=zohomail.com; s=zohoarc; b=ZvcfAybnvVRtFGdAjT8z7QhvEeKnSMKb5EsOs1hvEX5j03M6zBaP4PVnM+pjDikVa2K9vDfev6sk8xGL2Mdb+4F+nkg6oq1JNZRJVZoP1Ipe3gAxE3sD8+Sm45ueTS1ygpreXIaWvBrEjkYmcEF1B0chOPdG7Hz3D4n3jOvUYY4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772615583; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gpP959L10hBsg4INOewg8w8g5XRXZUc7QBJng71AuUU=; b=aTIry/7UWG0XxXRYYHeTmYG6wZyGJ619EfFS03RwYB58EMq4+COhRkC3Q2xEJP8fkpw9XHphlyMoQkM7nZreboprPuLTT5vm7wfdZtEuKrkWRqwpl2qJhGAWZKheG19j+TM3rdRVG+vzoVKEDKyizmuko3UQZviTu0vPkKRdVJk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772615583326811.670494435332; Wed, 4 Mar 2026 01:13:03 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxiHi-00013q-1U; Wed, 04 Mar 2026 04:12:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vxiHa-00010n-3W for qemu-devel@nongnu.org; Wed, 04 Mar 2026 04:12:43 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vxiHX-0000IP-BH for qemu-devel@nongnu.org; Wed, 04 Mar 2026 04:12:41 -0500 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-439b78b638eso3177689f8f.2 for ; Wed, 04 Mar 2026 01:12:36 -0800 (PST) Received: from alex-laptop.lan (p200300cf57228c00bac66d1b6d99e025.dip0.t-ipconnect.de. [2003:cf:5722:8c00:bac6:6d1b:6d99:e025]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439c4489279sm9674234f8f.20.2026.03.04.01.12.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2026 01:12:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mihalicyn.com; s=mihalicyn; t=1772615555; x=1773220355; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gpP959L10hBsg4INOewg8w8g5XRXZUc7QBJng71AuUU=; b=TiTEL0nGnMVnEbYs6tYd/Qk97RpZBWQEmikzZLKWM4gY9ogL3MwgMfHoUlvIr/OtND Hz+u5bEccJpUrOxmPrpAg5bPPwC5/mLGsiYH+gsWi7/m6y6f2W+gX5vOQm4/l/gOiBx1 Es9aNbRUn+e+vjSTZq0niYHt4DGotPNcj2jFs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772615555; x=1773220355; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=gpP959L10hBsg4INOewg8w8g5XRXZUc7QBJng71AuUU=; b=hoDN05hzKVcA7AcvgICntN58XM/3Yges8FZ2mp8v0XWbXQYNH17rBaIl+lVaZZ5fPL tLMvYsw4d1qh1yYftr1r57txVhGVAl4RaH12DXf41T7NHvEANEAuuXM9Gz03IfAk3Wf1 ZsviBhCIpgoA4fCPW1cIBzqjQuPV5S5Ztg0MZkp8ofq/l7CSbYHV7W9YZKmffp8cce93 zGxM9yVhl65d94wgsQ+VVxQHLQ/I3H33cDsnzt2xgP9kTjVQHO/4nN8hEzpI0dcLH/T2 u/Dno5bAs8T+hpqLrXVr9P2purOhMDiri3xwdpDrLWaJl2cZnbr/QucO7fHtesxtyDqM ekSA== X-Gm-Message-State: AOJu0Yx+4WmC/cqM9A5043W+lq7F3Zp3B0V35nJhKUvaWVjD2lfBxSa3 zrpmNH8t4dmMVjsQ/cma+a0vKD/uWq803fftzN8GGKSWEU8CbzClezRhZ0WB2YiUboPPuOdGdgA 5fmoS8QU= X-Gm-Gg: ATEYQzx0kMv0rnEKRBUdxJxEmBcHxnme2v9BLDjUYheUh6lp4xBEc2DfuHFMeY+nUYd wb/fNWoiM0bCsLOlQGJiOnbNVxQeH3FB1s5s4/Nk/lAnZKpWFdcF38BN/h1ttPwFQlIK6GmmsJ/ lLZ0ihhgP+0jJPzTR6LetRVZ8vr77s57GKvaN86JKzQp44k2ds/Ioz6pSMXZuN7FwNnDWBWxf/i LzDDM6kwb0SbzRXKzNrOp6aWPVZFl+yY2+YCRhO5KxsBzZr8BXbP0mvLFKjvGK5pXN+25EdbObr ssD8tSShI1QGnYv65zI0bfax6taCiJDz5HZDZXvirtrMjnNL5MAWm3qwK/u2WL2buAMPvaYx1qK kn/bSeRgUPciTjN6n2/gWMk8XZioDBBxML8sEqUPNajSGFYdZ+RNkrnm+fPOSubF7ERxjVYz1xx wFO/rEdRW9O3aUHzC7+QEo8vBPaWyGcoWdnNuyo5J6TOmWPkXfUhFO0s+e/snj/psgsPDoVDXzE opTpmEMMGrwUHdQRuRKBGs= X-Received: by 2002:a05:6000:200c:b0:439:9282:e728 with SMTP id ffacd0b85a97d-439c7f64ff6mr2512939f8f.2.1772615554982; Wed, 04 Mar 2026 01:12:34 -0800 (PST) From: Alexander Mikhalitsyn To: qemu-devel@nongnu.org Cc: Klaus Jensen , Jesper Devantier , Peter Xu , Alexander Mikhalitsyn , Keith Busch , Fabiano Rosas , =?UTF-8?q?St=C3=A9phane=20Graber?= , qemu-block@nongnu.org, Alexander Mikhalitsyn Subject: [PATCH v2 2/4] hw/nvme: split nvme_init_sq/nvme_init_cq into helpers Date: Wed, 4 Mar 2026 10:12:27 +0100 Message-ID: <20260304091229.80725-3-alexander@mihalicyn.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260304091229.80725-1-alexander@mihalicyn.com> References: <20260304091229.80725-1-alexander@mihalicyn.com> MIME-Version: 1.0 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=2a00:1450:4864:20::430; envelope-from=alexander@mihalicyn.com; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @mihalicyn.com) X-ZM-MESSAGEID: 1772615586020158500 Content-Type: text/plain; charset="utf-8" From: Alexander Mikhalitsyn Signed-off-by: Alexander Mikhalitsyn --- hw/nvme/ctrl.c | 57 +++++++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 4694bdb4d02..89cc26d745b 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -4852,18 +4852,14 @@ static uint16_t nvme_del_sq(NvmeCtrl *n, NvmeReques= t *req) return NVME_SUCCESS; } =20 -static void nvme_init_sq(NvmeSQueue *sq, NvmeCtrl *n, uint64_t dma_addr, - uint16_t sqid, uint16_t cqid, uint16_t size) +static void __nvme_init_sq(NvmeSQueue *sq) { + NvmeCtrl *n =3D sq->ctrl; + uint16_t sqid =3D sq->sqid; + uint16_t cqid =3D sq->cqid; int i; NvmeCQueue *cq; =20 - sq->ctrl =3D n; - sq->dma_addr =3D dma_addr; - sq->sqid =3D sqid; - sq->size =3D size; - sq->cqid =3D cqid; - sq->head =3D sq->tail =3D 0; sq->io_req =3D g_new0(NvmeRequest, sq->size); =20 QTAILQ_INIT(&sq->req_list); @@ -4893,6 +4889,18 @@ static void nvme_init_sq(NvmeSQueue *sq, NvmeCtrl *n= , uint64_t dma_addr, n->sq[sqid] =3D sq; } =20 +static void nvme_init_sq(NvmeSQueue *sq, NvmeCtrl *n, uint64_t dma_addr, + uint16_t sqid, uint16_t cqid, uint16_t size) +{ + sq->ctrl =3D n; + sq->dma_addr =3D dma_addr; + sq->sqid =3D sqid; + sq->size =3D size; + sq->cqid =3D cqid; + sq->head =3D sq->tail =3D 0; + __nvme_init_sq(sq); +} + static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeRequest *req) { NvmeSQueue *sq; @@ -5553,24 +5561,16 @@ static uint16_t nvme_del_cq(NvmeCtrl *n, NvmeReques= t *req) return NVME_SUCCESS; } =20 -static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl *n, uint64_t dma_addr, - uint16_t cqid, uint16_t vector, uint16_t size, - uint16_t irq_enabled) +static void __nvme_init_cq(NvmeCQueue *cq) { + NvmeCtrl *n =3D cq->ctrl; PCIDevice *pci =3D PCI_DEVICE(n); + uint16_t cqid =3D cq->cqid; =20 - if (msix_enabled(pci) && irq_enabled) { - msix_vector_use(pci, vector); + if (msix_enabled(pci) && cq->irq_enabled) { + msix_vector_use(pci, cq->vector); } =20 - cq->ctrl =3D n; - cq->cqid =3D cqid; - cq->size =3D size; - cq->dma_addr =3D dma_addr; - cq->phase =3D 1; - cq->irq_enabled =3D irq_enabled; - cq->vector =3D vector; - cq->head =3D cq->tail =3D 0; QTAILQ_INIT(&cq->req_list); QTAILQ_INIT(&cq->sq_list); if (n->dbbuf_enabled) { @@ -5588,6 +5588,21 @@ static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl *n= , uint64_t dma_addr, &DEVICE(cq->ctrl)->mem_reentrancy_guard); } =20 +static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl *n, uint64_t dma_addr, + uint16_t cqid, uint16_t vector, uint16_t size, + uint16_t irq_enabled) +{ + cq->ctrl =3D n; + cq->cqid =3D cqid; + cq->size =3D size; + cq->dma_addr =3D dma_addr; + cq->phase =3D 1; + cq->irq_enabled =3D irq_enabled; + cq->vector =3D vector; + cq->head =3D cq->tail =3D 0; + __nvme_init_cq(cq); +} + static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeRequest *req) { NvmeCQueue *cq; --=20 2.47.3