Skip to contentSkip to conversation

hw/nvme: Move NVMe emulation out of hw/block/ directory

PATCH In review Philippe Mathieu-Daudé 2 participants 3 messages Nov 30, 2020 – Dec 1, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 hw/nvme: Move NVMe emulation out of hw/block/ directory

As IDE used to be, NVMe emulation is becoming an active subsystem. Move it into its own namespace.

---
v2: Rebased after nvme-ns got merged in commit 8680d6e3646

---
 meson.build                               |   1 +
 hw/{block/nvme.h => nvme/nvme-internal.h} |   4 +-
 hw/{block => nvme}/nvme-ns.h              |   0
 hw/{block/nvme.c => nvme/core.c}          |   2 +-
 hw/{block => nvme}/nvme-ns.c              |   0
 MAINTAINERS                               |   2 +-
 hw/Kconfig                                |   1 +
 hw/block/Kconfig                          |   5 -
 hw/block/meson.build                      |   1 -
 hw/block/trace-events                     | 132 ---------------------
 hw/meson.build                            |   1 +
 hw/nvme/Kconfig                           |   4 +
 hw/nvme/meson.build                       |   1 +
 hw/nvme/trace-events                      | 133 ++++++++++++++++++++++
 14 files changed, 145 insertions(+), 142 deletions(-)
 rename hw/{block/nvme.h => nvme/nvme-internal.h} (98%)
 rename hw/{block => nvme}/nvme-ns.h (100%)
 rename hw/{block/nvme.c => nvme/core.c} (99%)
 rename hw/{block => nvme}/nvme-ns.c (100%)
 create mode 100644 hw/nvme/Kconfig
 create mode 100644 hw/nvme/meson.build
 create mode 100644 hw/nvme/trace-events
meson.build +1 -0
index e3386196ba4..255f5491878 100644
@@ -1433,6 +1433,7 @@
     'hw/misc',
     'hw/misc/macio',
     'hw/net',
+    'hw/nvme',
     'hw/nvram',
     'hw/pci',
     'hw/pci-host',
hw/nvme/nvme-internal.h renamed from hw/block/nvme.h +2 -2
similarity index 98%
rename from hw/block/nvme.h
rename to hw/nvme/nvme-internal.h
index e080a2318a5..30191dd981f 100644
@@ -1,5 +1,5 @@
-#ifndef HW_NVME_H
-#define HW_NVME_H
+#ifndef HW_NVME_INTERNAL_H
+#define HW_NVME_INTERNAL_H
 
 #include "block/nvme.h"
 #include "nvme-ns.h"
hw/nvme/nvme-ns.h renamed from hw/block/nvme-ns.h +0 -0
similarity index 100%
rename from hw/block/nvme-ns.h
rename to hw/nvme/nvme-ns.h
hw/nvme/core.c renamed from hw/block/nvme.c +1 -1
similarity index 99%
rename from hw/block/nvme.c
rename to hw/nvme/core.c
index 01b657b1c5e..c65f8003b9d 100644
@@ -68,8 +68,8 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qemu/cutils.h"
+#include "nvme-internal.h"
 #include "trace.h"
-#include "nvme.h"
 #include "nvme-ns.h"
 
 #define NVME_MAX_IOQPAIRS 0xffff
hw/nvme/nvme-ns.c renamed from hw/block/nvme-ns.c +0 -0
similarity index 100%
rename from hw/block/nvme-ns.c
rename to hw/nvme/nvme-ns.c
MAINTAINERS +1 -1
index 68bc160f41b..ff1ec820c82 100644
@@ -1887,7 +1887,7 @@ M: Keith Busch <[email protected]>
 M: Klaus Jensen <[email protected]>
 L: [email protected]
 S: Supported
-F: hw/block/nvme*
+F: hw/nvme/*
 F: include/block/nvme.h
 F: tests/qtest/nvme-test.c
 F: docs/specs/nvme.txt
hw/Kconfig +1 -0
index 4de1797ffda..4ef9ca40ab0 100644
@@ -21,6 +21,7 @@ source mem/Kconfig
 source misc/Kconfig
 source net/Kconfig
 source nubus/Kconfig
+source nvme/Kconfig
 source nvram/Kconfig
 source pci-bridge/Kconfig
 source pci-host/Kconfig
hw/block/Kconfig +0 -5
index 2d17f481adc..c2213173ffe 100644
@@ -22,11 +22,6 @@ config ECC
 config ONENAND
     bool
 
-config NVME_PCI
-    bool
-    default y if PCI_DEVICES
-    depends on PCI
-
 config VIRTIO_BLK
     bool
     default y
hw/block/meson.build +0 -1
index 602ca6c8541..96697f739c0 100644
@@ -13,7 +13,6 @@
 softmmu_ss.add(when: 'CONFIG_SWIM', if_true: files('swim.c'))
 softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen-block.c'))
 softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('tc58128.c'))
-softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.c'))
 
 specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c'))
 specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk.c'))
hw/block/trace-events +0 -132

138 lines not on this page · raw message

hw/meson.build +1 -0
index 010de7219c1..dcee944cf05 100644
@@ -21,6 +21,7 @@
 subdir('misc')
 subdir('net')
 subdir('nubus')
+subdir('nvme')
 subdir('nvram')
 subdir('pci')
 subdir('pci-bridge')
hw/nvme/Kconfig new file +4 -0
new file mode 100644
index 00000000000..8ac90942e55
@@ -0,0 +1,4 @@
+config NVME_PCI
+    bool
+    default y if PCI_DEVICES
+    depends on PCI
hw/nvme/meson.build new file +1 -0
new file mode 100644
index 00000000000..c0bcda49852
@@ -0,0 +1 @@
+softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('core.c', 'nvme-ns.c'))
hw/nvme/trace-events new file +133 -0

133 lines not on this page · raw message

Signature · 1 line
2.26.2
#1 lore raw
Quoted 18 lines · Philippe Mathieu-Daudé

As IDE used to be, NVMe emulation is becoming an active subsystem. Move it into its own namespace.

---
v2: Rebased after nvme-ns got merged in commit 8680d6e3646

---
 meson.build                               |   1 +
 hw/{block/nvme.h => nvme/nvme-internal.h} |   4 +-
 hw/{block => nvme}/nvme-ns.h              |   0
 hw/{block/nvme.c => nvme/core.c}          |   2 +-
 hw/{block => nvme}/nvme-ns.c              |   0
 MAINTAINERS                               |   2 +-
 hw/Kconfig                                |   1 +
 hw/block/Kconfig                          |   5 -
 hw/block/meson.build                      |   1 -
 hw/block/trace-events                     | 132 ---------------------
 hw/meson.build                            |   1 +
Quoted 8 lines
 hw/nvme/Kconfig                           |   4 +
 hw/nvme/meson.build                       |   1 +
 hw/nvme/trace-events                      | 133 ++++++++++++++++++++++
 14 files changed, 145 insertions(+), 142 deletions(-)
 rename hw/{block/nvme.h => nvme/nvme-internal.h} (98%)
 rename hw/{block => nvme}/nvme-ns.h (100%)
 rename hw/{block/nvme.c => nvme/core.c} (99%)
 rename hw/{block => nvme}/nvme-ns.c (100%)

Would we want to consider renaming nvme-ns.c to namespace.c? And maybe also follow up with consolidating nvme-ns.h into nvme-internal.h?

#2 lore raw
Quoted 28 lines · Klaus Jensen
Quoted 18 lines · Philippe Mathieu-Daudé

As IDE used to be, NVMe emulation is becoming an active subsystem. Move it into its own namespace.

---
v2: Rebased after nvme-ns got merged in commit 8680d6e3646

---
 meson.build                               |   1 +
 hw/{block/nvme.h => nvme/nvme-internal.h} |   4 +-
 hw/{block => nvme}/nvme-ns.h              |   0
 hw/{block/nvme.c => nvme/core.c}          |   2 +-
 hw/{block => nvme}/nvme-ns.c              |   0
 MAINTAINERS                               |   2 +-
 hw/Kconfig                                |   1 +
 hw/block/Kconfig                          |   5 -
 hw/block/meson.build                      |   1 -
 hw/block/trace-events                     | 132 ---------------------
 hw/meson.build                            |   1 +
Quoted 8 lines
 hw/nvme/Kconfig                           |   4 +
 hw/nvme/meson.build                       |   1 +
 hw/nvme/trace-events                      | 133 ++++++++++++++++++++++
 14 files changed, 145 insertions(+), 142 deletions(-)
 rename hw/{block/nvme.h => nvme/nvme-internal.h} (98%)
 rename hw/{block => nvme}/nvme-ns.h (100%)
 rename hw/{block/nvme.c => nvme/core.c} (99%)
 rename hw/{block => nvme}/nvme-ns.c (100%)
Quoted 2 lines

Would we want to consider renaming nvme-ns.c to namespace.c? And maybe also follow up with consolidating nvme-ns.h into nvme-internal.h?

Yes, good idea!

I'll respin.

Thanks,

Phil.