]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/nvme/tags/nvme-next-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 18 May 2021 11:22:16 +0000 (12:22 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 18 May 2021 11:22:16 +0000 (12:22 +0100)
emulated nvme updates

* various fixes (Gollu Appalanaidu)
* refactoring (me)
* move to hw/nvme from hw/block (me)

# gpg: Signature made Mon 17 May 2021 10:16:01 BST
# gpg:                using RSA key 522833AA75E2DCE6A24766C04DE1AF316D4F0DE9
# gpg: Good signature from "Klaus Jensen <its@irrelevant.dk>" [unknown]
# gpg:                 aka "Klaus Jensen <k.jensen@samsung.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: DDCA 4D9C 9EF9 31CC 3468  4272 63D5 6FC5 E55D A838
#      Subkey fingerprint: 5228 33AA 75E2 DCE6 A247  66C0 4DE1 AF31 6D4F 0DE9

* remotes/nvme/tags/nvme-next-pull-request:
  hw/nvme: move nvme emulation out of hw/block
  hw/block/nvme: move zoned constraints checks
  hw/block/nvme: remove irrelevant zone resource checks
  hw/block/nvme: remove num_namespaces member
  hw/block/nvme: streamline namespace array indexing
  hw/block/nvme: add metadata offset helper
  hw/block/nvme: cache lba and ms sizes
  hw/block/nvme: replace nvme_ns_status
  hw/block/nvme: remove non-shared defines from header file
  hw/block/nvme: cleanup includes
  hw/block/nvme: consolidate header files
  hw/block/nvme: rename __nvme_select_ns_iocs
  hw/block/nvme: rename __nvme_advance_zone_wp
  hw/block/nvme: rename __nvme_zrm_open
  hw/block/nvme: align with existing style
  hw/block/nvme: function formatting fix
  hw/block/nvme: fix io-command set profile feature
  hw/block/nvme: consider metadata read aio return value in compare
  hw/block/nvme: rename reserved fields declarations
  hw/block/nvme: remove redundant invalid_lba_range trace

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
1  2 
MAINTAINERS

diff --combined MAINTAINERS
index 515316f7b2e77289a928f41dd3cf8438c5246328,e3c2866393e25dc208e6a564b6b35dcb656e925d..eab178aeee5e08c8c09306e0955a4e78da264de5
@@@ -1956,7 -1956,7 +1956,7 @@@ M: Keith Busch <kbusch@kernel.org
  M: Klaus Jensen <its@irrelevant.dk>
  L: qemu-block@nongnu.org
  S: Supported
- F: hw/block/nvme*
+ F: hw/nvme/*
  F: include/block/nvme.h
  F: tests/qtest/nvme-test.c
  F: docs/system/nvme.rst
@@@ -2435,7 -2435,6 +2435,7 @@@ F: ui/cocoa.
  Main loop
  M: Paolo Bonzini <pbonzini@redhat.com>
  S: Maintained
 +F: include/exec/gen-icount.h
  F: include/qemu/main-loop.h
  F: include/sysemu/runstate.h
  F: include/sysemu/runstate-action.h