testQEMUSchemaLoad: Rename to testQEMUSchemaLoadLatest

It always loads the latest schema. Prepare for loading others as well.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Peter Krempa 2020-05-15 16:21:25 +02:00
parent 78d30aa0bf
commit 18e9806c64
5 changed files with 6 additions and 6 deletions

View File

@ -1056,7 +1056,7 @@ mymain(void)
diskxmljsondata.qemuCaps = caps_x86_64;
imagecreatedata.qemuCaps = caps_x86_64;
if (!(qmp_schema_x86_64 = testQEMUSchemaLoad("x86_64"))) {
if (!(qmp_schema_x86_64 = testQEMUSchemaLoadLatest("x86_64"))) {
ret = -1;
goto cleanup;
}

View File

@ -636,7 +636,7 @@ mymain(void)
if (!(driver.domainEventState = virObjectEventStateNew()))
return EXIT_FAILURE;
if (!(qmpschema = testQEMUSchemaLoad("x86_64"))) {
if (!(qmpschema = testQEMUSchemaLoadLatest("x86_64"))) {
VIR_TEST_VERBOSE("failed to load qapi schema\n");
return EXIT_FAILURE;
}

View File

@ -3124,7 +3124,7 @@ mymain(void)
virEventRegisterDefaultImpl();
if (!(qapiData.schema = testQEMUSchemaLoad("x86_64"))) {
if (!(qapiData.schema = testQEMUSchemaLoadLatest("x86_64"))) {
VIR_TEST_VERBOSE("failed to load qapi schema");
ret = -1;
goto cleanup;
@ -3394,7 +3394,7 @@ mymain(void)
#undef DO_TEST_QUERY_JOBS
virHashFree(qapiData.schema);
if (!(qapiData.schema = testQEMUSchemaLoad("s390x"))) {
if (!(qapiData.schema = testQEMUSchemaLoadLatest("s390x"))) {
VIR_TEST_VERBOSE("failed to load qapi schema for s390x");
ret = -1;
goto cleanup;

View File

@ -661,7 +661,7 @@ testQEMUSchemaGetLatest(const char* arch)
virHashTablePtr
testQEMUSchemaLoad(const char* arch)
testQEMUSchemaLoadLatest(const char *arch)
{
virJSONValuePtr schema;

View File

@ -41,4 +41,4 @@ virJSONValuePtr
testQEMUSchemaGetLatest(const char* arch);
virHashTablePtr
testQEMUSchemaLoad(const char* arch);
testQEMUSchemaLoadLatest(const char *arch);