vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
master
Luiz Capitulino 2009-11-26 22:58:57 -02:00 committed by Anthony Liguori
parent e3bba9d0dc
commit 4b9d46834d
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qerror.c
View File

@ -40,6 +40,10 @@ static const QType qerror_type = {
* "running out of foo: %(foo)%%" * "running out of foo: %(foo)%%"
*/ */
const QErrorStringTable qerror_table[] = { const QErrorStringTable qerror_table[] = {
{
.error_fmt = QERR_COMMAND_NOT_FOUND,
.desc = "The command %(name) has not been found",
},
{ {
.error_fmt = QERR_DEVICE_NOT_FOUND, .error_fmt = QERR_DEVICE_NOT_FOUND,
.desc = "The %(device) device has not been found", .desc = "The %(device) device has not been found",
@ -48,10 +52,30 @@ const QErrorStringTable qerror_table[] = {
.error_fmt = QERR_DEVICE_NOT_ACTIVE, .error_fmt = QERR_DEVICE_NOT_ACTIVE,
.desc = "The %(device) device has not been activated by the guest", .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, .error_fmt = QERR_KVM_MISSING_CAP,
.desc = "Using KVM without %(capability), %(feature) unavailable", .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",
},
{} {}
}; };

18
qerror.h
View File

@ -38,13 +38,31 @@ QError *qobject_to_qerror(const QObject *obj);
/* /*
* QError class list * QError class list
*/ */
#define QERR_COMMAND_NOT_FOUND \
"{ 'class': 'CommandNotFound', 'data': { 'name': %s } }"
#define QERR_DEVICE_NOT_FOUND \ #define QERR_DEVICE_NOT_FOUND \
"{ 'class': 'DeviceNotFound', 'data': { 'device': %s } }" "{ 'class': 'DeviceNotFound', 'data': { 'device': %s } }"
#define QERR_DEVICE_NOT_ACTIVE \ #define QERR_DEVICE_NOT_ACTIVE \
"{ 'class': 'DeviceNotActive', 'data': { 'device': %s } }" "{ 'class': 'DeviceNotActive', 'data': { 'device': %s } }"
#define QERR_INVALID_PARAMETER_TYPE \
"{ 'class': 'InvalidParameterType', 'data': { 'name': %s,'expected': %s } }"
#define QERR_KVM_MISSING_CAP \ #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 } }"
#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 */ #endif /* QERROR_H */