From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54262) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwsCd-0006Kk-Uo for qemu-devel@nongnu.org; Fri, 05 Dec 2014 07:41:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XwsCY-0004hz-1e for qemu-devel@nongnu.org; Fri, 05 Dec 2014 07:41:43 -0500 Received: from mail-wi0-f182.google.com ([209.85.212.182]:41263) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwsCX-0004hj-Rp for qemu-devel@nongnu.org; Fri, 05 Dec 2014 07:41:37 -0500 Received: by mail-wi0-f182.google.com with SMTP id h11so1251958wiw.3 for ; Fri, 05 Dec 2014 04:41:36 -0800 (PST) From: alex@e8storage.com Date: Fri, 5 Dec 2014 14:40:24 +0200 Message-Id: <1417783224-8825-1-git-send-email-alex@e8storage.com> Subject: [Qemu-devel] [PATCH] nvme: Fix get/set number of queues feature List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: keith.busch@intel.com, Alex Friedman From: Alex Friedman According to the specification, the low 16 bits should contain the number of I/O submission queues, and the high 16 bits should contain the number of I/O completion queues. Signed-off-by: Alex Friedman --- hw/block/nvme.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index b6263dc..405cf4f 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -476,7 +476,8 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) switch (dw10) { case NVME_NUMBER_OF_QUEUES: - req->cqe.result = cpu_to_le32(n->num_queues); + req->cqe.result = + cpu_to_le32((n->num_queues - 1) | ((n->num_queues - 1) << 16)); break; default: return NVME_INVALID_FIELD | NVME_DNR; @@ -490,7 +491,8 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) switch (dw10) { case NVME_NUMBER_OF_QUEUES: - req->cqe.result = cpu_to_le32(n->num_queues); + req->cqe.result = + cpu_to_le32((n->num_queues - 1) | ((n->num_queues - 1) << 16)); break; default: return NVME_INVALID_FIELD | NVME_DNR; -- 1.9.3