[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/13] monitor usb: Inline monitor_read_bdrv_key_star
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 07/13] monitor usb: Inline monitor_read_bdrv_key_start()'s first part |
Date: |
Wed, 18 Mar 2015 14:07:49 +0100 |
From: Markus Armbruster <address@hidden>
monitor_read_bdrv_key_start() does several things:
1. If no key is needed, call completion_cb() and succeed
2. If we're in QMP context, call qerror_report_err() and fail
3. Start reading the key in the monitor.
This is two things too many. Inline 1. and 2. into its callers
monitor_read_block_device_key() and usb_msd_realize_storage().
Since monitor_read_block_device_key() only ever runs in HMP context,
drop 2. there.
The next commit will clean up the result in usb_msd_realize_storage().
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/dev-storage.c | 13 +++++++++++--
monitor.c | 29 +++++++++++------------------
2 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index dacefd7..f47c856 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -641,8 +641,17 @@ static void usb_msd_realize_storage(USBDevice *dev, Error
**errp)
if (bdrv_key_required(blk_bs(blk))) {
if (cur_mon) {
- monitor_read_bdrv_key_start(cur_mon, blk_bs(blk),
- usb_msd_password_cb, s);
+ bdrv_add_key(blk_bs(blk), NULL, &err);
+ if (!err) {
+ usb_msd_password_cb(s, 0);
+ } else if (monitor_cur_is_qmp()) {
+ qerror_report_err(err);
+ error_free(err);
+ } else {
+ error_free(err);
+ monitor_read_bdrv_key_start(cur_mon, blk_bs(blk),
+ usb_msd_password_cb, s);
+ }
s->dev.auto_attach = 0;
} else {
autostart = 0;
diff --git a/monitor.c b/monitor.c
index bc77415..61c00ac 100644
--- a/monitor.c
+++ b/monitor.c
@@ -5377,25 +5377,8 @@ int monitor_read_bdrv_key_start(Monitor *mon,
BlockDriverState *bs,
BlockCompletionFunc *completion_cb,
void *opaque)
{
- Error *local_err = NULL;
int err;
- bdrv_add_key(bs, NULL, &local_err);
- if (!local_err) {
- if (completion_cb)
- completion_cb(opaque, 0);
- return 0;
- }
-
- /* Need a key for @bs */
-
- if (monitor_ctrl_mode(mon)) {
- qerror_report_err(local_err);
- error_free(local_err);
- return -1;
- }
-
- error_free(local_err);
monitor_printf(mon, "%s (%s) is encrypted.\n", bdrv_get_device_name(bs),
bdrv_get_encrypted_filename(bs));
@@ -5414,6 +5397,7 @@ int monitor_read_block_device_key(Monitor *mon, const
char *device,
BlockCompletionFunc *completion_cb,
void *opaque)
{
+ Error *err = NULL;
BlockBackend *blk;
blk = blk_by_name(device);
@@ -5422,7 +5406,16 @@ int monitor_read_block_device_key(Monitor *mon, const
char *device,
return -1;
}
- return monitor_read_bdrv_key_start(mon, blk_bs(blk), completion_cb,
opaque);
+ bdrv_add_key(blk_bs(blk), NULL, &err);
+ if (err) {
+ error_free(err);
+ return monitor_read_bdrv_key_start(mon, blk_bs(blk), completion_cb,
opaque);
+ }
+
+ if (completion_cb) {
+ completion_cb(opaque, 0);
+ }
+ return 0;
}
QemuOptsList qemu_mon_opts = {
--
1.8.3.1
- [Qemu-devel] [PULL for-2.3 00/13] usb patch queue., Gerd Hoffmann, 2015/03/18
- [Qemu-devel] [PULL 02/13] usb: Improve companion configuration error messages, Gerd Hoffmann, 2015/03/18
- [Qemu-devel] [PULL 13/13] ehci: fix segfault when hot-unplugging ehci controller, Gerd Hoffmann, 2015/03/18
- [Qemu-devel] [PULL 11/13] uhci: fix segfault when hot-unplugging uhci controller, Gerd Hoffmann, 2015/03/18
- [Qemu-devel] [PULL 12/13] ohci: fix resource cleanup leak, Gerd Hoffmann, 2015/03/18
- [Qemu-devel] [PULL 03/13] ohci: Complete conversion to realize, Gerd Hoffmann, 2015/03/18
- [Qemu-devel] [PULL 08/13] usb/dev-storage: Fix QMP device_add missing encryption key failure, Gerd Hoffmann, 2015/03/18
- [Qemu-devel] [PULL 04/13] uhci: Convert to realize, Gerd Hoffmann, 2015/03/18
- [Qemu-devel] [PULL 06/13] monitor: Plug memory leak in monitor_read_bdrv_key_start(), Gerd Hoffmann, 2015/03/18
- [Qemu-devel] [PULL 07/13] monitor usb: Inline monitor_read_bdrv_key_start()'s first part,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 05/13] monitor: Drop dead QMP check from monitor_read_password(), Gerd Hoffmann, 2015/03/18
- [Qemu-devel] [PULL 10/13] hw/usb: Include USB files only if necessary, Gerd Hoffmann, 2015/03/18
- [Qemu-devel] [PULL 09/13] usb/dev-storage: Avoid qerror_report_err() outside QMP handlers, Gerd Hoffmann, 2015/03/18
- [Qemu-devel] [PULL 01/13] usb: Propagate errors through usb_register_companion(), Gerd Hoffmann, 2015/03/18
- Re: [Qemu-devel] [PULL for-2.3 00/13] usb patch queue., Peter Maydell, 2015/03/19