From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48714)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1YT9su-0007Vt-Ta
	for qemu-devel@nongnu.org; Wed, 04 Mar 2015 09:02:54 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1YT9ss-00015a-2t
	for qemu-devel@nongnu.org; Wed, 04 Mar 2015 09:02:48 -0500
Received: from mx1.redhat.com ([209.132.183.28]:35065)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1YT9sr-000156-Ly
	for qemu-devel@nongnu.org; Wed, 04 Mar 2015 09:02:46 -0500
Received: from int-mx11.intmail.prod.int.phx2.redhat.com
	(int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t24E2ibl022379
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256
	verify=FAIL)
	for <qemu-devel@nongnu.org>; Wed, 4 Mar 2015 09:02:45 -0500
Date: Wed, 4 Mar 2015 15:02:42 +0100
From: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20150304140242.GQ3465@noname.str.redhat.com>
References: <1423501897-30410-1-git-send-email-mreitz@redhat.com>
	<1423501897-30410-5-git-send-email-mreitz@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1423501897-30410-5-git-send-email-mreitz@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v2 04/37] hw/usb-storage: Check whether BB
	is inserted
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Max Reitz <mreitz@redhat.com>
Cc: John Snow <jsnow@redhat.com>, qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>, Markus Armbruster <armbru@redhat.com>

Am 09.02.2015 um 18:11 hat Max Reitz geschrieben:
> Only call bdrv_key_required() on the BlockDriverState if the
> BlockBackend has an inserted medium.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
>  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);

Why would bdrv_key_required() ever return true when no medium is
inserted? Sounds like a bug to me, like not resetting state correctly on
bdrv_close() of an encrypted image.

Kevin