Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nnags-0004Vj-ID for qemu-devel@nongnu.org; Fri, 05 Mar 2010 11:47:54 -0500 Received: from [199.232.76.173] (port=42010 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nnags-0004VO-0B for qemu-devel@nongnu.org; Fri, 05 Mar 2010 11:47:54 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nnagq-0000sk-HC for qemu-devel@nongnu.org; Fri, 05 Mar 2010 11:47:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57440) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nnagq-0000sc-4Y for qemu-devel@nongnu.org; Fri, 05 Mar 2010 11:47:52 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o25GlouB021864 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 5 Mar 2010 11:47:51 -0500 From: Markus Armbruster Subject: Re: [Qemu-devel] Re: [PATCH] Wrong error message in block_passwd command References: <20100305151222.GA21283@redhat.com> <4B9121CF.6020703@redhat.com> <20100305154732.GA21444@redhat.com> Date: Fri, 05 Mar 2010 17:47:49 +0100 In-Reply-To: <20100305154732.GA21444@redhat.com> (Shahar Havivi's message of "Fri, 5 Mar 2010 17:47:33 +0200") Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Shahar Havivi Cc: Kevin Wolf , Luiz Capitulino , Dor Laor , qemu-devel@nongnu.org Shahar Havivi 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. PS: Luiz has always put each new error in its own commit, and I followed that practice. Not sure we really care.