From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35669) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGC5p-0005vy-Kl for qemu-devel@nongnu.org; Tue, 27 Jan 2015 14:46:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGC5n-00023s-VR for qemu-devel@nongnu.org; Tue, 27 Jan 2015 14:46:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGC5n-00023e-OW for qemu-devel@nongnu.org; Tue, 27 Jan 2015 14:46:31 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0RJkV1A011121 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 27 Jan 2015 14:46:31 -0500 From: Max Reitz Date: Tue, 27 Jan 2015 14:45:37 -0500 Message-Id: <1422387983-32153-5-git-send-email-mreitz@redhat.com> In-Reply-To: <1422387983-32153-1-git-send-email-mreitz@redhat.com> References: <1422387983-32153-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH RESEND 04/50] hw/usb-storage: Check whether BB is inserted List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Jeff Cody , Markus Armbruster , Max Reitz , Stefan Hajnoczi , John Snow Only call bdrv_key_required() on the BlockDriverState if the BlockBackend has an inserted medium. Signed-off-by: Max Reitz --- hw/usb/dev-storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 4539733..3123baf 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -638,7 +638,7 @@ static void usb_msd_realize_storage(USBDevice *dev, Error **errp) usb_msd_handle_reset(dev); s->scsi_dev = scsi_dev; - if (bdrv_key_required(blk_bs(blk))) { + if (blk_is_inserted(blk) && bdrv_key_required(blk_bs(blk))) { if (cur_mon) { monitor_read_bdrv_key_start(cur_mon, blk_bs(blk), usb_msd_password_cb, s); -- 2.1.0