aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKlaus Jensen <k.jensen@samsung.com>2021-01-13 10:19:44 +0100
committerKlaus Jensen <k.jensen@samsung.com>2021-02-08 21:15:54 +0100
commitc2a3640de8e97bc0398976a7fc0fe9f6a088e777 (patch)
tree542b26bf82e1d0c6c331dc415793cbb76a33fdc3 /include
parentf4319477b4fd692b568c22ed97dde7f542a48ac9 (diff)
downloadqemu-c2a3640de8e97bc0398976a7fc0fe9f6a088e777.zip
qemu-c2a3640de8e97bc0398976a7fc0fe9f6a088e777.tar.gz
qemu-c2a3640de8e97bc0398976a7fc0fe9f6a088e777.tar.bz2
hw/block/nvme: bump to v1.4
With the new CMB logic in place, bump the implemented specification version to v1.4 by default. This requires adding the setting the CNTRLTYPE field and modifying the VWC field since 0x00 is no longer a valid value for bits 2:1. Reviewed-by: Keith Busch <kbusch@kernel.org> Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Diffstat (limited to 'include')
-rw-r--r--include/block/nvme.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/block/nvme.h b/include/block/nvme.h
index 2e85b97..07cfc92 100644
--- a/include/block/nvme.h
+++ b/include/block/nvme.h
@@ -951,7 +951,8 @@ typedef struct QEMU_PACKED NvmeIdCtrl {
uint32_t rtd3e;
uint32_t oaes;
uint32_t ctratt;
- uint8_t rsvd100[12];
+ uint8_t rsvd100[11];
+ uint8_t cntrltype;
uint8_t fguid[16];
uint8_t rsvd128[128];
uint16_t oacs;