diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2014-08-12 18:29:41 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-08-15 18:03:13 +0100 |
| commit | f7f3ff1da0c451befc8d32f977f9c352d1303f40 (patch) | |
| tree | 39f90c284a5603dfcd231a70b486119dc6b647db | |
| parent | 2f7133b2e540342809a35bb4f52e0abdc5fff9ff (diff) | |
| download | qemu-f7f3ff1da0c451befc8d32f977f9c352d1303f40.tar.gz | |
ide: Fix segfault when flushing a device that doesn't exist
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | hw/ide/core.c | 4 | ||||
| -rw-r--r-- | tests/ide-test.c | 14 |
2 files changed, 17 insertions, 1 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index bdb0a804cf..82dd4afd84 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 a77a037d1e..ffce6ed669 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); |