From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=56726 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pmr8M-0005m2-Pl for qemu-devel@nongnu.org; Tue, 08 Feb 2011 12:13:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pmr8L-0000aG-Im for qemu-devel@nongnu.org; Tue, 08 Feb 2011 12:13:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39990) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pmr8L-0000Zx-BK for qemu-devel@nongnu.org; Tue, 08 Feb 2011 12:13:45 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p18HDiRd005972 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 8 Feb 2011 12:13:44 -0500 From: Kevin Wolf Date: Tue, 8 Feb 2011 18:15:28 +0100 Message-Id: <1297185328-23210-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH] qcow2: Fix error handling for immediate backing file read failure List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com Requests could return success even though they failed when bdrv_aio_readv returned NULL for a backing file read. Reported-by: Chunqiang Tang Signed-off-by: Kevin Wolf --- block/qcow2.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 28338bf..647c2a4 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) -- 1.7.2.3