From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elbSb-0001Jm-Dk for qemu-devel@nongnu.org; Tue, 13 Feb 2018 09:21:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elbSV-0002ME-Ix for qemu-devel@nongnu.org; Tue, 13 Feb 2018 09:21:29 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:51996 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1elbSV-0002Lw-FJ for qemu-devel@nongnu.org; Tue, 13 Feb 2018 09:21:23 -0500 From: Stefan Hajnoczi Date: Tue, 13 Feb 2018 14:21:02 +0000 Message-Id: <20180213142102.14450-5-stefanha@redhat.com> In-Reply-To: <20180213142102.14450-1-stefanha@redhat.com> References: <20180213142102.14450-1-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/4] Revert "IDE: Do not flush empty CDROM drives" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: John Snow , mark.kanda@oracle.com, Kevin Wolf , Stefan Hajnoczi This reverts commit 4da97120d51a4383aa96d741a2b837f8c4bbcd0b. blk_aio_flush() now handles the blk->root == NULL case, so we no longer need this workaround. Cc: John Snow Signed-off-by: Stefan Hajnoczi Reviewed-by: Eric Blake --- hw/ide/core.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 257b429381..139c843514 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -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) -- 2.14.3