falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.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

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

@ -613,6 +613,7 @@ static void usb_msd_realize_storage(USBDevice *dev, Error **errp)
return;
}
if (blk_bs(blk)) {
bdrv_add_key(blk_bs(blk), NULL, &err);
if (err) {
if (monitor_cur_is_qmp()) {
@ -629,6 +630,7 @@ static void usb_msd_realize_storage(USBDevice *dev, Error **errp)
autostart = 0;
}
}
}
blkconf_serial(&s->conf, &dev->serial);
blkconf_blocksizes(&s->conf);