From patchwork Thu Nov 4 13:15:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 70129 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 285941007D2 for ; Fri, 5 Nov 2010 00:18:16 +1100 (EST) Received: from localhost ([127.0.0.1]:56124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDzhl-00029e-6v for incoming@patchwork.ozlabs.org; Thu, 04 Nov 2010 09:18:13 -0400 Received: from [140.186.70.92] (port=48290 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDzeo-00012R-PJ for qemu-devel@nongnu.org; Thu, 04 Nov 2010 09:15:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDzej-00039B-Ue for qemu-devel@nongnu.org; Thu, 04 Nov 2010 09:15:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60216) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDzej-00038z-Jk for qemu-devel@nongnu.org; Thu, 04 Nov 2010 09:15:05 -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 oA4DF38J016768 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 4 Nov 2010 09:15:03 -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 oA4DEohn027227; Thu, 4 Nov 2010 09:15:02 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Thu, 4 Nov 2010 14:15:38 +0100 Message-Id: <1288876539-8300-10-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> 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, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 09/10] 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); } }