Commit 7d3467d9 authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

hw/usb-storage: Check whether BB is inserted 



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

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarAlberto Garcia <berto@igalia.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 2e1280e8

hw/usb/dev-storage.c

+16 −14
Original line number Diff line number Diff line
@@ -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);