diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-03-27 16:04:22 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-03-27 16:04:22 +0000 |
| commit | 77a48a743f9e4cc7482568eb417c2b47b0e558cf (patch) | |
| tree | 8e2b4eb86b2f9b166673c83abc72418c25086b13 /hw | |
| parent | cfe68ae025f704f336d7dd3d1903ce37b445831d (diff) | |
| parent | df74b1d3dff80983e7a30db1346a4a05847d65fa (diff) | |
| download | qemu-77a48a743f9e4cc7482568eb417c2b47b0e558cf.zip qemu-77a48a743f9e4cc7482568eb417c2b47b0e558cf.tar.gz qemu-77a48a743f9e4cc7482568eb417c2b47b0e558cf.tar.bz2 | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:
- Fix another case of mirror block job deadlocks
- Minor fixes
# gpg: Signature made Fri 27 Mar 2020 15:18:37 GMT
# gpg: using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
qcow2: Remove unused fields from BDRVQcow2State
mirror: Wait only for in-flight operations
Revert "mirror: Don't let an operation wait for itself"
nvme: Print 'cqid' for nvme_del_cq
block: fix bdrv_root_attach_child forget to unref child_bs
block/iscsi:use the flags in iscsi_open() prevent Clang warning
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/block/trace-events | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/block/trace-events b/hw/block/trace-events index f78939f..bf6d11b 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -37,7 +37,7 @@ nvme_rw(const char *verb, uint32_t blk_count, uint64_t byte_count, uint64_t lba) nvme_create_sq(uint64_t addr, uint16_t sqid, uint16_t cqid, uint16_t qsize, uint16_t qflags) "create submission queue, addr=0x%"PRIx64", sqid=%"PRIu16", cqid=%"PRIu16", qsize=%"PRIu16", qflags=%"PRIu16"" nvme_create_cq(uint64_t addr, uint16_t cqid, uint16_t vector, uint16_t size, uint16_t qflags, int ien) "create completion queue, addr=0x%"PRIx64", cqid=%"PRIu16", vector=%"PRIu16", qsize=%"PRIu16", qflags=%"PRIu16", ien=%d" nvme_del_sq(uint16_t qid) "deleting submission queue sqid=%"PRIu16"" -nvme_del_cq(uint16_t cqid) "deleted completion queue, sqid=%"PRIu16"" +nvme_del_cq(uint16_t cqid) "deleted completion queue, cqid=%"PRIu16"" nvme_identify_ctrl(void) "identify controller" nvme_identify_ns(uint16_t ns) "identify namespace, nsid=%"PRIu16"" nvme_identify_nslist(uint16_t ns) "identify namespace list, nsid=%"PRIu16"" |