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 <[email protected]>
Signed-off-by: Anthony Liguori <[email protected]>

diff --git a/qerror.c b/qerror.c
index d8b125e51233ebc06575a0787530100ebe29c78e..6560996c255d92d0ebe5c5bbdc23021c36dfcd30 100644 (file)
--- a/qerror.c
+++ b/qerror.c
@@ -40,6 +40,10 @@ static const QType qerror_type = {
  * "running out of foo: %(foo)%%"
  */
 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",
@@ -48,10 +52,30 @@ const QErrorStringTable qerror_table[] = {
         .error_fmt = QERR_DEVICE_NOT_ACTIVE,
         .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 6c100afc29a1a527b619c5eba99384aa279fa2af..5fd993146336b3cb3b15c15507066071ab68cd55 100644 (file)
--- 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 */