[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/3] block/nvme: Use generic NvmeBar structure
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 2/3] block/nvme: Use generic NvmeBar structure |
Date: |
Fri, 4 Sep 2020 14:41:29 +0200 |
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>
---
block/nvme.c | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/block/nvme.c b/block/nvme.c
index c9c3fc02fed..a216cc407f6 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)
--
2.26.2
- [PATCH 0/3] block/nvme: Use NvmeBar structure from "block/nvme.h", Philippe Mathieu-Daudé, 2020/09/04
- [PATCH 1/3] block/nvme: Group controller registers in NVMeRegs structure, Philippe Mathieu-Daudé, 2020/09/04
- [PATCH 2/3] block/nvme: Use generic NvmeBar structure,
Philippe Mathieu-Daudé <=
- [PATCH 3/3] block/nvme: Pair doorbell registers, Philippe Mathieu-Daudé, 2020/09/04
- Re: [PATCH 0/3] block/nvme: Use NvmeBar structure from "block/nvme.h", Fam Zheng, 2020/09/04
- Re: [PATCH 0/3] block/nvme: Use NvmeBar structure from "block/nvme.h", Klaus Jensen, 2020/09/04
- Re: [PATCH 0/3] block/nvme: Use NvmeBar structure from "block/nvme.h", Kevin Wolf, 2020/09/07