1:31 p.m.
Change the prefix of the functions to 'virQEMUQapi' and rename the two
public APIs so that the verb is put last.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 4 ++--
src/qemu/qemu_qapi.c | 36 ++++++++++++++++++------------------
src/qemu/qemu_qapi.h | 10 +++++-----
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 7801c9b33c..a6170c66f2 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1833,7 +1833,7 @@ static struct virQEMUCapsStringFlags
virQEMUCapsObjectPropsIntelIOMMU[] = {
{ "device-iotlb", QEMU_CAPS_INTEL_IOMMU_DEVICE_IOTLB },
};
-/* see documentation for virQEMUCapsQMPSchemaGetByPath for the query format */
+/* see documentation for virQEMUQapiSchemaPathGet for the query format */
static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
{ "blockdev-add/arg-type/options/+gluster/debug-level",
QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
{ "blockdev-add/arg-type/+gluster/debug", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
@@ -4579,7 +4579,7 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCapsPtr qemuCaps,
for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsQMPSchemaQueries); i++) {
entry = virQEMUCapsQMPSchemaQueries + i;
- if (virQEMUCapsQMPSchemaQueryPath(entry->value, schema))
+ if (virQEMUQapiSchemaPathExists(entry->value, schema))
virQEMUCapsSet(qemuCaps, entry->flag);
}
diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c
index 2646afeee2..0a18764ac1 100644
--- a/src/qemu/qemu_qapi.c
+++ b/src/qemu/qemu_qapi.c
@@ -31,7 +31,7 @@ VIR_LOG_INIT("qemu.qemu_qapi");
/**
- * virQEMUCapsQMPSchemaObjectGetType:
+ * virQEMUQapiSchemaObjectGetType:
* @field: name of the object containing the requested type
* @name: name of the requested type
* @namefield: name of the object property holding @name
@@ -40,10 +40,10 @@ VIR_LOG_INIT("qemu.qemu_qapi");
* member. Returns the type string on success or NULL on error.
*/
static const char *
-virQEMUCapsQMPSchemaObjectGetType(const char *field,
- const char *name,
- const char *namefield,
- virJSONValuePtr elem)
+virQEMUQapiSchemaObjectGetType(const char *field,
+ const char *name,
+ const char *namefield,
+ virJSONValuePtr elem)
{
virJSONValuePtr arr;
virJSONValuePtr cur;
@@ -69,9 +69,9 @@ virQEMUCapsQMPSchemaObjectGetType(const char *field,
static virJSONValuePtr
-virQEMUCapsQMPSchemaTraverse(const char *baseName,
- char **query,
- virHashTablePtr schema)
+virQEMUQapiSchemaTraverse(const char *baseName,
+ char **query,
+ virHashTablePtr schema)
{
virJSONValuePtr base;
const char *metatype;
@@ -94,11 +94,11 @@ virQEMUCapsQMPSchemaTraverse(const char *baseName,
continue;
} else if (STREQ(metatype, "object")) {
if (**query == '+')
- baseName = virQEMUCapsQMPSchemaObjectGetType("variants",
+ baseName = virQEMUQapiSchemaObjectGetType("variants",
*query + 1,
"case", base);
else
- baseName = virQEMUCapsQMPSchemaObjectGetType("members",
+ baseName = virQEMUQapiSchemaObjectGetType("members",
*query,
"name", base);
@@ -121,7 +121,7 @@ virQEMUCapsQMPSchemaTraverse(const char *baseName,
/**
- * virQEMUCapsQMPSchemaGetByPath:
+ * virQEMUQapiSchemaPathGet:
* @query: string specifying the required data type (see below)
* @schema: hash table containing the schema data
* @entry: filled with the located schema object requested by @query
@@ -150,9 +150,9 @@ virQEMUCapsQMPSchemaTraverse(const char *baseName,
* error message.
*/
int
-virQEMUCapsQMPSchemaGetByPath(const char *query,
- virHashTablePtr schema,
- virJSONValuePtr *entry)
+virQEMUQapiSchemaPathGet(const char *query,
+ virHashTablePtr schema,
+ virJSONValuePtr *entry)
{
char **elems = NULL;
@@ -167,7 +167,7 @@ virQEMUCapsQMPSchemaGetByPath(const char *query,
return -1;
}
- *entry = virQEMUCapsQMPSchemaTraverse(*elems, elems + 1, schema);
+ *entry = virQEMUQapiSchemaTraverse(*elems, elems + 1, schema);
virStringListFree(elems);
return 0;
@@ -175,12 +175,12 @@ virQEMUCapsQMPSchemaGetByPath(const char *query,
bool
-virQEMUCapsQMPSchemaQueryPath(const char *query,
- virHashTablePtr schema)
+virQEMUQapiSchemaPathExists(const char *query,
+ virHashTablePtr schema)
{
virJSONValuePtr entry;
- if (virQEMUCapsQMPSchemaGetByPath(query, schema, &entry))
+ if (virQEMUQapiSchemaPathGet(query, schema, &entry))
return false;
return !!entry;
diff --git a/src/qemu/qemu_qapi.h b/src/qemu/qemu_qapi.h
index 413d0629b5..7b5546eefe 100644
--- a/src/qemu/qemu_qapi.h
+++ b/src/qemu/qemu_qapi.h
@@ -25,12 +25,12 @@
# include "virjson.h"
int
-virQEMUCapsQMPSchemaGetByPath(const char *query,
- virHashTablePtr schema,
- virJSONValuePtr *entry);
+virQEMUQapiSchemaPathGet(const char *query,
+ virHashTablePtr schema,
+ virJSONValuePtr *entry);
bool
-virQEMUCapsQMPSchemaQueryPath(const char *query,
- virHashTablePtr schema);
+virQEMUQapiSchemaPathExists(const char *query,
+ virHashTablePtr schema);
#endif /* __QEMU_QAPI_H__ */
--
2.16.2