Patchwork [7/9] QError: Introduce QERR_QMP_BAD_INPUT_OBJECT_MEMBER

login
register
mail settings
Submitter Luiz Capitulino
Date June 1, 2010, 8:41 p.m.
Message ID <1275424897-32253-8-git-send-email-lcapitulino@redhat.com>
Download mbox | patch
Permalink /patch/54311/
State New
Headers show

Comments

Luiz Capitulino - June 1, 2010, 8:41 p.m.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 qerror.c |    4 ++++
 qerror.h |    3 +++
 2 files changed, 7 insertions(+), 0 deletions(-)
Markus Armbruster - June 2, 2010, 7:34 a.m.
Luiz Capitulino <lcapitulino@redhat.com> writes:

> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
> ---
>  qerror.c |    4 ++++
>  qerror.h |    3 +++
>  2 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/qerror.c b/qerror.c
> index 44d0bf8..b26224e 100644
> --- a/qerror.c
> +++ b/qerror.c
> @@ -177,6 +177,10 @@ static const QErrorStringTable qerror_table[] = {
>          .desc      = "QMP input object member '%(member)' expects '%(expected)'",
>      },
>      {
> +        .error_fmt = QERR_QMP_INVALID_INPUT_OBJECT_MEMBER,
> +        .desc      = "QMP input object member '%(member)' is invalid",
> +    },
> +    {

"is invalid" can mean pretty much anything.  Let's call it "is
unexpected".  Update item 2. in qmp_check_client_args()'s function
comment, too.

>          .error_fmt = QERR_SET_PASSWD_FAILED,
>          .desc      = "Could not set password",
>      },
> diff --git a/qerror.h b/qerror.h
> index 77ae574..eec9949 100644
> --- a/qerror.h
> +++ b/qerror.h
> @@ -148,6 +148,9 @@ QError *qobject_to_qerror(const QObject *obj);
>  #define QERR_QMP_BAD_INPUT_OBJECT_MEMBER \
>      "{ 'class': 'QMPBadInputObjectMember', 'data': { 'member': %s, 'expected': %s } }"
>  
> +#define QERR_QMP_INVALID_INPUT_OBJECT_MEMBER \
> +    "{ 'class': 'QMPInvalidInputObjectMember', 'data': { 'member': %s } }"
> +
>  #define QERR_SET_PASSWD_FAILED \
>      "{ 'class': 'SetPasswdFailed', 'data': {} }"

Patch

diff --git a/qerror.c b/qerror.c
index 44d0bf8..b26224e 100644
--- a/qerror.c
+++ b/qerror.c
@@ -177,6 +177,10 @@  static const QErrorStringTable qerror_table[] = {
         .desc      = "QMP input object member '%(member)' expects '%(expected)'",
     },
     {
+        .error_fmt = QERR_QMP_INVALID_INPUT_OBJECT_MEMBER,
+        .desc      = "QMP input object member '%(member)' is invalid",
+    },
+    {
         .error_fmt = QERR_SET_PASSWD_FAILED,
         .desc      = "Could not set password",
     },
diff --git a/qerror.h b/qerror.h
index 77ae574..eec9949 100644
--- a/qerror.h
+++ b/qerror.h
@@ -148,6 +148,9 @@  QError *qobject_to_qerror(const QObject *obj);
 #define QERR_QMP_BAD_INPUT_OBJECT_MEMBER \
     "{ 'class': 'QMPBadInputObjectMember', 'data': { 'member': %s, 'expected': %s } }"
 
+#define QERR_QMP_INVALID_INPUT_OBJECT_MEMBER \
+    "{ 'class': 'QMPInvalidInputObjectMember', 'data': { 'member': %s } }"
+
 #define QERR_SET_PASSWD_FAILED \
     "{ 'class': 'SetPasswdFailed', 'data': {} }"