summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qerror.c28
-rw-r--r--qerror.h30
2 files changed, 29 insertions, 29 deletions
diff --git a/qerror.c b/qerror.c
index d90529cd49..03e3b34c7d 100644
--- a/qerror.c
+++ b/qerror.c
@@ -41,28 +41,32 @@ static const QType qerror_type = {
*/
static const QErrorStringTable qerror_table[] = {
{
- .error_fmt = QERR_COMMAND_NOT_FOUND,
- .desc = "The command %(name) has not been found",
+ .error_fmt = QERR_COMMAND_NOT_FOUND,
+ .desc = "The command %(name) has not been found",
},
{
.error_fmt = QERR_DEVICE_ENCRYPTED,
.desc = "The %(device) is encrypted",
},
{
+ .error_fmt = QERR_DEVICE_NOT_ACTIVE,
+ .desc = "The %(device) device has not been activated by the guest",
+ },
+ {
.error_fmt = QERR_DEVICE_NOT_FOUND,
.desc = "The %(device) device has not been found",
},
{
- .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_INVALID_PARAMETER_TYPE,
- .desc = "Invalid parameter type, expected: %(expected)",
+ .error_fmt = QERR_INVALID_PASSWORD,
+ .desc = "The entered password is invalid",
},
{
- .error_fmt = QERR_INVALID_PASSWORD,
- .desc = "The entered password is invalid",
+ .error_fmt = QERR_JSON_PARSING,
+ .desc = "Invalid JSON syntax",
},
{
.error_fmt = QERR_KVM_MISSING_CAP,
@@ -77,12 +81,8 @@ static const QErrorStringTable qerror_table[] = {
.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",
+ .error_fmt = QERR_UNDEFINED_ERROR,
+ .desc = "An undefined error has ocurred",
},
{}
};
diff --git a/qerror.h b/qerror.h
index c9fcf973f3..062c0c4093 100644
--- a/qerror.h
+++ b/qerror.h
@@ -39,36 +39,36 @@ QError *qobject_to_qerror(const QObject *obj);
* QError class list
*/
#define QERR_COMMAND_NOT_FOUND \
- "{ 'class': 'CommandNotFound', 'data': { 'name': %s } }"
+ "{ 'class': 'CommandNotFound', 'data': { 'name': %s } }"
#define QERR_DEVICE_ENCRYPTED \
- "{ 'class': 'DeviceEncrypted', 'data': { 'device': %s } }"
-
-#define QERR_DEVICE_NOT_FOUND \
- "{ 'class': 'DeviceNotFound', 'data': { 'device': %s } }"
+ "{ 'class': 'DeviceEncrypted', 'data': { 'device': %s } }"
#define QERR_DEVICE_NOT_ACTIVE \
- "{ 'class': 'DeviceNotActive', 'data': { 'device': %s } }"
+ "{ 'class': 'DeviceNotActive', 'data': { 'device': %s } }"
+
+#define QERR_DEVICE_NOT_FOUND \
+ "{ 'class': 'DeviceNotFound', 'data': { 'device': %s } }"
#define QERR_INVALID_PARAMETER_TYPE \
- "{ 'class': 'InvalidParameterType', 'data': { 'name': %s,'expected': %s } }"
+ "{ 'class': 'InvalidParameterType', 'data': { 'name': %s,'expected': %s } }"
#define QERR_INVALID_PASSWORD \
- "{ 'class': 'InvalidPassword', 'data': {} }"
+ "{ 'class': 'InvalidPassword', 'data': {} }"
+
+#define QERR_JSON_PARSING \
+ "{ 'class': 'JSONParsing', 'data': {} }"
#define QERR_KVM_MISSING_CAP \
- "{ 'class': 'KVMMissingCap', 'data': { 'capability': %s, 'feature': %s } }"
+ "{ 'class': 'KVMMissingCap', 'data': { 'capability': %s, 'feature': %s } }"
#define QERR_MISSING_PARAMETER \
- "{ 'class': 'MissingParameter', 'data': { 'name': %s } }"
+ "{ 'class': 'MissingParameter', 'data': { 'name': %s } }"
#define QERR_QMP_BAD_INPUT_OBJECT \
- "{ 'class': 'QMPBadInputObject', 'data': { 'expected': %s } }"
-
-#define QERR_JSON_PARSING \
- "{ 'class': 'JSONParsing', 'data': {} }"
+ "{ 'class': 'QMPBadInputObject', 'data': { 'expected': %s } }"
#define QERR_UNDEFINED_ERROR \
- "{ 'class': 'UndefinedError', 'data': {} }"
+ "{ 'class': 'UndefinedError', 'data': {} }"
#endif /* QERROR_H */