Message ID | 1267034160-3517-10-git-send-email-armbru@redhat.com |
---|---|
State | New |
Headers | show |
diff --git a/hw/usb-msd.c b/hw/usb-msd.c index 36991f8..1e3e101 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;
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 <armbru@redhat.com> --- hw/usb-msd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)