ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/usb-storage: Check whether BB is inserted 

Only call bdrv_add_key() on the BlockDriverState if it is not NULL.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2015-10-19 17:53:17 +02:00 committed by Kevin Wolf
parent 2e1280e8ff
commit 7d3467d903
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/usb/dev-storage.c
View File

@ -613,20 +613,22 @@ static void usb_msd_realize_storage(USBDevice *dev, Error **errp)
return; return;
} }
bdrv_add_key(blk_bs(blk), NULL, &err); if (blk_bs(blk)) {
if (err) { bdrv_add_key(blk_bs(blk), NULL, &err);
if (monitor_cur_is_qmp()) { if (err) {
error_propagate(errp, err); if (monitor_cur_is_qmp()) {
return; error_propagate(errp, err);
} return;
error_free(err); }
err = NULL; error_free(err);
if (cur_mon) { err = NULL;
monitor_read_bdrv_key_start(cur_mon, blk_bs(blk), if (cur_mon) {
usb_msd_password_cb, s); monitor_read_bdrv_key_start(cur_mon, blk_bs(blk),
s->dev.auto_attach = 0; usb_msd_password_cb, s);
} else { s->dev.auto_attach = 0;
autostart = 0; } else {
autostart = 0;
}
} }
} }