After going through the zns enabling, I notice the controller enabling is not correct. Then I just continued maked more stuff. The series, I think, contains some of the less controversial patches from the two conflicting zns series, preceeded by some cleanups and fixes from me.
If this is all fine, I took the liberty of porting the zns enabling to it and made a public branch for consideration here: http://git.infradead.org/qemu-nvme.git/shortlog/refs/heads/kb-zns Dmitry Fomichev (1): hw/block/nvme: report actual LBA data shift in LBAF Keith Busch (5): hw/block/nvme: remove pointless rw indirection hw/block/nvme: fix log page offset check hw/block/nvme: support per-namespace smart log hw/block/nvme: validate command set selected hw/block/nvme: support for admin-only command set Klaus Jensen (3): hw/block/nvme: reject io commands if only admin command set selected hw/block/nvme: add nsid to get/setfeat trace events hw/block/nvme: add trace event for requests with non-zero status code hw/block/nvme-ns.c | 5 ++ hw/block/nvme.c | 194 ++++++++++++++++++++---------------------- hw/block/trace-events | 6 +- include/block/nvme.h | 11 +++ 4 files changed, 114 insertions(+), 102 deletions(-) -- 2.24.1