[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [FOR 0.12 PATCH 04/18] QError: Put error definitions in alp
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [FOR 0.12 PATCH 04/18] QError: Put error definitions in alphabetical order |
Date: |
Mon, 7 Dec 2009 21:37:02 +0100 |
Also fix the odd typoe and clean up whitespace.
Signed-off-by: Markus Armbruster <address@hidden>
---
qerror.c | 28 ++++++++++++++--------------
qerror.h | 30 +++++++++++++++---------------
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/qerror.c b/qerror.c
index d90529c..03e3b34 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 c9fcf97..062c0c4 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 */
--
1.6.2.5
[Qemu-devel] [FOR 0.12 PATCH 04/18] QError: Put error definitions in alphabetical order,
Markus Armbruster <=
[Qemu-devel] [FOR 0.12 PATCH 09/18] QError: New QERR_SET_PASSWD_FAILED, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 13/18] monitor: convert do_closefd() to QError, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 14/18] QError: New QERR_FD_NOT_SUPPLIED, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 06/18] QError: New QERR_DEVICE_NOT_REMOVABLE, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 01/18] QError: new class for device encrypted errors, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 05/18] QError: New QERR_DEVICE_LOCKED, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 11/18] monitor: convert do_change() to QObject, QError, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 07/18] monitor: convert do_eject() to QError, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 15/18] New QERR_INVALID_PARAMETER, Markus Armbruster, 2009/12/07
[Qemu-devel] [FOR 0.12 PATCH 03/18] monitor: Fix double-prompt after "change vnc passwd BLA", Markus Armbruster, 2009/12/07