Signed-off-by: Klaus Birkelund Jensen <klaus.jen...@cnexlabs.com> --- hw/block/nvme.c | 4 ++-- hw/block/nvme.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 81201a8b4834..5cd593806701 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -184,7 +184,7 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, QEMUSGList *qsg, uint64_t prp1, int num_prps = (len >> n->page_bits) + 1; uint16_t status = NVME_SUCCESS; - trace_nvme_map_prp(req->cmd_opcode, trans_len, len, prp1, prp2, num_prps); + trace_nvme_map_prp(req->cmd.opcode, trans_len, len, prp1, prp2, num_prps); if (unlikely(!prp1)) { trace_nvme_err_invalid_prp(); @@ -1559,7 +1559,7 @@ static void nvme_init_req(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) memset(&req->cqe, 0, sizeof(req->cqe)); req->cqe.cid = le16_to_cpu(cmd->cid); - req->cmd_opcode = cmd->opcode; + memcpy(&req->cmd, cmd, sizeof(NvmeCmd)); req->is_cmb = false; req->status = NVME_SUCCESS; diff --git a/hw/block/nvme.h b/hw/block/nvme.h index 70f4781a1b61..7e1e026d90e6 100644 --- a/hw/block/nvme.h +++ b/hw/block/nvme.h @@ -52,7 +52,7 @@ typedef struct NvmeRequest { uint16_t status; bool is_cmb; bool is_write; - uint8_t cmd_opcode; + NvmeCmd cmd; QTAILQ_HEAD(, NvmeBlockBackendRequest) blk_req_tailq; QTAILQ_ENTRY(NvmeRequest)entry; @@ -143,7 +143,7 @@ typedef struct NvmeCtrl { static inline bool nvme_rw_is_write(NvmeRequest *req) { - return req->cmd_opcode == NVME_CMD_WRITE; + return req->cmd.opcode == NVME_CMD_WRITE; } static inline bool nvme_is_error(uint16_t status, uint16_t err) -- 2.21.0