Message ID | 20180208171807.24267-4-stefanha@redhat.com |
---|---|
State | New |
Headers | show |
Series | block: fix blk_aio_*() segfault when blk->root == NULL | expand |
On 02/08/2018 11:18 AM, Stefan Hajnoczi wrote: > This reverts commit 4da97120d51a4383aa96d741a2b837f8c4bbcd0b. > > 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> > --- > hw/ide/core.c | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/hw/ide/core.c b/hw/ide/core.c index 5be72d41dc..6154bc6ad7 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1085,15 +1085,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)
This reverts commit 4da97120d51a4383aa96d741a2b837f8c4bbcd0b. 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> --- hw/ide/core.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)