From patchwork Wed Oct 27 11:20:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 69341 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 10E85B70DF for ; Wed, 27 Oct 2010 22:23:23 +1100 (EST) Received: from localhost ([127.0.0.1]:52079 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PB46A-0000fb-RP for incoming@patchwork.ozlabs.org; Wed, 27 Oct 2010 07:23:18 -0400 Received: from [140.186.70.92] (port=33908 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PB44f-0006aB-MA for qemu-devel@nongnu.org; Wed, 27 Oct 2010 07:22:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PB43C-0004Qi-Ca for qemu-devel@nongnu.org; Wed, 27 Oct 2010 07:21:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4645) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PB43C-0004QX-5C for qemu-devel@nongnu.org; Wed, 27 Oct 2010 07:20:14 -0400 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.13.8/8.13.8) with ESMTP id o9RBKCWW019731 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 27 Oct 2010 07:20:13 -0400 Received: from dhcp-5-188.str.redhat.com (dhcp-5-175.str.redhat.com [10.32.5.175]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id o9RBK9JO020363; Wed, 27 Oct 2010 07:20:11 -0400 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Wed, 27 Oct 2010 13:20:53 +0200 Message-Id: <1288178454-8893-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1288178454-8893-1-git-send-email-kwolf@redhat.com> References: <1288178454-8893-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH 2/3] virtio-blk: Handle immediate flush failure properly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Fix virtio-blk to use the usual completion path that involves werror handling instead of directly completing the request in cases where bdrv_aio_flush returns NULL. Signed-off-by: Kevin Wolf --- hw/virtio-blk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index dbe2070..49528a9 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -273,7 +273,7 @@ static void virtio_blk_handle_flush(VirtIOBlockReq *req, MultiReqBuffer *mrb) acb = bdrv_aio_flush(req->dev->bs, virtio_blk_flush_complete, req); if (!acb) { - virtio_blk_req_complete(req, VIRTIO_BLK_S_IOERR); + virtio_blk_flush_complete(req, -EIO); } }