shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 06:50:22 +03:00
Code Releases Activity

qemu: qapi: Separate virQEMUQAPISchemaTraverse into functions by object type

Browse Source 
Simplify virQEMUQAPISchemaTraverse by separating out the necessary
operations for given 'meta-type' into separate functions.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-04-10 14:14:10 +02:00
parent 5ded7590d1
commit 8af5d6bd7c
1 changed files with 78 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
src/qemu/qemu_qapi.c
View File

@ -101,72 +101,111 @@ virQEMUQAPISchemaObjectGetType(const char *field,
}
static int
virQEMUQAPISchemaTraverse(const char *baseName,
char **query,
virHashTablePtr schema,
virJSONValuePtr *type);
static int
virQEMUQAPISchemaTraverseObject(virJSONValuePtr cur,
char **query,
virHashTablePtr schema,
virJSONValuePtr *type)
{
virJSONValuePtr obj;
const char *querytype = NULL;
const char *querystr = *query;
char modifier = *querystr;
if (!c_isalpha(modifier))
querystr++;
if (modifier == '+') {
querytype = virQEMUQAPISchemaObjectGetType("variants",
querystr,
"case", cur);
} else {
obj = virQEMUQAPISchemaObjectGet("members", querystr, "name", cur);
if (modifier == '*' &&
!virJSONValueObjectHasKey(obj, "default"))
return 0;
querytype = virQEMUQAPISchemaTypeFromObject(obj);
}
return virQEMUQAPISchemaTraverse(querytype, query + 1, schema, type);
}
static int
virQEMUQAPISchemaTraverseArray(virJSONValuePtr cur,
char **query,
virHashTablePtr schema,
virJSONValuePtr *type)
{
const char *querytype;
/* arrays are just flattened by default */
if (!(querytype = virJSONValueObjectGetString(cur, "element-type")))
return 0;
return virQEMUQAPISchemaTraverse(querytype, query, schema, type);
}
static int
virQEMUQAPISchemaTraverseCommand(virJSONValuePtr cur,
char **query,
virHashTablePtr schema,
virJSONValuePtr *type)
{
const char *querytype;
if (!(querytype = virJSONValueObjectGetString(cur, *query)))
return 0;
return virQEMUQAPISchemaTraverse(querytype, query + 1, schema, type);
}
static int
virQEMUQAPISchemaTraverse(const char *baseName,
char **query,
virHashTablePtr schema,
virJSONValuePtr *type)
{
virJSONValuePtr curtype;
virJSONValuePtr obj;
virJSONValuePtr cur;
const char *metatype;
const char *querytype = NULL;
const char *querystr;
char modifier;
if (!(curtype = virHashLookup(schema, baseName)))
if (!(cur = virHashLookup(schema, baseName)))
return 0;
if (!*query) {
if (type)
*type = curtype;
*type = cur;
return 1;
}
if (!(metatype = virJSONValueObjectGetString(curtype, "meta-type")))
if (!(metatype = virJSONValueObjectGetString(cur, "meta-type")))
return 0;
/* flatten arrays by default */
if (STREQ(metatype, "array")) {
if (!(querytype = virJSONValueObjectGetString(curtype, "element-type")))
return 0;
return virQEMUQAPISchemaTraverseArray(cur, query, schema, type);
} else if (STREQ(metatype, "object")) {
querystr = *query;
modifier = **query;
if (!c_isalpha(modifier))
querystr++;
if (modifier == '+') {
querytype = virQEMUQAPISchemaObjectGetType("variants",
querystr,
"case", curtype);
} else {
obj = virQEMUQAPISchemaObjectGet("members", querystr,
"name", curtype);
if (modifier == '*' &&
!virJSONValueObjectHasKey(obj, "default"))
return 0;
querytype = virQEMUQAPISchemaTypeFromObject(obj);
}
query++;
return virQEMUQAPISchemaTraverseObject(cur, query, schema, type);
} else if (STREQ(metatype, "command") ||
STREQ(metatype, "event")) {
if (!(querytype = virJSONValueObjectGetString(curtype, *query)))
return 0;
query++;
return virQEMUQAPISchemaTraverseCommand(cur, query, schema, type);
} else {
/* alternates, basic types and enums can't be entered */
return 0;
}
if (!querytype)
return 0;
return virQEMUQAPISchemaTraverse(querytype, query, schema, type);
return 0;
}