{"id":2197258,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2197258/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260217152517.271422-3-alexander@mihalicyn.com>","date":"2026-02-17T15:25:15","name":"[2/4] hw/nvme: split nvme_init_sq/nvme_init_cq into helpers","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"1664d23986b1a5be7ddea6898548e78797729022","submitter":{"id":81630,"url":"http://patchwork.ozlabs.org/api/1.0/people/81630/?format=json","name":"Alexander Mikhalitsyn","email":"alexander@mihalicyn.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260217152517.271422-3-alexander@mihalicyn.com/mbox/","series":[{"id":492445,"url":"http://patchwork.ozlabs.org/api/1.0/series/492445/?format=json","date":"2026-02-17T15:25:13","name":"hw/nvme: add basic live migration support","version":1,"mbox":"http://patchwork.ozlabs.org/series/492445/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2197258/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n secure) header.d=mihalicyn.com header.i=@mihalicyn.com header.a=rsa-sha256\n header.s=mihalicyn header.b=U4XIah9P;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fFkfZ2sTlz1xwF\n\tfor ; Wed, 18 Feb 2026 02:52:06 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1vsNMA-0002KC-Vu; Tue, 17 Feb 2026 10:51:23 -0500","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1vsMx4-0003bX-VT\n for qemu-devel@nongnu.org; Tue, 17 Feb 2026 10:25:26 -0500","from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from )\n id 1vsMx3-0005fo-A3\n for qemu-devel@nongnu.org; Tue, 17 Feb 2026 10:25:26 -0500","by mail-wm1-x32d.google.com with SMTP id\n 5b1f17b1804b1-48372efa020so31710535e9.2\n for ; Tue, 17 Feb 2026 07:25:24 -0800 (PST)","from alex-laptop.lan\n (p200300cf574bcf00ffb15ba913f79a3b.dip0.t-ipconnect.de.\n [2003:cf:574b:cf00:ffb1:5ba9:13f7:9a3b])\n by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-4835dd0e327sm519169015e9.14.2026.02.17.07.25.21\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 17 Feb 2026 07:25:21 -0800 (PST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=mihalicyn.com; s=mihalicyn; t=1771341923; x=1771946723; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=gpP959L10hBsg4INOewg8w8g5XRXZUc7QBJng71AuUU=;\n b=U4XIah9PEwipknD1wF6QX1V0A8n9YkVLGzK/y7x2BQ7ThJ3vsDikGIiJL//kyExl4U\n f3mhA5RLLffAbvn6tTaK3eNoBFkSSnrUVRbDKuYMklKQcHA2dlq9rIRMKO3mZqk1Z80P\n mqje8khLXsiGJAbbw9YBMVRoNo25mX0qLleU0=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1771341923; x=1771946723;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=gpP959L10hBsg4INOewg8w8g5XRXZUc7QBJng71AuUU=;\n b=lsVwzwQn4eNmxZ5/iK+LlGzGGqDMk9ePpobZFyL9E4H0HcSqqc7KFImlSQogpDimhk\n woeBEMBPq1+nZ9tNyxQ0l+D7DtUV2+m79NmivWrxC3w3Y/I8Q3JrUqg+fV1FUv7MrhI0\n ho2Iox66iBixjxu2nsn20/h+6Kgf4XL1kUpfjaxxCl1HyqQ4+5W9Xr+Yk286kLq5Ingh\n ecFAaD1niiuk/eRTy4olHfN2ekC9CoK4sZfZyfugLhY8ms/AukBqVSl+saXmEK5vrQuE\n SYlVbjBmA9lng8mAwzEE27Zwb3p6voPBhmVCpvVgPoYUfpX5oQHviVU+AUrlQeCFFAbj\n h+Lw==","X-Gm-Message-State":"AOJu0Yw3FGoceBtHnFbxA7cjdmtUPuchz3vBe3gSt0zENX75dh/QVIZ9\n WqnOSPlCDEexHpy7PUx7ZNCzjklDABGFMwpRQXilH3D13jUXg0VGwajK7Cu7PTPNwbXiX1fR5fG\n FLJYu","X-Gm-Gg":"AZuq6aI1+VaEhPH6bdEyRizV2dLNh/ffcvj2kyO52QljQ0kkstl0f0bi0wvsszd/l5Y\n 0FYmvEmrMgu/ckw/Ynd39QcXEnQMvURVMeMrKXQrpvGljLmk3CfAWVUkYZKqYlC65gFJBCyhz13\n A5OZukL/uDxVPkdx9x8DwiqObySK++hT/9SQxcrKqS+RtMQSHt/R6bj/KxdWZGJL9jxOGa55Cvd\n WDcIxjlo1oxAd4GP+Z1jDOPubZgNe9Tuvb6et4c3bjFpe17cGpT2hUjVvdc1PoRwEMhAEY6oLWY\n IOGxG0arMQeWGnv7PWIqJ36b9L5iv1OwsFjborHKvsKM+/bbZCEyG+AQqAW7yPjDJKJR3GFF3Ez\n 1E1ZZ/gj7kg/0S5QB3+o+nXXmlXcQdUCCtBfuy1Zs9evfhUPX6n66hPe6Ewc6hsalol4q5vCyLd\n VtDpWdBXtxF9RMOhM1P0bqxlIl3fv3xyaqaAD1zfTUTHh0j0HsnPqS2gt18TUp8WRNoSWeGEepd\n YoFNyB03FKSc5InvsxYbN8=","X-Received":"by 2002:a05:600c:46c9:b0:46e:4a13:e6c6 with SMTP id\n 5b1f17b1804b1-48379bfd71cmr178343185e9.19.1771341922297;\n Tue, 17 Feb 2026 07:25:22 -0800 (PST)","From":"Alexander Mikhalitsyn ","To":"qemu-devel@nongnu.org","Cc":"Jesper Devantier , Peter Xu ,\n Klaus Jensen , Fabiano Rosas ,\n qemu-block@nongnu.org, Keith Busch ,\n Alexander Mikhalitsyn ","Subject":"[PATCH 2/4] hw/nvme: split nvme_init_sq/nvme_init_cq into helpers","Date":"Tue, 17 Feb 2026 16:25:15 +0100","Message-ID":"<20260217152517.271422-3-alexander@mihalicyn.com>","X-Mailer":"git-send-email 2.47.3","In-Reply-To":"<20260217152517.271422-1-alexander@mihalicyn.com>","References":"<20260217152517.271422-1-alexander@mihalicyn.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2a00:1450:4864:20::32d;\n envelope-from=alexander@mihalicyn.com; helo=mail-wm1-x32d.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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-Mailman-Approved-At":"Tue, 17 Feb 2026 10:51:21 -0500","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"From: Alexander Mikhalitsyn \n\nSigned-off-by: Alexander Mikhalitsyn \n---\n hw/nvme/ctrl.c | 57 +++++++++++++++++++++++++++++++-------------------\n 1 file changed, 36 insertions(+), 21 deletions(-)","diff":"diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c\nindex 4694bdb4d02..89cc26d745b 100644\n--- a/hw/nvme/ctrl.c\n+++ b/hw/nvme/ctrl.c\n@@ -4852,18 +4852,14 @@ static uint16_t nvme_del_sq(NvmeCtrl *n, NvmeRequest *req)\n return NVME_SUCCESS;\n }\n \n-static void nvme_init_sq(NvmeSQueue *sq, NvmeCtrl *n, uint64_t dma_addr,\n- uint16_t sqid, uint16_t cqid, uint16_t size)\n+static void __nvme_init_sq(NvmeSQueue *sq)\n {\n+ NvmeCtrl *n = sq->ctrl;\n+ uint16_t sqid = sq->sqid;\n+ uint16_t cqid = sq->cqid;\n int i;\n NvmeCQueue *cq;\n \n- sq->ctrl = n;\n- sq->dma_addr = dma_addr;\n- sq->sqid = sqid;\n- sq->size = size;\n- sq->cqid = cqid;\n- sq->head = sq->tail = 0;\n sq->io_req = g_new0(NvmeRequest, sq->size);\n \n QTAILQ_INIT(&sq->req_list);\n@@ -4893,6 +4889,18 @@ static void nvme_init_sq(NvmeSQueue *sq, NvmeCtrl *n, uint64_t dma_addr,\n n->sq[sqid] = sq;\n }\n \n+static void nvme_init_sq(NvmeSQueue *sq, NvmeCtrl *n, uint64_t dma_addr,\n+ uint16_t sqid, uint16_t cqid, uint16_t size)\n+{\n+ sq->ctrl = n;\n+ sq->dma_addr = dma_addr;\n+ sq->sqid = sqid;\n+ sq->size = size;\n+ sq->cqid = cqid;\n+ sq->head = sq->tail = 0;\n+ __nvme_init_sq(sq);\n+}\n+\n static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeRequest *req)\n {\n NvmeSQueue *sq;\n@@ -5553,24 +5561,16 @@ static uint16_t nvme_del_cq(NvmeCtrl *n, NvmeRequest *req)\n return NVME_SUCCESS;\n }\n \n-static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl *n, uint64_t dma_addr,\n- uint16_t cqid, uint16_t vector, uint16_t size,\n- uint16_t irq_enabled)\n+static void __nvme_init_cq(NvmeCQueue *cq)\n {\n+ NvmeCtrl *n = cq->ctrl;\n PCIDevice *pci = PCI_DEVICE(n);\n+ uint16_t cqid = cq->cqid;\n \n- if (msix_enabled(pci) && irq_enabled) {\n- msix_vector_use(pci, vector);\n+ if (msix_enabled(pci) && cq->irq_enabled) {\n+ msix_vector_use(pci, cq->vector);\n }\n \n- cq->ctrl = n;\n- cq->cqid = cqid;\n- cq->size = size;\n- cq->dma_addr = dma_addr;\n- cq->phase = 1;\n- cq->irq_enabled = irq_enabled;\n- cq->vector = vector;\n- cq->head = cq->tail = 0;\n QTAILQ_INIT(&cq->req_list);\n QTAILQ_INIT(&cq->sq_list);\n if (n->dbbuf_enabled) {\n@@ -5588,6 +5588,21 @@ static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl *n, uint64_t dma_addr,\n &DEVICE(cq->ctrl)->mem_reentrancy_guard);\n }\n \n+static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl *n, uint64_t dma_addr,\n+ uint16_t cqid, uint16_t vector, uint16_t size,\n+ uint16_t irq_enabled)\n+{\n+ cq->ctrl = n;\n+ cq->cqid = cqid;\n+ cq->size = size;\n+ cq->dma_addr = dma_addr;\n+ cq->phase = 1;\n+ cq->irq_enabled = irq_enabled;\n+ cq->vector = vector;\n+ cq->head = cq->tail = 0;\n+ __nvme_init_cq(cq);\n+}\n+\n static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeRequest *req)\n {\n NvmeCQueue *cq;\n","prefixes":["2/4"]}