From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGBS5-0007SM-KH for qemu-devel@nongnu.org; Tue, 27 Jan 2015 14:05:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGBRz-0006kI-Uh for qemu-devel@nongnu.org; Tue, 27 Jan 2015 14:05:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42334) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGBRz-0006kB-LC for qemu-devel@nongnu.org; Tue, 27 Jan 2015 14:05:23 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0RJ5Moa022999 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 27 Jan 2015 14:05:23 -0500 Message-ID: <54C7E169.7000707@redhat.com> Date: Tue, 27 Jan 2015 12:05:13 -0700 From: Eric Blake MIME-Version: 1.0 References: <1422288204-29271-1-git-send-email-mreitz@redhat.com> <1422288204-29271-5-git-send-email-mreitz@redhat.com> In-Reply-To: <1422288204-29271-5-git-send-email-mreitz@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="xF2qKEvC2xDuXt30mEHHrDrAcgaOQuvuN" Subject: Re: [Qemu-devel] [PATCH 04/50] hw/usb-storage: Check whether BB is inserted List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz , qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Jeff Cody , Markus Armbruster , Stefan Hajnoczi , john@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --xF2qKEvC2xDuXt30mEHHrDrAcgaOQuvuN Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 01/26/2015 09:02 AM, Max Reitz wrote: > Only call bdrv_key_required() on the BlockDriverState if the > BlockBackend has an inserted medium. >=20 > Signed-off-by: Max Reitz > --- > hw/usb/dev-storage.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Eric Blake >=20 > 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 =3D scsi_dev; > =20 > - 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); >=20 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --xF2qKEvC2xDuXt30mEHHrDrAcgaOQuvuN Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJUx+FpAAoJEKeha0olJ0NqMlYH/36o29f/tx4ekxFqj/c1jyER FlBzlyJnSLVVABbCMV8x5lXG1ACqsn5EPr/jTfZk01h41v5J6CR0Rl8vM0hngigs I9TZoWo9vXlfRPsAl+T5JX6+UhHEjcN/sI8FlkTMF1iC4ee+2cHLuJU49xgX5sD6 q4Y1Zk3K1rSIleXPS2s7zRDb+l7P71OsAaXXP/hSBxEfeLIYDIiTwTj0FgqPlWYm 6fIgNqEjljlc8Y3OFokFzI2lB+7Q5JZndybdZbpBAlrnK4Krpsueft0pSEnYRHdl zO9YSs1OueUTKO0fjW1V9DLMjC40V35hGibm1+W/Dnp07Llz6thzEIdo2Np/Pc0= =Sb8z -----END PGP SIGNATURE----- --xF2qKEvC2xDuXt30mEHHrDrAcgaOQuvuN--