From: Kevin Wolf <kwolf@redhat.com>
Date: Tue, 8 Feb 2011 17:12:35 +0000 (+0100)
Subject: qcow2: Fix error handling for immediate backing file read failure
X-Git-Tag: v0.14.0-rc2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16e07bc282c3c2d560ae9c4e9db76106975495eb;p=thirdparty%2Fqemu.git

qcow2: Fix error handling for immediate backing file read failure

Requests could return success even though they failed when bdrv_aio_readv
returned NULL for a backing file read.

Reported-by: Chunqiang Tang <ctang@us.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit 3ab4c7e92d39d40e6dc0bdb1c2320889543691cb)
---

diff --git a/block/qcow2.c b/block/qcow2.c
index 28338bf9d0d..647c2a4bc4d 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -479,8 +479,10 @@ static void qcow2_aio_read_cb(void *opaque, int ret)
                 BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO);
                 acb->hd_aiocb = bdrv_aio_readv(bs->backing_hd, acb->sector_num,
                                     &acb->hd_qiov, n1, qcow2_aio_read_cb, acb);
-                if (acb->hd_aiocb == NULL)
+                if (acb->hd_aiocb == NULL) {
+                    ret = -EIO;
                     goto done;
+                }
             } else {
                 ret = qcow2_schedule_bh(qcow2_aio_read_bh, acb);
                 if (ret < 0)