External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 09:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: qapi: Implement support for 'features'

Browse Source 
Starting from version 4.1 qemu allows reporting 'features' for a given
QAPI type object. This allows reporting support of fixes and additions
which are otherwise invisible in the QAPI schema.

Implement a possibility to query 'features' in the QAPI query strings.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Peter Krempa 2019-04-10 14:52:48 +02:00
parent 4586b11bed
commit 7684e54ee9
1 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/qemu/qemu_qapi.c
View File

@ -109,6 +109,40 @@ virQEMUQAPISchemaTraverse(const char *baseName,
struct virQEMUQAPISchemaTraverseContext *ctxt);
/**
* @featurename: name of 'feature' field to select
* @elem: QAPI JSON entry for a type
*
* Looks for @featurename in the array of 'features' for given type passed in
* via @elem. Returns 1 if @featurename is present, 0 if it's not present
* (or @elem has no 'features') or -2 if the schema is malformed.
* (see virQEMUQAPISchemaTraverseFunc)
*/
static int
virQEMUQAPISchemaTraverseHasObjectFeature(const char *featurename,
virJSONValuePtr elem)
{
virJSONValuePtr featuresarray;
virJSONValuePtr cur;
const char *curstr;
size_t i;
if (!(featuresarray = virJSONValueObjectGetArray(elem, "features")))
return 0;
for (i = 0; i < virJSONValueArraySize(featuresarray); i++) {
if (!(cur = virJSONValueArrayGet(featuresarray, i)) ||
!(curstr = virJSONValueGetString(cur)))
return -2;
if (STREQ(featurename, curstr))
return 1;
}
return 0;
}
static int
virQEMUQAPISchemaTraverseObject(virJSONValuePtr cur,
struct virQEMUQAPISchemaTraverseContext *ctxt)
@ -124,6 +158,13 @@ virQEMUQAPISchemaTraverseObject(virJSONValuePtr cur,
if (modifier == '^' || modifier == '!')
return 0;
if (modifier == '$') {
if (virQEMUQAPISchemaTraverseContextHasNextQuery(ctxt))
return -3;
return virQEMUQAPISchemaTraverseHasObjectFeature(query, cur);
}
if (modifier == '+') {
obj = virQEMUQAPISchemaObjectGet("variants", query, "case", cur);
} else {
@ -339,6 +380,8 @@ virQEMUQAPISchemaTraverse(const char *baseName,
* '!basictype': returns true if previously selected type is of 'basictype'
* JSON type. Spported are 'null', 'string', 'number', 'value',
* 'int' and 'boolean.
* '$feature': returns true if the previously selected type supports 'feature'
* ('feature' is in the 'features' array of given type)
*
* If the name of any (sub)attribute starts with non-alphabetical symbols it
* needs to be prefixed by a single space.