From: Luiz Capitulino <lcapitulino@redhat.com>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com, avi@redhat.com, armbru@redhat.com
Subject: [Qemu-devel] [PATCH 07/20] QError: Add errors needed by QMP
Date: Thu, 26 Nov 2009 22:58:57 -0200 [thread overview]
Message-ID: <1259283550-3597-8-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1259283550-3597-1-git-send-email-lcapitulino@redhat.com>
Only QERR_QMP_BAD_INPUT_OBJECT is QMP specific, the others can
be used in different contexts by other subsystems.
Please, note that QERR_JSON_PARSING signals any parsing error
from the json parser. We will need it until the parser gets
updated to use QError.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
qerror.c | 24 ++++++++++++++++++++++++
qerror.h | 18 ++++++++++++++++++
2 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/qerror.c b/qerror.c
index d8b125e..6560996 100644
--- a/qerror.c
+++ b/qerror.c
@@ -41,6 +41,10 @@ static const QType qerror_type = {
*/
const QErrorStringTable qerror_table[] = {
{
+ .error_fmt = QERR_COMMAND_NOT_FOUND,
+ .desc = "The command %(name) has not been found",
+ },
+ {
.error_fmt = QERR_DEVICE_NOT_FOUND,
.desc = "The %(device) device has not been found",
},
@@ -49,9 +53,29 @@ const QErrorStringTable qerror_table[] = {
.desc = "The %(device) device has not been activated by the guest",
},
{
+ .error_fmt = QERR_INVALID_PARAMETER_TYPE,
+ .desc = "Invalid parameter type, expected: %(expected)",
+ },
+ {
.error_fmt = QERR_KVM_MISSING_CAP,
.desc = "Using KVM without %(capability), %(feature) unavailable",
},
+ {
+ .error_fmt = QERR_MISSING_PARAMETER,
+ .desc = "Parameter %(name) is missing",
+ },
+ {
+ .error_fmt = QERR_QMP_BAD_INPUT_OBJECT,
+ .desc = "Bad QMP input object",
+ },
+ {
+ .error_fmt = QERR_JSON_PARSING,
+ .desc = "Invalid JSON synaxt",
+ },
+ {
+ .error_fmt = QERR_UNDEFINED_ERROR,
+ .desc = "An undefined error has ocurred",
+ },
{}
};
diff --git a/qerror.h b/qerror.h
index 6c100af..5fd9931 100644
--- a/qerror.h
+++ b/qerror.h
@@ -38,13 +38,31 @@ QError *qobject_to_qerror(const QObject *obj);
/*
* QError class list
*/
+#define QERR_COMMAND_NOT_FOUND \
+ "{ 'class': 'CommandNotFound', 'data': { 'name': %s } }"
+
#define QERR_DEVICE_NOT_FOUND \
"{ 'class': 'DeviceNotFound', 'data': { 'device': %s } }"
#define QERR_DEVICE_NOT_ACTIVE \
"{ 'class': 'DeviceNotActive', 'data': { 'device': %s } }"
+#define QERR_INVALID_PARAMETER_TYPE \
+ "{ 'class': 'InvalidParameterType', 'data': { 'name': %s,'expected': %s } }"
+
#define QERR_KVM_MISSING_CAP \
"{ 'class': 'KVMMissingCap', 'data': { 'capability': %s, 'feature': %s } }"
+#define QERR_MISSING_PARAMETER \
+ "{ 'class': 'MissingParameter', 'data': { 'name': %s } }"
+
+#define QERR_QMP_BAD_INPUT_OBJECT \
+ "{ 'class': 'QMPBadInputObject', 'data': { 'expected': %s } }"
+
+#define QERR_JSON_PARSING \
+ "{ 'class': 'JSONParsing', 'data': {} }"
+
+#define QERR_UNDEFINED_ERROR \
+ "{ 'class': 'UndefinedError', 'data': {} }"
+
#endif /* QERROR_H */
--
1.6.6.rc0.50.gaf06e
next prev parent reply other threads:[~2009-11-27 0:59 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-27 0:58 [Qemu-devel] [PATCH v1 00/20] QEMU Monitor Protocol Luiz Capitulino
2009-11-27 0:58 ` [Qemu-devel] [PATCH 01/20] monitor: Introduce MONITOR_USE_CONTROL flag Luiz Capitulino
2009-11-27 0:58 ` [Qemu-devel] [PATCH 02/20] monitor: Command-line flag to enable control mode Luiz Capitulino
2009-11-27 0:58 ` [Qemu-devel] [PATCH 03/20] monitor: Introduce monitor_call_handler() Luiz Capitulino
2009-11-27 0:58 ` [Qemu-devel] [PATCH 04/20] monitor: Introduce monitor_find_command() Luiz Capitulino
2009-11-27 0:58 ` [Qemu-devel] [PATCH 05/20] monitor: Rename monitor_handle_command() Luiz Capitulino
2009-11-27 0:58 ` [Qemu-devel] [PATCH 06/20] monitor: Introduce 'info commands' Luiz Capitulino
2009-11-27 0:58 ` Luiz Capitulino [this message]
2009-11-27 0:58 ` [Qemu-devel] [PATCH 08/20] QMP: Initial support Luiz Capitulino
2009-11-27 0:58 ` [Qemu-devel] [PATCH 09/20] QMP: Output support Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 10/20] QMP: do_info() checks Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 11/20] QMP: Input support Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 12/20] QMP: Allow 'query-' commands Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 13/20] QMP: Asynchronous events infrastructure Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 14/20] QMP: Introduce basic asynchronous events Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 15/20] QMP: Disable monitor print functions Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 16/20] QMP: Introduce README file Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 17/20] QMP: Introduce specification Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 18/20] QMP: Introduce qmp-events.txt Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 19/20] QMP: Introduce qmp-shell Luiz Capitulino
2009-11-27 0:59 ` [Qemu-devel] [PATCH 20/20] QMP: Introduce vm-info Luiz Capitulino
2009-12-01 11:38 ` [Qemu-devel] [PATCH v1 00/20] QEMU Monitor Protocol Daniel P. Berrange
2009-12-01 12:53 ` Luiz Capitulino
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1259283550-3597-8-git-send-email-lcapitulino@redhat.com \
--to=lcapitulino@redhat.com \
--cc=aliguori@us.ibm.com \
--cc=armbru@redhat.com \
--cc=avi@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).