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>

diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index 8057d1e2c03733af09d36fa568a7ecb06a5e88ee..0cdedb9ad40db6938b28ad3ed510db40e99804ec 100644 (file)
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -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;
     }

diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 1843e79d77fa3e77ed10f7fc442080e1d35d6e06..ba3fc4d8148a231ab40320bea8a2a08e316d9dcc 100644 (file)
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -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;
     }

diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index a50b157dbcd2f0c2e34dc0ff041c5c10eb258121..6d5a1d5fe2e255bd61bd088cbad5ed4a0aa869bc 100644 (file)
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -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;

diff --git a/tests/testutilsqemuschema.c b/tests/testutilsqemuschema.c
index 4cb2f78d782c406b2a73af7ae7836055847e5f08..a900d8c117965ce1b25475196fcd6bb1e773d954 100644 (file)
--- a/tests/testutilsqemuschema.c
+++ b/tests/testutilsqemuschema.c
@@ -661,7 +661,7 @@ testQEMUSchemaGetLatest(const char* arch)
 
 
 virHashTablePtr
-testQEMUSchemaLoad(const char* arch)
+testQEMUSchemaLoadLatest(const char *arch)
 {
     virJSONValuePtr schema;
 

diff --git a/tests/testutilsqemuschema.h b/tests/testutilsqemuschema.h
index 8b6803afda40e1d1df141c4f22122550cda09bb1..acedb776776cba4bc44ec75c88375c242c15ac91 100644 (file)
--- a/tests/testutilsqemuschema.h
+++ b/tests/testutilsqemuschema.h
@@ -41,4 +41,4 @@ virJSONValuePtr
 testQEMUSchemaGetLatest(const char* arch);
 
 virHashTablePtr
-testQEMUSchemaLoad(const char* arch);
+testQEMUSchemaLoadLatest(const char *arch);