Re: [PATCH v2] hw/nvme: move nvme emulation out of hw/block

[Philippe Mathieu-Daudé]

Hi Klaus,

On 3/1/21 12:35 PM, Klaus Jensen wrote:
> 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.

Maybe type "NVMe" when talking about the technology and keep
lowercase "nvme" only in paths?

> 
> Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
> ---
> v2:
>   * rebased on nvme-next
>   * got rid of the second patch (Minwoo)
> 
>  meson.build                               |   1 +
>  hw/block/nvme-ns.h                        | 193 ---------------------
>  hw/block/nvme-subsys.h                    |  32 ----
>  hw/{block => nvme}/nvme.h                 | 198 +++++++++++++++++++++-

I'd split this patch in 3:

1: Add missing license in hw/block/nvme.h header

>  hw/nvme/trace.h                           |   1 +
>  hw/{block/nvme.c => nvme/ctrl.c}          |   1 -
>  hw/{block/nvme-ns.c => nvme/ns.c}         |   1 -
>  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                     | 182 --------------------
>  hw/meson.build                            |   1 +
>  hw/nvme/Kconfig                           |   4 +
>  hw/nvme/meson.build                       |   1 +
>  hw/nvme/trace-events                      | 180 ++++++++++++++++++++
>  17 files changed, 387 insertions(+), 419 deletions(-)
>  delete mode 100644 hw/block/nvme-ns.h
>  delete mode 100644 hw/block/nvme-subsys.h

2: Merge nvme-ns.h & nvme-subsys.h to hw/block/nvme.h, adding
   Minwoo Im (c).

>  rename hw/{block => nvme}/nvme.h (55%)
>  create mode 100644 hw/nvme/trace.h
>  rename hw/{block/nvme.c => nvme/ctrl.c} (99%)
>  rename hw/{block/nvme-ns.c => nvme/ns.c} (99%)
>  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

3: The rest (basically this patch).

Regards,

Phil.