From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=60047 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P8DnU-0003Ev-38 for qemu-devel@nongnu.org; Tue, 19 Oct 2010 11:08:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P8DnS-0006q1-UF for qemu-devel@nongnu.org; Tue, 19 Oct 2010 11:08:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26073) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P8DnS-0006pt-Np for qemu-devel@nongnu.org; Tue, 19 Oct 2010 11:08:14 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9JF8EFg001013 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 19 Oct 2010 11:08:14 -0400 From: Kevin Wolf Date: Tue, 19 Oct 2010 17:08:51 +0200 Message-Id: <1287500932-7366-2-git-send-email-kwolf@redhat.com> In-Reply-To: <1287500932-7366-1-git-send-email-kwolf@redhat.com> References: <1287500932-7366-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] ide: Factor ide_flush_cache out 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 The next patch reuses this code, so put it in its own function. Signed-off-by: Kevin Wolf --- hw/ide/core.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 5ccb09c..6d8606e 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -801,6 +801,15 @@ static void ide_flush_cb(void *opaque, int ret) ide_set_irq(s->bus); } +static void ide_flush_cache(IDEState *s) +{ + if (s->bs) { + bdrv_aio_flush(s->bs, ide_flush_cb, s); + } else { + ide_flush_cb(s, 0); + } +} + static inline void cpu_to_ube16(uint8_t *buf, int val) { buf[0] = val >> 8; @@ -2031,10 +2040,7 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val) break; case WIN_FLUSH_CACHE: case WIN_FLUSH_CACHE_EXT: - if (s->bs) - bdrv_aio_flush(s->bs, ide_flush_cb, s); - else - ide_flush_cb(s, 0); + ide_flush_cache(s); break; case WIN_STANDBY: case WIN_STANDBY2: -- 1.7.2.3