diff options
| author | Stefan Hajnoczi | 2017-08-09 18:02:11 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi | 2017-08-10 15:33:43 +0200 |
| commit | 4da97120d51a4383aa96d741a2b837f8c4bbcd0b (patch) | |
| tree | 1338896c20d3bee4ee1fe9326b3b32ee6f893d54 | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.10-20170809' int... (diff) | |
| download | qemu-4da97120d51a4383aa96d741a2b837f8c4bbcd0b.tar.gz qemu-4da97120d51a4383aa96d741a2b837f8c4bbcd0b.tar.xz qemu-4da97120d51a4383aa96d741a2b837f8c4bbcd0b.zip | |
IDE: Do not flush empty CDROM drives
The block backend changed in a way that flushing empty CDROM drives now
crashes. Amend IDE to avoid doing so until the root problem can be
addressed for 2.11.
Original patch by John Snow <jsnow@redhat.com>.
Reported-by: Kieron Shorrock <kshorrock@paloaltonetworks.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20170809160212.29976-2-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | hw/ide/core.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index 0b48b64d3a..bea39536b0 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1063,7 +1063,15 @@ 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); - s->pio_aiocb = blk_aio_flush(s->blk, ide_flush_cb, s); + + 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) |