Re: [Qemu-devel] Re: [PATCH] Wrong error message in block_passwd command

[Luiz Capitulino]

On Fri, 05 Mar 2010 17:47:49 +0100
Markus Armbruster <address@hidden> wrote:

> Shahar Havivi <address@hidden> 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.