mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-21 05:29:18 +00:00
qemu: qapi: Split up virQEMUQAPISchemaObjectGetType
Split it into a function that returns the whole schema entry so that we can do additional checks and a helper getting the type string from the schema entry. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
parent
cbcee32350
commit
c59734e3f6
@ -32,11 +32,59 @@
|
|||||||
VIR_LOG_INIT("qemu.qemu_qapi");
|
VIR_LOG_INIT("qemu.qemu_qapi");
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* virQEMUQAPISchemaObjectGet:
|
||||||
|
* @field: name of the object containing the requested type
|
||||||
|
* @name: name of the requested type
|
||||||
|
* @namefield: name of the object property holding @name
|
||||||
|
* @elem: QAPI schema entry JSON object
|
||||||
|
*
|
||||||
|
* Helper that selects the type of a QMP schema object member or it's variant
|
||||||
|
* member. Returns the QMP entry on success or NULL on error.
|
||||||
|
*/
|
||||||
|
static virJSONValuePtr
|
||||||
|
virQEMUQAPISchemaObjectGet(const char *field,
|
||||||
|
const char *name,
|
||||||
|
const char *namefield,
|
||||||
|
virJSONValuePtr elem)
|
||||||
|
{
|
||||||
|
virJSONValuePtr arr;
|
||||||
|
virJSONValuePtr cur;
|
||||||
|
const char *curname;
|
||||||
|
size_t i;
|
||||||
|
|
||||||
|
if (!(arr = virJSONValueObjectGetArray(elem, field)))
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
for (i = 0; i < virJSONValueArraySize(arr); i++) {
|
||||||
|
if (!(cur = virJSONValueArrayGet(arr, i)) ||
|
||||||
|
!(curname = virJSONValueObjectGetString(cur, namefield)))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (STREQ(name, curname))
|
||||||
|
return cur;
|
||||||
|
}
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static const char *
|
||||||
|
virQEMUQAPISchemaTypeFromObject(virJSONValuePtr obj)
|
||||||
|
{
|
||||||
|
if (!obj)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
return virJSONValueObjectGetString(obj, "type");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* virQEMUQAPISchemaObjectGetType:
|
* virQEMUQAPISchemaObjectGetType:
|
||||||
* @field: name of the object containing the requested type
|
* @field: name of the object containing the requested type
|
||||||
* @name: name of the requested type
|
* @name: name of the requested type
|
||||||
* @namefield: name of the object property holding @name
|
* @namefield: name of the object property holding @name
|
||||||
|
* @elem: QAPI schema entry JSON object
|
||||||
*
|
*
|
||||||
* Helper that selects the type of a QMP schema object member or it's variant
|
* Helper that selects the type of a QMP schema object member or it's variant
|
||||||
* member. Returns the type string on success or NULL on error.
|
* member. Returns the type string on success or NULL on error.
|
||||||
@ -47,26 +95,9 @@ virQEMUQAPISchemaObjectGetType(const char *field,
|
|||||||
const char *namefield,
|
const char *namefield,
|
||||||
virJSONValuePtr elem)
|
virJSONValuePtr elem)
|
||||||
{
|
{
|
||||||
virJSONValuePtr arr;
|
virJSONValuePtr obj = virQEMUQAPISchemaObjectGet(field, name, namefield, elem);
|
||||||
virJSONValuePtr cur;
|
|
||||||
const char *curname;
|
|
||||||
const char *type;
|
|
||||||
size_t i;
|
|
||||||
|
|
||||||
if (!(arr = virJSONValueObjectGetArray(elem, field)))
|
return virQEMUQAPISchemaTypeFromObject(obj);
|
||||||
return NULL;
|
|
||||||
|
|
||||||
for (i = 0; i < virJSONValueArraySize(arr); i++) {
|
|
||||||
if (!(cur = virJSONValueArrayGet(arr, i)) ||
|
|
||||||
!(curname = virJSONValueObjectGetString(cur, namefield)) ||
|
|
||||||
!(type = virJSONValueObjectGetString(cur, "type")))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (STREQ(name, curname))
|
|
||||||
return type;
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user