[Qemu-commits] [qemu/qemu] 387ec4: hw/block/nvme: fix legacy namespace registration

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 387ec4a72985448a879e35f4bafde03c4f86920b
      
https://github.com/qemu/qemu/commit/387ec4a72985448a879e35f4bafde03c4f86920b
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2021-02-11 (Thu, 11 Feb 2021)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: fix legacy namespace registration

Moving namespace registration to the nvme-ns realization function had
the unintended side-effect of breaking legacy namespace registration.
Fix this.

Fixes: 15d024d4aa9b ("hw/block/nvme: split setup and register for namespace")
Reported-by: Alexander Graf <agraf@csgraf.de>
Cc: Minwoo Im <minwoo.im.dev@gmail.com>
Tested-by: Alexander Graf <agraf@csgraf.de>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>


  Commit: b4471900d5328b66eeecdbc79de83992cc109d04
      
https://github.com/qemu/qemu/commit/b4471900d5328b66eeecdbc79de83992cc109d04
  Author: Bin Meng <bin.meng@windriver.com>
  Date:   2021-02-11 (Thu, 11 Feb 2021)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  hw/block/nvme: Fix a build error in nvme_get_feature()

Current QEMU HEAD nvme.c does not compile with the default GCC 5.4
on a Ubuntu 16.04 host:

  hw/block/nvme.c:3242:9: error: ‘result’ may be used uninitialized in this 
function [-Werror=maybe-uninitialized]
         trace_pci_nvme_getfeat_vwcache(result ? "enabled" : "disabled");
         ^
  hw/block/nvme.c:3150:14: note: ‘result’ was declared here
     uint32_t result;
              ^

Explicitly initialize the result to fix it.

Fixes: aa5e55e3b07e ("hw/block/nvme: open code for volatile write cache")
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>


  Commit: 6ff0e0ebee9979d183abff2fc6af927ef1259acb
      
https://github.com/qemu/qemu/commit/6ff0e0ebee9979d183abff2fc6af927ef1259acb
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-02-11 (Thu, 11 Feb 2021)

  Changed paths:
    M hw/block/nvme.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/nvme/tags/nvme-fixes-pull-request' into 
staging

Two small fixes for regressions reported by Alexander Graf and Bin Meng.

# gpg: Signature made Thu 11 Feb 2021 12:49:32 GMT
# 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-fixes-pull-request:
  hw/block/nvme: Fix a build error in nvme_get_feature()
  hw/block/nvme: fix legacy namespace registration

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


Compare: https://github.com/qemu/qemu/compare/83339e21d05c...6ff0e0ebee99