diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-05-18 12:22:16 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-05-18 12:22:16 +0100 |
| commit | 15e147b3c778f9f4c08c79b99747b848b6e2117b (patch) | |
| tree | 5b825a181b78cd06550309da4458a9f20b114aff /include | |
| parent | 8e22b27994dba67f3d67d2cb7cf67d7863862b67 (diff) | |
| parent | 88eea45c536470cd3c43440cbb1cd4d3b9fa519c (diff) | |
| download | qemu-15e147b3c778f9f4c08c79b99747b848b6e2117b.zip qemu-15e147b3c778f9f4c08c79b99747b848b6e2117b.tar.gz qemu-15e147b3c778f9f4c08c79b99747b848b6e2117b.tar.bz2 | |
Merge remote-tracking branch 'remotes/nvme/tags/nvme-next-pull-request' into staging
emulated nvme updates
* various fixes (Gollu Appalanaidu)
* refactoring (me)
* move to hw/nvme from hw/block (me)
# gpg: Signature made Mon 17 May 2021 10:16:01 BST
# gpg: using RSA key 522833AA75E2DCE6A24766C04DE1AF316D4F0DE9
# gpg: Good signature from "Klaus Jensen <its@irrelevant.dk>" [unknown]
# gpg: aka "Klaus Jensen <k.jensen@samsung.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: DDCA 4D9C 9EF9 31CC 3468 4272 63D5 6FC5 E55D A838
# Subkey fingerprint: 5228 33AA 75E2 DCE6 A247 66C0 4DE1 AF31 6D4F 0DE9
* remotes/nvme/tags/nvme-next-pull-request:
hw/nvme: move nvme emulation out of hw/block
hw/block/nvme: move zoned constraints checks
hw/block/nvme: remove irrelevant zone resource checks
hw/block/nvme: remove num_namespaces member
hw/block/nvme: streamline namespace array indexing
hw/block/nvme: add metadata offset helper
hw/block/nvme: cache lba and ms sizes
hw/block/nvme: replace nvme_ns_status
hw/block/nvme: remove non-shared defines from header file
hw/block/nvme: cleanup includes
hw/block/nvme: consolidate header files
hw/block/nvme: rename __nvme_select_ns_iocs
hw/block/nvme: rename __nvme_advance_zone_wp
hw/block/nvme: rename __nvme_zrm_open
hw/block/nvme: align with existing style
hw/block/nvme: function formatting fix
hw/block/nvme: fix io-command set profile feature
hw/block/nvme: consider metadata read aio return value in compare
hw/block/nvme: rename reserved fields declarations
hw/block/nvme: remove redundant invalid_lba_range trace
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/nvme.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/block/nvme.h b/include/block/nvme.h index 4ac926f..0ff9ce1 100644 --- a/include/block/nvme.h +++ b/include/block/nvme.h @@ -7,7 +7,7 @@ typedef struct QEMU_PACKED NvmeBar { uint32_t intms; uint32_t intmc; uint32_t cc; - uint32_t rsvd1; + uint8_t rsvd24[4]; uint32_t csts; uint32_t nssrc; uint32_t aqa; @@ -848,8 +848,8 @@ enum NvmeStatusCodes { NVME_FW_REQ_SUSYSTEM_RESET = 0x0110, NVME_NS_ALREADY_ATTACHED = 0x0118, NVME_NS_PRIVATE = 0x0119, - NVME_NS_NOT_ATTACHED = 0x011A, - NVME_NS_CTRL_LIST_INVALID = 0x011C, + NVME_NS_NOT_ATTACHED = 0x011a, + NVME_NS_CTRL_LIST_INVALID = 0x011c, NVME_CONFLICTING_ATTRS = 0x0180, NVME_INVALID_PROT_INFO = 0x0181, NVME_WRITE_TO_RO = 0x0182, @@ -1409,9 +1409,9 @@ typedef enum NvmeZoneState { NVME_ZONE_STATE_IMPLICITLY_OPEN = 0x02, NVME_ZONE_STATE_EXPLICITLY_OPEN = 0x03, NVME_ZONE_STATE_CLOSED = 0x04, - NVME_ZONE_STATE_READ_ONLY = 0x0D, - NVME_ZONE_STATE_FULL = 0x0E, - NVME_ZONE_STATE_OFFLINE = 0x0F, + NVME_ZONE_STATE_READ_ONLY = 0x0d, + NVME_ZONE_STATE_FULL = 0x0e, + NVME_ZONE_STATE_OFFLINE = 0x0f, } NvmeZoneState; static inline void _nvme_check_size(void) |