mirror of https://github.com/proxmox/mirror_qemu
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>master
parent
2f7133b2e5
commit
f7f3ff1da0
|
@ -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;
|
s->status = READY_STAT | SEEK_STAT;
|
||||||
ide_cmd_done(s);
|
ide_cmd_done(s);
|
||||||
ide_set_irq(s->bus);
|
ide_set_irq(s->bus);
|
||||||
|
|
|
@ -564,6 +564,19 @@ static void test_retry_flush(void)
|
||||||
ide_test_quit();
|
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)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
const char *arch = qtest_get_arch();
|
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/bmdma/teardown", test_bmdma_teardown);
|
||||||
|
|
||||||
qtest_add_func("/ide/flush", test_flush);
|
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);
|
qtest_add_func("/ide/retry/flush", test_retry_flush);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue