hw/block/nvme: consolidate header files

In preparation for moving the nvme device into its own subtree, merge the header files into one. Also add missing copyright notice and add list of authors with substantial contributions. Signed-off-by: Klaus Jensen <k.jensen@samsung.com> Reviewed-by: Keith Busch <kbusch@kernel.org>
qemu · May 17, 2021 · d88e784 · d88e784
1 parent 42821d2
commit d88e784
Show file tree

Hide file tree

Showing 8 changed files with 348 additions and 391 deletions.
diff --git a/hw/block/nvme-dif.c b/hw/block/nvme-dif.c
@@ -15,7 +15,6 @@
 #include "qapi/error.h"
 #include "trace.h"
 #include "nvme.h"
-#include "nvme-dif.h"
 
 uint16_t nvme_check_prinfo(NvmeNamespace *ns, uint16_t ctrl, uint64_t slba,
                            uint32_t reftag)

diff --git a/hw/block/nvme-dif.h b/hw/block/nvme-dif.h
diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c
@@ -28,7 +28,6 @@
 
 #include "trace.h"
 #include "nvme.h"
-#include "nvme-ns.h"
 
 #define MIN_DISCARD_GRANULARITY (4 * KiB)
 

diff --git a/hw/block/nvme-ns.h b/hw/block/nvme-ns.h
diff --git a/hw/block/nvme-subsys.c b/hw/block/nvme-subsys.c
@@ -19,7 +19,6 @@
 #include "block/accounting.h"
 #include "hw/pci/pci.h"
 #include "nvme.h"
-#include "nvme-subsys.h"
 
 int nvme_subsys_register_ctrl(NvmeCtrl *n, Error **errp)
 {

diff --git a/hw/block/nvme-subsys.h b/hw/block/nvme-subsys.h
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
@@ -162,8 +162,6 @@
 #include "qemu/cutils.h"
 #include "trace.h"
 #include "nvme.h"
-#include "nvme-ns.h"
-#include "nvme-dif.h"
 
 #define NVME_MAX_IOQPAIRS 0xffff
 #define NVME_DB_SIZE  4