diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2010-10-18 17:10:49 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2010-10-22 14:49:35 +0200 |
| commit | 6bcb1a79a31563f2c414e1bd35d044d6ab385011 (patch) | |
| tree | 1540426b41155bb83e16c44d0c01e12d47abb79e | |
| parent | a18953fbe72ba553a564ba11fdda03aac41d4f38 (diff) | |
| download | qemu-6bcb1a79a31563f2c414e1bd35d044d6ab385011.tar.gz | |
ide: Factor ide_flush_cache out
The next patch reuses this code, so put it in its own function.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | 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 5ccb09cfbc..6d8606e897 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: |