From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50986)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1UkDgS-00008B-4v
	for qemu-devel@nongnu.org; Wed, 05 Jun 2013 09:23:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1UkDgQ-0002h7-Eu
	for qemu-devel@nongnu.org; Wed, 05 Jun 2013 09:23:24 -0400
Received: from mail-we0-x22e.google.com ([2a00:1450:400c:c03::22e]:51039)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1UkDgQ-0002gz-8t
	for qemu-devel@nongnu.org; Wed, 05 Jun 2013 09:23:22 -0400
Received: by mail-we0-f174.google.com with SMTP id q58so1277689wes.19
	for <qemu-devel@nongnu.org>; Wed, 05 Jun 2013 06:23:21 -0700 (PDT)
Date: Wed, 5 Jun 2013 15:23:17 +0200
From: Stefan Hajnoczi <stefanha@gmail.com>
Message-ID: <20130605132317.GF31478@stefanha-thinkpad.muc.redhat.com>
References: <cover.1369841836.git.phrdina@redhat.com>
	<efebd1409316dc6bf2c1fc10a4b933955a6c38e9.1369841836.git.phrdina@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <efebd1409316dc6bf2c1fc10a4b933955a6c38e9.1369841836.git.phrdina@redhat.com>
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: Pavel Hrdina <phrdina@redhat.com>
Cc: kwolf@redhat.com, lcapitulino@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com

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.