From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NneKy-0005ll-Ft
	for qemu-devel@nongnu.org; Fri, 05 Mar 2010 15:41:32 -0500
Received: from [199.232.76.173] (port=43200 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NneKy-0005ld-54
	for qemu-devel@nongnu.org; Fri, 05 Mar 2010 15:41:32 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <lcapitulino@redhat.com>) id 1NneKw-0000bU-SS
	for qemu-devel@nongnu.org; Fri, 05 Mar 2010 15:41:31 -0500
Received: from mx1.redhat.com ([209.132.183.28]:30669)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <lcapitulino@redhat.com>) id 1NneKw-0000b6-Fz
	for qemu-devel@nongnu.org; Fri, 05 Mar 2010 15:41:30 -0500
Received: from int-mx08.intmail.prod.int.phx2.redhat.com
	(int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o25KfORt003262
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Fri, 5 Mar 2010 15:41:24 -0500
Date: Fri, 5 Mar 2010 17:41:15 -0300
From: Luiz Capitulino <lcapitulino@redhat.com>
Subject: Re: [Qemu-devel] Re: [PATCH] Wrong error message in block_passwd
	command
Message-ID: <20100305174115.482dfd64@redhat.com>
In-Reply-To: <m31vfyd8ay.fsf@blackfin.pond.sub.org>
References: <20100305151222.GA21283@redhat.com> <4B9121CF.6020703@redhat.com>
	<20100305154732.GA21444@redhat.com>
	<m31vfyd8ay.fsf@blackfin.pond.sub.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
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: Markus Armbruster <armbru@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>, Shahar Havivi <shaharh@redhat.com>, Dor Laor <dlaor@redhat.com>, qemu-devel@nongnu.org, Luiz@gnu.org, Capitulino <lcapitul@redhat.com>

On Fri, 05 Mar 2010 17:47:49 +0100
Markus Armbruster <armbru@redhat.com> wrote:

> Shahar Havivi <shaharh@redhat.com> writes:
> 
> > 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 } }"
> 
> Would you humor me and keep the error definitions sorted?  Thanks.

 A comment in the file will help.

> PS: Luiz has always put each new error in its own commit, and I followed
> that practice.  Not sure we really care.

 Well, turns out you were the only one to revert some of them :) So, I'm
ok with either way.