[PULL,26/33] block/nvme: Fix nvme_submit_command() on big-endian host

Commit Message

Stefan Hajnoczi Nov. 4, 2020, 3:18 p.m. UTC

From: Philippe Mathieu-Daudé <[e-mail]>

The Completion Queue Command Identifier is a 16-bit value,
so nvme_submit_command() is unlikely to work on big-endian
hosts, as the relevant bits are truncated.
Fix by using the correct byte-swap function.

Fixes: bdd6a90a9e5 ("block: Add VFIO based NVMe driver")
Reported-by: Keith Busch <[e-mail]>
Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>
Reviewed-by: Stefan Hajnoczi <[e-mail]>
Message-id: [e-mail]
Signed-off-by: Stefan Hajnoczi <[e-mail]>
Tested-by: Eric Auger <[e-mail]>
---
 block/nvme.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/block/nvme.c b/block/nvme.c
index c8ef69cbb2..a06a188d53 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -469,7 +469,7 @@  static void nvme_submit_command(NVMeQueuePair *q, NVMeRequest *req,
     assert(!req->cb);
     req->cb = cb;
     req->opaque = opaque;
-    cmd->cid = cpu_to_le32(req->cid);
+    cmd->cid = cpu_to_le16(req->cid);
 
     trace_nvme_submit_command(q->s, q->index, req->cid);
     nvme_trace_command(cmd);