From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=48278 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDzen-00011j-E8 for qemu-devel@nongnu.org; Thu, 04 Nov 2010 09:15:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDzei-00038v-Rh for qemu-devel@nongnu.org; Thu, 04 Nov 2010 09:15:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDzei-00038r-I4 for qemu-devel@nongnu.org; Thu, 04 Nov 2010 09:15:04 -0400 From: Kevin Wolf Date: Thu, 4 Nov 2010 14:15:37 +0100 Message-Id: <1288876539-8300-9-git-send-email-kwolf@redhat.com> In-Reply-To: <1288876539-8300-1-git-send-email-kwolf@redhat.com> References: <1288876539-8300-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 08/10] ide: Handle immediate bdrv_aio_flush failure List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org If bdrv_aio_flush returns NULL, this should be treated as an error. Signed-off-by: Kevin Wolf --- hw/ide/core.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index bc3e916..484e0ca 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -811,10 +811,16 @@ static void ide_flush_cb(void *opaque, int ret) static void ide_flush_cache(IDEState *s) { - if (s->bs) { - bdrv_aio_flush(s->bs, ide_flush_cb, s); - } else { + BlockDriverAIOCB *acb; + + if (s->bs == NULL) { ide_flush_cb(s, 0); + return; + } + + acb = bdrv_aio_flush(s->bs, ide_flush_cb, s); + if (acb == NULL) { + ide_flush_cb(s, -EIO); } } -- 1.7.2.3