Commit 13471a40 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Kevin Wolf
Browse files

Revert "IDE: Do not flush empty CDROM drives" 



This reverts commit 4da97120.

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: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent ad0df3e0

hw/ide/core.c

+1 −9
Original line number Diff line number Diff line
@@ -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);

    }

}



static void ide_cfata_metadata_inquiry(IDEState *s)