External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

testutilsqemuschema: Rename and document 'testQEMUSchemaValidateDeprecated'

Browse Source 
Upcoming patch will add more features we care to check. Rename the
function to 'testQEMUSchemaValidateFeatures'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2024-09-24 15:36:12 +02:00
parent f05488f78c
commit 7203b7df6b
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/testutilsqemuschema.c
View File

@ -29,8 +29,12 @@ struct testQEMUSchemaValidateCtxt {
}; };
/**
* Validate that the schema member doesn't have some significant features:
* - 'deprecated' - schema member is deprecated
*/
static int static int
testQEMUSchemaValidateDeprecated(virJSONValue *root, testQEMUSchemaValidateFeatures(virJSONValue *root,
const char *name, const char *name,
struct testQEMUSchemaValidateCtxt *ctxt) struct testQEMUSchemaValidateCtxt *ctxt)
{ {
@ -187,8 +191,8 @@ testQEMUSchemaValidateObjectMember(const char *key,
return -1; return -1;
} }
/* validate that the member is not deprecated */ /* validate that the member doesn't have some of the significant features */
if ((rc = testQEMUSchemaValidateDeprecated(keymember, key, data->ctxt)) < 0) if ((rc = testQEMUSchemaValidateFeatures(keymember, key, data->ctxt)) < 0)
return rc; return rc;
/* lookup schema entry for keytype */ /* lookup schema entry for keytype */
@ -387,8 +391,8 @@ testQEMUSchemaValidateEnum(virJSONValue *obj,
if (STREQ_NULLABLE(objstr, virJSONValueObjectGetString(member, "name"))) { if (STREQ_NULLABLE(objstr, virJSONValueObjectGetString(member, "name"))) {
int rc; int rc;
/* the new 'members' array allows us to check deprecations */ /* the new 'members' array allows us to check features */
if ((rc = testQEMUSchemaValidateDeprecated(member, objstr, ctxt)) < 0) if ((rc = testQEMUSchemaValidateFeatures(member, objstr, ctxt)) < 0)
return rc; return rc;
virBufferAsprintf(ctxt->debug, "'%s' OK", NULLSTR(objstr)); virBufferAsprintf(ctxt->debug, "'%s' OK", NULLSTR(objstr));
@ -526,7 +530,7 @@ testQEMUSchemaValidateRecurse(virJSONValue *obj,
const char *t = virJSONValueObjectGetString(root, "meta-type"); const char *t = virJSONValueObjectGetString(root, "meta-type");
int rc; int rc;
if ((rc = testQEMUSchemaValidateDeprecated(root, n, ctxt)) < 0) if ((rc = testQEMUSchemaValidateFeatures(root, n, ctxt)) < 0)
return rc; return rc;
if (STREQ_NULLABLE(t, "builtin")) { if (STREQ_NULLABLE(t, "builtin")) {
@ -626,7 +630,7 @@ testQEMUSchemaValidateCommand(const char *command,
return -1; return -1;
} }
if ((rc = testQEMUSchemaValidateDeprecated(schemarootcommand, command, &ctxt)) < 0) if ((rc = testQEMUSchemaValidateFeatures(schemarootcommand, command, &ctxt)) < 0)
return rc; return rc;
if (!arguments) if (!arguments)