yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 09:55:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: return a 'missing parameter' error

Browse source 
The 'old' dispatch code returned a QERR_MISSING_PARAMETER for missing
parameters, but the qapi qmp_dispatch() code uses
QERR_INVALID_PARAMETER_TYPE.

Improve qapi code to return QERR_MISSING_PARAMETER where
appropriate.

Fix expected error message in iotests.

Backports commit 1382d4abdf9619985e4078e37e49e487cea9935e from qemu
This commit is contained in:
Marc-André Lureau 2018-02-26 05:19:50 -05:00 committed by Lioncash
parent ddc25c8aaf
commit be6e25bcc7
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 48 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
qemu/qapi/qmp-input-visitor.c
View file

@ -55,7 +55,7 @@ static QmpInputVisitor *to_qiv(Visitor *v)
static QObject *qmp_input_get_object(QmpInputVisitor *qiv, static QObject *qmp_input_get_object(QmpInputVisitor *qiv,
const char *name, const char *name,
bool consume) bool consume, Error **errp)
{ {
StackObject *tos; StackObject *tos;
QObject *qobj; QObject *qobj;
@ -79,6 +79,9 @@ static QObject *qmp_input_get_object(QmpInputVisitor *qiv,
bool removed = g_hash_table_remove(tos->h, name); bool removed = g_hash_table_remove(tos->h, name);
assert(removed); assert(removed);
} }
if (!ret) {
error_setg(errp, QERR_MISSING_PARAMETER, name);
}
} else { } else {
assert(qobject_type(qobj) == QTYPE_QLIST); assert(qobject_type(qobj) == QTYPE_QLIST);
assert(!name); assert(!name);
@ -170,13 +173,16 @@ static void qmp_input_start_struct(Visitor *v, const char *name, void **obj,
size_t size, Error **errp) size_t size, Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QmpInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, false); QObject *qobj = qmp_input_get_object(qiv, name, true, errp);
Error *err = NULL; Error *err = NULL;
if (obj) { if (obj) {
*obj = NULL; *obj = NULL;
} }
if (!qobj || qobject_type(qobj) != QTYPE_QDICT) { if (!qobj) {
return;
}
if (qobject_type(qobj) != QTYPE_QDICT) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null", error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"QDict"); "QDict");
return; return;
@ -197,10 +203,13 @@ static void qmp_input_start_list(Visitor *v, const char *name,
GenericList **list, size_t size, Error **errp) GenericList **list, size_t size, Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QmpInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true); QObject *qobj = qmp_input_get_object(qiv, name, true, errp);
const QListEntry *entry; const QListEntry *entry;
if (!qobj || qobject_type(qobj) != QTYPE_QLIST) { if (!qobj) {
return;
}
if (qobject_type(qobj) != QTYPE_QLIST) {
if (list) { if (list) {
*list = NULL; *list = NULL;
} }
@ -237,11 +246,10 @@ static void qmp_input_start_alternate(Visitor *v, const char *name,
bool promote_int, Error **errp) bool promote_int, Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QmpInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, false); QObject *qobj = qmp_input_get_object(qiv, name, false, errp);
if (!qobj) { if (!qobj) {
*obj = NULL; *obj = NULL;
error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
return; return;
} }
*obj = g_malloc0(size); *obj = g_malloc0(size);
@ -255,8 +263,13 @@ static void qmp_input_type_int64(Visitor *v, const char *name, int64_t *obj,
Error **errp) Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QmpInputVisitor *qiv = to_qiv(v);
QInt *qint = qobject_to_qint(qmp_input_get_object(qiv, name, true)); QObject *qobj = qmp_input_get_object(qiv, name, true, errp);
QInt *qint;
if (!qobj) {
return;
}
qint = qobject_to_qint(qobj);
if (!qint) { if (!qint) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null", error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"integer"); "integer");
@ -271,8 +284,13 @@ static void qmp_input_type_uint64(Visitor *v, const char *name, uint64_t *obj,
{ {
/* FIXME: qobject_to_qint mishandles values over INT64_MAX */ /* FIXME: qobject_to_qint mishandles values over INT64_MAX */
QmpInputVisitor *qiv = to_qiv(v); QmpInputVisitor *qiv = to_qiv(v);
QInt *qint = qobject_to_qint(qmp_input_get_object(qiv, name, true)); QObject *qobj = qmp_input_get_object(qiv, name, true, errp);
QInt *qint;
if (!qobj) {
return;
}
qint = qobject_to_qint(qobj);
if (!qint) { if (!qint) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null", error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"integer"); "integer");
@ -286,8 +304,13 @@ static void qmp_input_type_bool(Visitor *v, const char *name, bool *obj,
Error **errp) Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QmpInputVisitor *qiv = to_qiv(v);
QBool *qbool = qobject_to_qbool(qmp_input_get_object(qiv, name, true)); QObject *qobj = qmp_input_get_object(qiv, name, true, errp);
QBool *qbool;
if (!qobj) {
return;
}
qbool = qobject_to_qbool(qobj);
if (!qbool) { if (!qbool) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null", error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"boolean"); "boolean");
@ -301,10 +324,15 @@ static void qmp_input_type_str(Visitor *v, const char *name, char **obj,
Error **errp) Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QmpInputVisitor *qiv = to_qiv(v);
QString *qstr = qobject_to_qstring(qmp_input_get_object(qiv, name, true)); QObject *qobj = qmp_input_get_object(qiv, name, true, errp);
QString *qstr;
if (!qstr) {
*obj = NULL; *obj = NULL;
if (!qobj) {
return;
}
qstr = qobject_to_qstring(qobj);
if (!qstr) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null", error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"string"); "string");
return; return;
@ -317,10 +345,13 @@ static void qmp_input_type_number(Visitor *v, const char *name, double *obj,
Error **errp) Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QmpInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true); QObject *qobj = qmp_input_get_object(qiv, name, true, errp);
QInt *qint; QInt *qint;
QFloat *qfloat; QFloat *qfloat;
if (!qobj) {
return;
}
qint = qobject_to_qint(qobj); qint = qobject_to_qint(qobj);
if (qint) { if (qint) {
*obj = qint_get_int(qobject_to_qint(qobj)); *obj = qint_get_int(qobject_to_qint(qobj));
@ -341,11 +372,10 @@ static void qmp_input_type_any(Visitor *v, const char *name, QObject **obj,
Error **errp) Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QmpInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true); QObject *qobj = qmp_input_get_object(qiv, name, true, errp);
if (!qobj) {
error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
*obj = NULL; *obj = NULL;
if (!qobj) {
return; return;
} }
@ -356,10 +386,9 @@ static void qmp_input_type_any(Visitor *v, const char *name, QObject **obj,
static void qmp_input_type_null(Visitor *v, const char *name, Error **errp) static void qmp_input_type_null(Visitor *v, const char *name, Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QmpInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true); QObject *qobj = qmp_input_get_object(qiv, name, true, errp);
if (!qobj) { if (!qobj) {
error_setg(errp, QERR_MISSING_PARAMETER, name ? name : "null");
return; return;
} }
@ -372,7 +401,7 @@ static void qmp_input_type_null(Visitor *v, const char *name, Error **errp)
static void qmp_input_optional(Visitor *v, const char *name, bool *present) static void qmp_input_optional(Visitor *v, const char *name, bool *present)
{ {
QmpInputVisitor *qiv = to_qiv(v); QmpInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true); QObject *qobj = qmp_input_get_object(qiv, name, false, NULL);
if (!qobj) { if (!qobj) {
*present = false; *present = false;