[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 11/38] hw/usb-storage: Check whether BB is insert
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v5 11/38] hw/usb-storage: Check whether BB is inserted |
Date: |
Fri, 18 Sep 2015 17:22:46 +0200 |
Only call bdrv_add_key() on the BlockDriverState if it is not NULL.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
---
hw/usb/dev-storage.c | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 9a4e7dc..597d8fd 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -613,20 +613,22 @@ static void usb_msd_realize_storage(USBDevice *dev, Error
**errp)
return;
}
- bdrv_add_key(blk_bs(blk), NULL, &err);
- if (err) {
- if (monitor_cur_is_qmp()) {
- error_propagate(errp, err);
- return;
- }
- error_free(err);
- err = NULL;
- if (cur_mon) {
- monitor_read_bdrv_key_start(cur_mon, blk_bs(blk),
- usb_msd_password_cb, s);
- s->dev.auto_attach = 0;
- } else {
- autostart = 0;
+ if (blk_bs(blk)) {
+ bdrv_add_key(blk_bs(blk), NULL, &err);
+ if (err) {
+ if (monitor_cur_is_qmp()) {
+ error_propagate(errp, err);
+ return;
+ }
+ error_free(err);
+ err = NULL;
+ if (cur_mon) {
+ monitor_read_bdrv_key_start(cur_mon, blk_bs(blk),
+ usb_msd_password_cb, s);
+ s->dev.auto_attach = 0;
+ } else {
+ autostart = 0;
+ }
}
}
--
2.5.2
- [Qemu-block] [PATCH v5 04/38] iotests: Only create BB if necessary, (continued)
- [Qemu-block] [PATCH v5 04/38] iotests: Only create BB if necessary, Max Reitz, 2015/09/18
- [Qemu-block] [PATCH v5 07/38] block: Make bdrv_is_inserted() recursive, Max Reitz, 2015/09/18
- [Qemu-block] [PATCH v5 09/38] block: Invoke change media CB before NULLing drv, Max Reitz, 2015/09/18
- [Qemu-block] [PATCH v5 08/38] block/raw_bsd: Drop raw_is_inserted(), Max Reitz, 2015/09/18
- [Qemu-block] [PATCH v5 10/38] hw/block/fdc: Implement tray status, Max Reitz, 2015/09/18
- [Qemu-block] [PATCH v5 11/38] hw/usb-storage: Check whether BB is inserted,
Max Reitz <=
- [Qemu-block] [PATCH v5 12/38] block: Fix BB AIOCB AioContext without BDS, Max Reitz, 2015/09/18
- [Qemu-block] [PATCH v5 13/38] block: Move guest_block_size into BlockBackend, Max Reitz, 2015/09/18
- [Qemu-block] [PATCH v5 14/38] block: Remove wr_highest_sector from BlockAcctStats, Max Reitz, 2015/09/18
- [Qemu-block] [PATCH v5 15/38] block: Move BlockAcctStats into BlockBackend, Max Reitz, 2015/09/18
- [Qemu-block] [PATCH v5 17/38] block: Add BlockBackendRootState, Max Reitz, 2015/09/18