[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/20] hw/block/nvme: cleanup includes
From: |
Klaus Jensen |
Subject: |
[PULL 11/20] hw/block/nvme: cleanup includes |
Date: |
Mon, 17 May 2021 11:17:28 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
Clean up includes.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
---
hw/block/nvme-dif.c | 7 +++----
hw/block/nvme-ns.c | 11 ++---------
hw/block/nvme-subsys.c | 11 +----------
hw/block/nvme.c | 22 +++++++++-------------
4 files changed, 15 insertions(+), 36 deletions(-)
diff --git a/hw/block/nvme-dif.c b/hw/block/nvme-dif.c
index 25e5a90854fa..e269d275ebed 100644
--- a/hw/block/nvme-dif.c
+++ b/hw/block/nvme-dif.c
@@ -9,12 +9,11 @@
*/
#include "qemu/osdep.h"
-#include "hw/block/block.h"
-#include "sysemu/dma.h"
-#include "sysemu/block-backend.h"
#include "qapi/error.h"
-#include "trace.h"
+#include "sysemu/block-backend.h"
+
#include "nvme.h"
+#include "trace.h"
uint16_t nvme_check_prinfo(NvmeNamespace *ns, uint16_t ctrl, uint64_t slba,
uint32_t reftag)
diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c
index 4d7103e78ff8..d91bf7bbbbbb 100644
--- a/hw/block/nvme-ns.c
+++ b/hw/block/nvme-ns.c
@@ -14,20 +14,13 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "qemu/cutils.h"
-#include "qemu/log.h"
#include "qemu/error-report.h"
-#include "hw/block/block.h"
-#include "hw/pci/pci.h"
+#include "qapi/error.h"
#include "sysemu/sysemu.h"
#include "sysemu/block-backend.h"
-#include "qapi/error.h"
-#include "hw/qdev-properties.h"
-#include "hw/qdev-core.h"
-
-#include "trace.h"
#include "nvme.h"
+#include "trace.h"
#define MIN_DISCARD_GRANULARITY (4 * KiB)
diff --git a/hw/block/nvme-subsys.c b/hw/block/nvme-subsys.c
index 3c404e3fcb78..192223d17ca1 100644
--- a/hw/block/nvme-subsys.c
+++ b/hw/block/nvme-subsys.c
@@ -6,18 +6,9 @@
* This code is licensed under the GNU GPL v2. Refer COPYING.
*/
-#include "qemu/units.h"
#include "qemu/osdep.h"
-#include "qemu/uuid.h"
-#include "qemu/iov.h"
-#include "qemu/cutils.h"
#include "qapi/error.h"
-#include "hw/qdev-properties.h"
-#include "hw/qdev-core.h"
-#include "hw/block/block.h"
-#include "block/aio.h"
-#include "block/accounting.h"
-#include "hw/pci/pci.h"
+
#include "nvme.h"
int nvme_subsys_register_ctrl(NvmeCtrl *n, Error **errp)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 29f80d543903..e152c61adb76 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -144,24 +144,20 @@
*/
#include "qemu/osdep.h"
-#include "qemu/units.h"
+#include "qemu/cutils.h"
#include "qemu/error-report.h"
-#include "hw/block/block.h"
-#include "hw/pci/msix.h"
-#include "hw/pci/pci.h"
-#include "hw/qdev-properties.h"
-#include "migration/vmstate.h"
-#include "sysemu/sysemu.h"
+#include "qemu/log.h"
+#include "qemu/units.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
-#include "sysemu/hostmem.h"
+#include "sysemu/sysemu.h"
#include "sysemu/block-backend.h"
-#include "exec/memory.h"
-#include "qemu/log.h"
-#include "qemu/module.h"
-#include "qemu/cutils.h"
-#include "trace.h"
+#include "sysemu/hostmem.h"
+#include "hw/pci/msix.h"
+#include "migration/vmstate.h"
+
#include "nvme.h"
+#include "trace.h"
#define NVME_MAX_IOQPAIRS 0xffff
#define NVME_DB_SIZE 4
--
2.31.1
- [PULL 00/20] emulated nvme updates, Klaus Jensen, 2021/05/17
- [PULL 01/20] hw/block/nvme: remove redundant invalid_lba_range trace, Klaus Jensen, 2021/05/17
- [PULL 02/20] hw/block/nvme: rename reserved fields declarations, Klaus Jensen, 2021/05/17
- [PULL 03/20] hw/block/nvme: consider metadata read aio return value in compare, Klaus Jensen, 2021/05/17
- [PULL 04/20] hw/block/nvme: fix io-command set profile feature, Klaus Jensen, 2021/05/17
- [PULL 05/20] hw/block/nvme: function formatting fix, Klaus Jensen, 2021/05/17
- [PULL 06/20] hw/block/nvme: align with existing style, Klaus Jensen, 2021/05/17
- [PULL 07/20] hw/block/nvme: rename __nvme_zrm_open, Klaus Jensen, 2021/05/17
- [PULL 08/20] hw/block/nvme: rename __nvme_advance_zone_wp, Klaus Jensen, 2021/05/17
- [PULL 09/20] hw/block/nvme: rename __nvme_select_ns_iocs, Klaus Jensen, 2021/05/17
- [PULL 11/20] hw/block/nvme: cleanup includes,
Klaus Jensen <=
- [PULL 12/20] hw/block/nvme: remove non-shared defines from header file, Klaus Jensen, 2021/05/17
- [PULL 10/20] hw/block/nvme: consolidate header files, Klaus Jensen, 2021/05/17
- [PULL 13/20] hw/block/nvme: replace nvme_ns_status, Klaus Jensen, 2021/05/17
- [PULL 15/20] hw/block/nvme: add metadata offset helper, Klaus Jensen, 2021/05/17
- [PULL 14/20] hw/block/nvme: cache lba and ms sizes, Klaus Jensen, 2021/05/17
- [PULL 16/20] hw/block/nvme: streamline namespace array indexing, Klaus Jensen, 2021/05/17
- [PULL 17/20] hw/block/nvme: remove num_namespaces member, Klaus Jensen, 2021/05/17
- [PULL 18/20] hw/block/nvme: remove irrelevant zone resource checks, Klaus Jensen, 2021/05/17
- [PULL 19/20] hw/block/nvme: move zoned constraints checks, Klaus Jensen, 2021/05/17
- [PULL 20/20] hw/nvme: move nvme emulation out of hw/block, Klaus Jensen, 2021/05/17