diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-11-27 14:35:11 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-11-27 14:35:11 +0000 |
| commit | 59ed3fe8d334e3247abb703b8f2eb7c0ac7afc62 (patch) | |
| tree | 2673f4e05d742d375d4a35b589c738335e0f5a99 /hw | |
| parent | 2264faa55f0f06795e61365a6b4891e53b7716a4 (diff) | |
| parent | 6da021815e752b3ca3a547eed53f3e92a8a35452 (diff) | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:
- block: Fix crash on migration with explicit child nodes
- nvme: Fix spurious interrupts
# gpg: Signature made Tue 27 Nov 2018 11:59:40 GMT
# gpg: using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
nvme: Fix spurious interrupts
iotests: Test migration with -blockdev
block: Don't inactivate children before parents
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/block/nvme.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 9fbe5673cb..7c8c63e8f5 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -272,7 +272,9 @@ static void nvme_post_cqes(void *opaque) sizeof(req->cqe)); QTAILQ_INSERT_TAIL(&sq->req_list, req, entry); } - nvme_irq_assert(n, cq); + if (cq->tail != cq->head) { + nvme_irq_assert(n, cq); + } } static void nvme_enqueue_req_completion(NvmeCQueue *cq, NvmeRequest *req) |