mbox series

[0/2] hw/nvme: move nvme emulation out of hw/block

Message ID 20210209110826.585987-1-its@irrelevant.dk
Headers show
Series hw/nvme: move nvme emulation out of hw/block | expand

Message

Klaus Jensen Feb. 9, 2021, 11:08 a.m. UTC
From: Klaus Jensen <k.jensen@samsung.com>

With the introduction of the nvme-subsystem device we are really
cluttering up the hw/block directory.

As suggested by Philippe previously, move the nvme emulation to hw/nvme.

Klaus Jensen (2):
  hw/nvme: move nvme emulation out of hw/block
  hw/nvme: move device-scoped functions

 meson.build                               |   1 +
 hw/block/nvme-ns.h                        | 193 --------------------
 hw/block/nvme-subsys.h                    |  32 ----
 hw/{block => nvme}/nvme.h                 | 206 +++++++++++++++-------
 hw/nvme/trace.h                           |   1 +
 hw/{block/nvme.c => nvme/ctrl.c}          |  91 +++++++++-
 hw/{block/nvme-ns.c => nvme/ns.c}         |   8 +-
 hw/{block/nvme-subsys.c => nvme/subsys.c} |   2 +-
 MAINTAINERS                               |   2 +-
 hw/Kconfig                                |   1 +
 hw/block/Kconfig                          |   5 -
 hw/block/meson.build                      |   1 -
 hw/block/trace-events                     | 180 -------------------
 hw/meson.build                            |   1 +
 hw/nvme/Kconfig                           |   4 +
 hw/nvme/meson.build                       |   1 +
 hw/nvme/trace-events                      | 178 +++++++++++++++++++
 17 files changed, 431 insertions(+), 476 deletions(-)
 delete mode 100644 hw/block/nvme-ns.h
 delete mode 100644 hw/block/nvme-subsys.h
 rename hw/{block => nvme}/nvme.h (51%)
 create mode 100644 hw/nvme/trace.h
 rename hw/{block/nvme.c => nvme/ctrl.c} (97%)
 rename hw/{block/nvme-ns.c => nvme/ns.c} (98%)
 rename hw/{block/nvme-subsys.c => nvme/subsys.c} (98%)
 create mode 100644 hw/nvme/Kconfig
 create mode 100644 hw/nvme/meson.build
 create mode 100644 hw/nvme/trace-events