From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoYcY-0003wG-Um for qemu-devel@nongnu.org; Mon, 17 Jun 2013 08:33:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UoYcU-0004sc-Aa for qemu-devel@nongnu.org; Mon, 17 Jun 2013 08:33:18 -0400 Received: from mail-we0-x22c.google.com ([2a00:1450:400c:c03::22c]:37285) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UoYcU-0004sM-4s for qemu-devel@nongnu.org; Mon, 17 Jun 2013 08:33:14 -0400 Received: by mail-we0-f172.google.com with SMTP id q56so2341279wes.3 for ; Mon, 17 Jun 2013 05:33:13 -0700 (PDT) Date: Mon, 17 Jun 2013 14:33:10 +0200 From: Stefan Hajnoczi Message-ID: <20130617123310.GB30145@stefanha-thinkpad.redhat.com> References: <20130605132317.GF31478@stefanha-thinkpad.muc.redhat.com> <51BEDAEB.3050404@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <51BEDAEB.3050404@redhat.com> Subject: Re: [Qemu-devel] [PATCH v2 2/2] block: move the bdrv_dev_change_media_cb() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Pavel Hrdina Cc: kwolf@redhat.com, lcapitulino@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com On Mon, Jun 17, 2013 at 11:46:19AM +0200, Pavel Hrdina wrote: > On 5.6.2013 15:23, Stefan Hajnoczi wrote: > >On Wed, May 29, 2013 at 06:18:19PM +0200, Pavel Hrdina wrote: > >>@@ -1071,14 +1072,18 @@ static void qmp_bdrv_open_encrypted(BlockDriverState *bs, const char *filename, > >> if (password) { > >> if (bdrv_set_key(bs, password) < 0) { > >> error_set(errp, QERR_INVALID_PASSWORD); > >>+ return; > >> } > >> } else { > >> error_set(errp, QERR_DEVICE_ENCRYPTED, bdrv_get_device_name(bs), > >> bdrv_get_encrypted_filename(bs)); > >>+ return; > >> } > >> } else if (password) { > >> error_set(errp, QERR_DEVICE_NOT_ENCRYPTED, bdrv_get_device_name(bs)); > >> } > >>+ > >>+ bdrv_dev_change_media_cb(bs, true); > >> } > > > >Calling bdrv_dev_change_media_cb() after raising > >QERR_DEVICE_NOT_ENCRYPTED is intentional? It might warrant a comment. > > > > Sorry for my late answer. > > It's just a warning, that you used a password for a block device that > doesn't require it. The device is opened successfully and should be > handled correctly (call the bdrv_dev_change_media_cb() ). Yep, IMO it's worth a comment that this isn't an "error" just a "warning". Stefan