[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] ide: Fix segfault when flushing a device that doesn
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH] ide: Fix segfault when flushing a device that doesn't exist |
Date: |
Tue, 12 Aug 2014 18:29:41 +0200 |
Signed-off-by: Kevin Wolf <address@hidden>
---
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 db191a6..180ded8 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -838,7 +838,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_async_cmd_done(s);
ide_set_irq(s->bus);
diff --git a/tests/ide-test.c b/tests/ide-test.c
index 4a0d97f..a6d7292 100644
--- a/tests/ide-test.c
+++ b/tests/ide-test.c
@@ -489,6 +489,19 @@ static void test_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();
@@ -521,6 +534,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);
ret = g_test_run();
--
1.8.3.1
- [Qemu-devel] [PATCH] ide: Fix segfault when flushing a device that doesn't exist,
Kevin Wolf <=