From patchwork Fri Sep 4 17:02:06 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 33008 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 bilbo.ozlabs.org (Postfix) with ESMTPS id D8EDEB7087 for ; Sat, 5 Sep 2009 03:11:30 +1000 (EST) Received: from localhost ([127.0.0.1]:35587 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MjcJr-0005NC-RX for incoming@patchwork.ozlabs.org; Fri, 04 Sep 2009 13:11:27 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MjcAw-0000n7-Gw for qemu-devel@nongnu.org; Fri, 04 Sep 2009 13:02:14 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MjcAr-0000jL-L4 for qemu-devel@nongnu.org; Fri, 04 Sep 2009 13:02:13 -0400 Received: from [199.232.76.173] (port=39740 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MjcAr-0000jB-BE for qemu-devel@nongnu.org; Fri, 04 Sep 2009 13:02:09 -0400 Received: from verein.lst.de ([213.95.11.210]:36011) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60) (envelope-from ) id 1MjcAq-0008Ip-9s for qemu-devel@nongnu.org; Fri, 04 Sep 2009 13:02:08 -0400 Received: from verein.lst.de (localhost [127.0.0.1]) by verein.lst.de (8.12.3/8.12.3/Debian-7.1) with ESMTP id n84H26VL023041 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Fri, 4 Sep 2009 19:02:06 +0200 Received: (from hch@localhost) by verein.lst.de (8.12.3/8.12.3/Debian-7.2) id n84H26g9023040 for qemu-devel@nongnu.org; Fri, 4 Sep 2009 19:02:06 +0200 Date: Fri, 4 Sep 2009 19:02:06 +0200 From: Christoph Hellwig To: qemu-devel@nongnu.org Message-ID: <20090904170206.GD22964@lst.de> References: <20090904170052.GA22640@lst.de> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090904170052.GA22640@lst.de> User-Agent: Mutt/1.3.28i X-Spam-Score: -0.001 () BAYES_44 X-Scanned-By: MIMEDefang 2.39 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 4/5] ide: use bdrv_aio_flush 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 Signed-off-by: Christoph Hellwig Index: qemu/hw/ide/core.c =================================================================== --- qemu.orig/hw/ide/core.c 2009-09-04 13:43:56.306522749 -0300 +++ qemu/hw/ide/core.c 2009-09-04 13:52:43.814551074 -0300 @@ -771,6 +771,16 @@ static void ide_atapi_cmd_check_status(I ide_set_irq(s->bus); } +static void ide_flush_cb(void *opaque, int ret) +{ + IDEState *s = opaque; + + /* XXX: how do we signal I/O errors here? */ + + s->status = READY_STAT | SEEK_STAT; + ide_set_irq(s->bus); +} + static inline void cpu_to_ube16(uint8_t *buf, int val) { buf[0] = val >> 8; @@ -1969,9 +1979,9 @@ void ide_ioport_write(void *opaque, uint case WIN_FLUSH_CACHE: case WIN_FLUSH_CACHE_EXT: if (s->bs) - bdrv_flush(s->bs); - s->status = READY_STAT | SEEK_STAT; - ide_set_irq(s->bus); + bdrv_aio_flush(s->bs, ide_flush_cb, s); + else + ide_flush_cb(s, 0); break; case WIN_STANDBY: case WIN_STANDBY2: