diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-02-11 15:32:28 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-02-11 15:32:28 +0000 |
| commit | c973f06521b07af0f82893b75a1d55562fffb4b5 (patch) | |
| tree | 7741765af2d5b9ac0d2a1a1c9c0d33e81ac09a0e /hw/arm/musca.c | |
| parent | 83339e21d05c824ebc9131d644f25c23d0e41ecf (diff) | |
| parent | 832a59e43b5d8b8a9c2b2565008ebea1059d539d (diff) | |
| download | qemu-c973f06521b07af0f82893b75a1d55562fffb4b5.zip qemu-c973f06521b07af0f82893b75a1d55562fffb4b5.tar.gz qemu-c973f06521b07af0f82893b75a1d55562fffb4b5.tar.bz2 | |
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.
v2: spotted one bug in the error handling.
# gpg: Signature made Thu 11 Feb 2021 15:19:30 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 error handling in nvme_ns_realize
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>
Diffstat (limited to 'hw/arm/musca.c')
0 files changed, 0 insertions, 0 deletions