mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "IDE: Do not flush empty CDROM drives"

Browse Source 
This reverts commit 4da97120d5.

blk_aio_flush() now handles the blk->root == NULL case, so we no longer
need this workaround.

Cc: John Snow <jsnow@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2018-02-16 16:50:15 +00:00 committed by Kevin Wolf
parent ad0df3e0fd
commit 13471a40c1
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/ide/core.c
View File

@ -1087,15 +1087,7 @@ static void ide_flush_cache(IDEState *s)
s->status |= BUSY_STAT;
ide_set_retry(s);
block_acct_start(blk_get_stats(s->blk), &s->acct, 0, BLOCK_ACCT_FLUSH);
if (blk_bs(s->blk)) {
s->pio_aiocb = blk_aio_flush(s->blk, ide_flush_cb, s);
} else {
/* XXX blk_aio_flush() crashes when blk_bs(blk) is NULL, remove this
* temporary workaround when blk_aio_*() functions handle NULL blk_bs.
*/
ide_flush_cb(s, 0);
}
s->pio_aiocb = blk_aio_flush(s->blk, ide_flush_cb, s);
}
static void ide_cfata_metadata_inquiry(IDEState *s)