From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54109)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <phrdina@redhat.com>) id 1UoZR7-0003uK-QC
	for qemu-devel@nongnu.org; Mon, 17 Jun 2013 09:25:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <phrdina@redhat.com>) id 1UoZR2-00053u-QS
	for qemu-devel@nongnu.org; Mon, 17 Jun 2013 09:25:33 -0400
Received: from mx1.redhat.com ([209.132.183.28]:39756)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <phrdina@redhat.com>) id 1UoZR2-00053o-H4
	for qemu-devel@nongnu.org; Mon, 17 Jun 2013 09:25:28 -0400
Message-ID: <51BF0E44.3060700@redhat.com>
Date: Mon, 17 Jun 2013 15:25:24 +0200
From: Pavel Hrdina <phrdina@redhat.com>
MIME-Version: 1.0
References: <cover.1369841836.git.phrdina@redhat.com>
	<efebd1409316dc6bf2c1fc10a4b933955a6c38e9.1369841836.git.phrdina@redhat.com>
	<20130605132317.GF31478@stefanha-thinkpad.muc.redhat.com>
	<51BEDAEB.3050404@redhat.com>
	<20130617123310.GB30145@stefanha-thinkpad.redhat.com>
	<20130617092212.6cdac080@redhat.com>
In-Reply-To: <20130617092212.6cdac080@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v2 2/2] block: move the
	bdrv_dev_change_media_cb()
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: Luiz Capitulino <lcapitulino@redhat.com>
Cc: kwolf@redhat.com, Stefan Hajnoczi <stefanha@gmail.com>, qemu-devel@nongnu.org, armbru@redhat.com

On 17.6.2013 15:22, Luiz Capitulino wrote:
> On Mon, 17 Jun 2013 14:33:10 +0200
> Stefan Hajnoczi <stefanha@gmail.com> wrote:
>
>> 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".
>
> Actually, you can't have such a warning in QMP. You either fail or you
> succeed. We should just do what the current code does.
>

This is the same logic as the old one. The device is loaded but the
error is emitted.

Pavel