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

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 tests/qemublocktest.c       | 2 +-
 tests/qemuhotplugtest.c     | 2 +-
 tests/qemumonitorjsontest.c | 4 ++--
 tests/testutilsqemuschema.c | 2 +-
 tests/testutilsqemuschema.h | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index 8057d1e2c0..0cdedb9ad4 100644
--- 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 1843e79d77..ba3fc4d814 100644
--- 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 a50b157dbc..6d5a1d5fe2 100644
--- 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 898be68b0a..060a5d7054 100644
--- 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 8b6803afda..acedb77677 100644
--- 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);
-- 
2.26.2

On 5/15/20 10:28 AM, Peter Krempa wrote:
> It always loads the latest schema. Prepare for loading others as well.
> 
> Signed-off-by: Peter Krempa <pkrempa@redhat.com>
> ---
>   tests/qemublocktest.c       | 2 +-
>   tests/qemuhotplugtest.c     | 2 +-
>   tests/qemumonitorjsontest.c | 4 ++--
>   tests/testutilsqemuschema.c | 2 +-
>   tests/testutilsqemuschema.h | 2 +-
>   5 files changed, 6 insertions(+), 6 deletions(-)
> 
Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org