diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2020-09-04 14:41:29 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2020-09-10 11:11:13 +0200 |
| commit | c7100f0a0bec585b88b67138f6e33791ec2dbf3e (patch) | |
| tree | 9040a7b5069406e4d3902a3535ab2431e8a80957 /block | |
| parent | 0ea32f34ce08e10c3d715cfa1427a23fb7989196 (diff) | |
block/nvme: Use generic NvmeBar structure
Commit f3c507adcd7 ("NVMe: Initial commit for new storage interface")
introduced the NvmeBar structure. Unfortunately in commit bdd6a90a9e5
("block: Add VFIO based NVMe driver") we duplicated it.
Apparently in commit a3d9a352d48 ("block: Move NVMe constants to
a separate header") we tried to unify headers but forgot to remove
the structure declared in the block/nvme.c source file.
Do it now, and remove the structure size check which is redundant
with the header check added in commit 74e18435c0e ("hw/block/nvme:
Align I/O BAR to 4 KiB").
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200904124130.583838-3-philmd@redhat.com>
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Fam Zheng <fam@euphon.net>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/nvme.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/block/nvme.c b/block/nvme.c index c9c3fc02fe..a216cc407f 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -83,28 +83,10 @@ typedef struct { /* Memory mapped registers */ typedef volatile struct { - struct { - uint64_t cap; - uint32_t vs; - uint32_t intms; - uint32_t intmc; - uint32_t cc; - uint32_t reserved0; - uint32_t csts; - uint32_t nssr; - uint32_t aqa; - uint64_t asq; - uint64_t acq; - uint32_t cmbloc; - uint32_t cmbsz; - uint8_t reserved1[0xec0]; - uint8_t cmd_set_specfic[0x100]; - } ctrl; + NvmeBar ctrl; uint32_t doorbells[]; } NVMeRegs; -QEMU_BUILD_BUG_ON(offsetof(NVMeRegs, doorbells) != 0x1000); - #define INDEX_ADMIN 0 #define INDEX_IO(n) (1 + n) |