[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/50] block: Simplify usb_msd_initfn() test for "ca
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 07/50] block: Simplify usb_msd_initfn() test for "can read bdrv key" |
Date: |
Thu, 4 Mar 2010 16:56:28 +0100 |
The old test assumes that "hotplugged" implies "we have a current
monitor for reading the key". This is in fact true, but it's not
obviously true.
Aside: if it were false, we could pass a null pointer to
monitor_read_bdrv_key_start(), which would then crash.
The previous commit permits us to check for "we have a current
monitor" directly, so do that.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/usb-msd.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index 1a11bc5..0afb031 100644
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -535,7 +535,7 @@ static int usb_msd_initfn(USBDevice *dev)
usb_msd_handle_reset(dev);
if (bdrv_key_required(s->conf.dinfo->bdrv)) {
- if (s->dev.qdev.hotplugged) {
+ if (cur_mon) {
monitor_read_bdrv_key_start(cur_mon, s->conf.dinfo->bdrv,
usb_msd_password_cb, s);
s->dev.auto_attach = 0;
--
1.6.6.1
- [Qemu-devel] [PATCH 09/50] error: Move qemu_error() & friends from monitor.c to own file, (continued)
- [Qemu-devel] [PATCH 09/50] error: Move qemu_error() & friends from monitor.c to own file, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 11/50] error: Move qemu_error & friends into their own header, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 35/50] error: New QERR_DEVICE_MULTIPLE_BUSSES, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 23/50] qdev: Fix -device and device_add to handle unsuitable bus gracefully, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 14/50] error: Don't abuse qemu_error() for non-error in qbus_find(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 26/50] qdev: Hide "ptr" properties from users, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 08/50] monitor: Factor monitor_set_error() out of qemu_error_internal(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 41/50] error: New QERR_DEVICE_INIT_FAILED, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 31/50] error: New QERR_PROPERTY_VALUE_BAD, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 13/50] error: Don't abuse qemu_error() for non-error in qdev_device_help(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 07/50] block: Simplify usb_msd_initfn() test for "can read bdrv key",
Markus Armbruster <=
- [Qemu-devel] [PATCH 06/50] monitor: Separate "default monitor" and "current monitor" cleanly, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 40/50] error: New QERR_BUS_NO_HOTPLUG, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 18/50] error: Infrastructure to track locations for error reporting, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 15/50] error: Don't abuse qemu_error() for non-error in scsi_hot_add(), Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 34/50] error: New QERR_BUS_NOT_FOUND, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 39/50] error: New QERR_BAD_BUS_FOR_DEVICE, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 42/50] error: New QERR_NO_BUS_FOR_DEVICE, Markus Armbruster, 2010/03/04
- [Qemu-devel] [PATCH 45/50] qemu-option: Functions to convert to/from QDict, Markus Armbruster, 2010/03/04