summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuiz Capitulino2009-11-27 01:58:57 +0100
committerAnthony Liguori2009-12-03 16:41:22 +0100
commit4b9d46834de8c75c3cbd5bc1c5f00e35c74e01ed (patch)
treea3997b5fbfc52650d7405a1b5eea13b0f9381c16
parentmonitor: Introduce 'info commands' (diff)
downloadqemu-4b9d46834de8c75c3cbd5bc1c5f00e35c74e01ed.tar.gz
qemu-4b9d46834de8c75c3cbd5bc1c5f00e35c74e01ed.tar.xz
qemu-4b9d46834de8c75c3cbd5bc1c5f00e35c74e01ed.zip
QError: Add errors needed by QMP
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> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--qerror.c24
-rw-r--r--qerror.h18
2 files changed, 42 insertions, 0 deletions
diff --git a/qerror.c b/qerror.c
index d8b125e512..6560996c25 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 6c100afc29..5fd9931463 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 */