On Apr 19 21:27, Klaus Jensen wrote: >From: Klaus Jensen > >This series consists of various clean up patches. > >The final patch moves nvme emulation from hw/block to hw/nvme. > >Klaus Jensen (14): > hw/block/nvme: rename __nvme_zrm_open > hw/block/nvme: rename __nvme_advance_zone_wp > hw/block/nvme: rename __nvme_select_ns_iocs > hw/block/nvme: consolidate header files > hw/block/nvme: cleanup includes > hw/block/nvme: remove non-shared defines from header file > hw/block/nvme: replace nvme_ns_status > hw/block/nvme: cache lba and ms sizes > hw/block/nvme: add metadata offset helper > hw/block/nvme: streamline namespace array indexing > hw/block/nvme: remove num_namespaces member > hw/block/nvme: remove irrelevant zone resource checks > hw/block/nvme: move zoned constraints checks > hw/nvme: move nvme emulation out of hw/block > > meson.build | 1 + > hw/block/nvme-dif.h | 63 --- > hw/block/nvme-ns.h | 229 --------- > hw/block/nvme-subsys.h | 59 --- > hw/block/nvme.h | 266 ----------- > hw/nvme/nvme.h | 547 ++++++++++++++++++++++ > hw/nvme/trace.h | 1 + > hw/{block/nvme.c => nvme/ctrl.c} | 204 ++++---- > hw/{block/nvme-dif.c => nvme/dif.c} | 57 +-- > hw/{block/nvme-ns.c => nvme/ns.c} | 104 ++-- > hw/{block/nvme-subsys.c => nvme/subsys.c} | 13 +- > MAINTAINERS | 2 +- > hw/Kconfig | 1 + > hw/block/Kconfig | 5 - > hw/block/meson.build | 1 - > hw/block/trace-events | 206 -------- > hw/meson.build | 1 + > hw/nvme/Kconfig | 4 + > hw/nvme/meson.build | 1 + > hw/nvme/trace-events | 204 ++++++++ > 20 files changed, 928 insertions(+), 1041 deletions(-) > delete mode 100644 hw/block/nvme-dif.h > delete mode 100644 hw/block/nvme-ns.h > delete mode 100644 hw/block/nvme-subsys.h > delete mode 100644 hw/block/nvme.h > create mode 100644 hw/nvme/nvme.h > create mode 100644 hw/nvme/trace.h > rename hw/{block/nvme.c => nvme/ctrl.c} (98%) > rename hw/{block/nvme-dif.c => nvme/dif.c} (90%) > rename hw/{block/nvme-ns.c => nvme/ns.c} (87%) > rename hw/{block/nvme-subsys.c => nvme/subsys.c} (85%) > create mode 100644 hw/nvme/Kconfig > create mode 100644 hw/nvme/meson.build > create mode 100644 hw/nvme/trace-events > >-- >2.31.1 > > Applied to nvme-next.