From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nrw4U-0007yt-Sx
	for qemu-devel@nongnu.org; Wed, 17 Mar 2010 12:26:15 -0400
Received: from [199.232.76.173] (port=43642 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nrw4T-0007w3-ML
	for qemu-devel@nongnu.org; Wed, 17 Mar 2010 12:26:13 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <anthony@codemonkey.ws>) id 1Nrvz1-0002f2-2M
	for qemu-devel@nongnu.org; Wed, 17 Mar 2010 12:20:36 -0400
Received: from mail-pv0-f173.google.com ([74.125.83.173]:62196)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1Nrvz0-0002ey-OM
	for qemu-devel@nongnu.org; Wed, 17 Mar 2010 12:20:34 -0400
Received: by pvf33 with SMTP id 33so588014pvf.4
	for <qemu-devel@nongnu.org>; Wed, 17 Mar 2010 09:20:33 -0700 (PDT)
Message-ID: <4BA1014E.9060805@codemonkey.ws>
Date: Wed, 17 Mar 2010 11:20:30 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH 1/2] QError: New QERR_DEVICE_NOT_ENCRYPTED
References: <cover.1267827125.git.shaharh@redhat.com>
	<fb6a8be110590fa6e67c23dced166a5fc5c7a0aa.1267827125.git.shaharh@redhat.com>
In-Reply-To: <fb6a8be110590fa6e67c23dced166a5fc5c7a0aa.1267827125.git.shaharh@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
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: Dor Laor <dlaor@redhat.com>, qemu-devel@nongnu.org

On 03/05/2010 04:25 PM, Shahar Havivi wrote:
> Signed-off-by: Shahar Havivi<shaharh@redhat.com>
>    
Applied.  Thanks.

Regards,

Anthony Liguori
> ---
>   qerror.c |    4 ++++
>   qerror.h |    3 +++
>   2 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/qerror.c b/qerror.c
> index 2f657f4..4e63a54 100644
> --- a/qerror.c
> +++ b/qerror.c
> @@ -49,6 +49,10 @@ static const QErrorStringTable qerror_table[] = {
>           .desc      = "The %(device) is encrypted",
>       },
>       {
> +        .error_fmt = QERR_DEVICE_NOT_ENCRYPTED,
> +        .desc      = "Device '%(device)' is not encrypted",
> +    },
> +    {
>           .error_fmt = QERR_DEVICE_LOCKED,
>           .desc      = "Device %(device) is locked",
>       },
> diff --git a/qerror.h b/qerror.h
> index ee59615..b93fff6 100644
> --- a/qerror.h
> +++ b/qerror.h
> @@ -46,6 +46,9 @@ QError *qobject_to_qerror(const QObject *obj);
>   #define QERR_DEVICE_ENCRYPTED \
>       "{ 'class': 'DeviceEncrypted', 'data': { 'device': %s } }"
>
> +#define QERR_DEVICE_NOT_ENCRYPTED \
> +    "{ 'class': 'DeviceNotEncrypted', 'data': { 'device': %s } }"
> +
>   #define QERR_DEVICE_LOCKED                                      \
>       "{ 'class': 'DeviceLocked', 'data': { 'device': %s } }"
>
>