From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NnZNP-0008Fo-44
	for qemu-devel@nongnu.org; Fri, 05 Mar 2010 10:23:43 -0500
Received: from [199.232.76.173] (port=37501 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NnZNO-0008Fg-Ot
	for qemu-devel@nongnu.org; Fri, 05 Mar 2010 10:23:42 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <kwolf@redhat.com>) id 1NnZNO-0007iz-5M
	for qemu-devel@nongnu.org; Fri, 05 Mar 2010 10:23:42 -0500
Received: from mx1.redhat.com ([209.132.183.28]:6124)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <kwolf@redhat.com>) id 1NnZNN-0007ij-PI
	for qemu-devel@nongnu.org; Fri, 05 Mar 2010 10:23:42 -0500
Received: from int-mx05.intmail.prod.int.phx2.redhat.com
	(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o25FNe5s019236
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Fri, 5 Mar 2010 10:23:40 -0500
Message-ID: <4B9121CF.6020703@redhat.com>
Date: Fri, 05 Mar 2010 16:22:55 +0100
From: Kevin Wolf <kwolf@redhat.com>
MIME-Version: 1.0
References: <20100305151222.GA21283@redhat.com>
In-Reply-To: <20100305151222.GA21283@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH] Wrong error message in block_passwd command
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Shahar Havivi <shaharh@redhat.com>
Cc: Luiz Capitulino <lcapitul@redhat.com>, Dor Laor <dlaor@redhat.com>, qemu-devel@nongnu.org

Am 05.03.2010 16:12, schrieb Shahar Havivi:
> Monitor command 'block_passwd' reports a wrong error message when
> drive is not encrypted
> 
> Signed-off-by: Shahar Havivi <shaharh@redhat.com>
> ---
>  block.c   |    9 ++++++---
>  monitor.c |    7 ++++++-
>  qerror.c  |    4 ++++
>  qerror.h  |    3 +++
>  4 files changed, 19 insertions(+), 4 deletions(-)
> 
> diff --git a/block.c b/block.c
> index 31d1ba4..dd484fa 100644
> --- a/block.c
> +++ b/block.c
> @@ -1132,10 +1132,13 @@ int bdrv_set_key(BlockDriverState *bs, const char *key)
>          if (ret < 0)
>              return ret;
>          if (!bs->encrypted)
> -            return 0;
> +            return -EINVAL;
> +    }

I think this part is wrong actually. Sorry for not catching it when you
sent me the patch first.

The logic here is that it's not an error to set the password for a file
which isn't encrypted itself, but its backing file is. In this case the
key is only set for the backing file and we return success.

The other parts look good to me.

Kevin