mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blockdev: Fix drive_del not to crash when drive is not in use

Browse Source 
Watch this:

    (qemu) drive_add 0 if=none,file=tmp.img
    OK
    (qemu) info block
    none0: type=hd removable=0 file=tmp.img ro=0 drv=raw encrypted=0
    (qemu) drive_del none0
    Segmentation fault (core dumped)

do_drive_del()'s code to clean up the pointer from a qdev using the
drive back to the drive needs to check whether such a device exists.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster 2011-01-17 19:31:29 +01:00 committed by Kevin Wolf
parent 807105a775
commit 850ec1133b
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
blockdev.c
View File

@ -687,13 +687,15 @@ int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data)
/* clean up guest state from pointing to host resource by /* clean up guest state from pointing to host resource by
* finding and removing DeviceState "drive" property */ * finding and removing DeviceState "drive" property */
for (prop = bs->peer->info->props; prop && prop->name; prop++) { if (bs->peer) {
if (prop->info->type == PROP_TYPE_DRIVE) { for (prop = bs->peer->info->props; prop && prop->name; prop++) {
ptr = qdev_get_prop_ptr(bs->peer, prop); if (prop->info->type == PROP_TYPE_DRIVE) {
if ((*ptr) == bs) { ptr = qdev_get_prop_ptr(bs->peer, prop);
bdrv_detach(bs, bs->peer); if (*ptr == bs) {
*ptr = NULL; bdrv_detach(bs, bs->peer);
break; *ptr = NULL;
break;
}
} }
} }
} }