From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIKzX-0007Wb-D1 for qemu-devel@nongnu.org; Fri, 15 Aug 2014 13:08:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XIKzR-0000SC-8k for qemu-devel@nongnu.org; Fri, 15 Aug 2014 13:08:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64567) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIKzR-0000S6-13 for qemu-devel@nongnu.org; Fri, 15 Aug 2014 13:08:33 -0400 From: Stefan Hajnoczi Date: Fri, 15 Aug 2014 18:06:47 +0100 Message-Id: <1408122422-13935-41-git-send-email-stefanha@redhat.com> In-Reply-To: <1408122422-13935-1-git-send-email-stefanha@redhat.com> References: <1408122422-13935-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 40/55] ide: Fix segfault when flushing a device that doesn't exist List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Maydell , Stefan Hajnoczi From: Kevin Wolf Signed-off-by: Kevin Wolf Signed-off-by: Stefan Hajnoczi --- hw/ide/core.c | 4 +++- tests/ide-test.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index bdb0a80..82dd4af 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -848,7 +848,9 @@ static void ide_flush_cb(void *opaque, int ret) } } - bdrv_acct_done(s->bs, &s->acct); + if (s->bs) { + bdrv_acct_done(s->bs, &s->acct); + } s->status = READY_STAT | SEEK_STAT; ide_cmd_done(s); ide_set_irq(s->bus); diff --git a/tests/ide-test.c b/tests/ide-test.c index a77a037..ffce6ed 100644 --- a/tests/ide-test.c +++ b/tests/ide-test.c @@ -564,6 +564,19 @@ static void test_retry_flush(void) ide_test_quit(); } +static void test_flush_nodev(void) +{ + ide_test_start(""); + + /* FLUSH CACHE command on device 0*/ + outb(IDE_BASE + reg_device, 0); + outb(IDE_BASE + reg_command, CMD_FLUSH_CACHE); + + /* Just testing that qemu doesn't crash... */ + + ide_test_quit(); +} + int main(int argc, char **argv) { const char *arch = qtest_get_arch(); @@ -601,6 +614,7 @@ int main(int argc, char **argv) qtest_add_func("/ide/bmdma/teardown", test_bmdma_teardown); qtest_add_func("/ide/flush", test_flush); + qtest_add_func("/ide/flush_nodev", test_flush_nodev); qtest_add_func("/ide/retry/flush", test_retry_flush); -- 1.9.3