72 lines
2.6 KiB
Diff
72 lines
2.6 KiB
Diff
|
From fbeabd58626de924d59891338dade4f56044a3cc Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <fbeabd58626de924d59891338dade4f56044a3cc@dist-git>
|
||
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Date: Mon, 16 Mar 2020 22:12:10 +0100
|
||
|
|
Subject: [PATCH] qemublocktest: Extract schema root for blockdev-add
|
||
|
|
validation
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Move lookup of the schema root earlier so that multiple functions
|
||
|
|
can use it for validation.
|
||
|
|
|
||
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
(cherry picked from commit 218ce53069b730daa508a4a67d8640b415d69b4e)
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1804750
|
||
|
|
Message-Id: <9f33cec13b55e431b1144042ddcbeb7afefcf969.1584391727.git.pkrempa@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
---
|
||
|
|
tests/qemublocktest.c | 20 +++++++++++---------
|
||
|
|
1 file changed, 11 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
|
||
|
|
index f805265c93..94f20eeb47 100644
|
||
|
|
--- a/tests/qemublocktest.c
|
||
|
|
+++ b/tests/qemublocktest.c
|
||
|
|
@@ -864,6 +864,7 @@ mymain(void)
|
||
|
|
char *capslatest_x86_64 = NULL;
|
||
|
|
virQEMUCapsPtr caps_x86_64 = NULL;
|
||
|
|
g_autoptr(virHashTable) qmp_schema_x86_64 = NULL;
|
||
|
|
+ virJSONValuePtr qmp_schemaroot_x86_64_blockdev_add = NULL;
|
||
|
|
g_autoptr(virStorageSource) bitmapSourceChain = NULL;
|
||
|
|
|
||
|
|
if (qemuTestDriverInit(&driver) < 0)
|
||
|
|
@@ -891,6 +892,15 @@ mymain(void)
|
||
|
|
goto cleanup;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (virQEMUQAPISchemaPathGet("blockdev-add/arg-type",
|
||
|
|
+ qmp_schema_x86_64,
|
||
|
|
+ &qmp_schemaroot_x86_64_blockdev_add) < 0 ||
|
||
|
|
+ !qmp_schemaroot_x86_64_blockdev_add) {
|
||
|
|
+ VIR_TEST_VERBOSE("failed to find schema entry for blockdev-add");
|
||
|
|
+ ret = -1;
|
||
|
|
+ goto cleanup;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
virTestCounterReset("qemu storage source xml->json->xml ");
|
||
|
|
|
||
|
|
#define TEST_JSON_FORMAT(tpe, xmlstr) \
|
||
|
|
@@ -990,15 +1000,7 @@ mymain(void)
|
||
|
|
#define TEST_DISK_TO_JSON(nme) TEST_DISK_TO_JSON_FULL(nme, false)
|
||
|
|
|
||
|
|
diskxmljsondata.schema = qmp_schema_x86_64;
|
||
|
|
-
|
||
|
|
- if (virQEMUQAPISchemaPathGet("blockdev-add/arg-type",
|
||
|
|
- diskxmljsondata.schema,
|
||
|
|
- &diskxmljsondata.schemaroot) < 0 ||
|
||
|
|
- !diskxmljsondata.schemaroot) {
|
||
|
|
- VIR_TEST_VERBOSE("failed to find schema entry for blockdev-add");
|
||
|
|
- ret = -1;
|
||
|
|
- goto cleanup;
|
||
|
|
- }
|
||
|
|
+ diskxmljsondata.schemaroot = qmp_schemaroot_x86_64_blockdev_add;
|
||
|
|
|
||
|
|
TEST_DISK_TO_JSON_FULL("nodename-long-format", true);
|
||
|
|
TEST_DISK_TO_JSON_FULL("nodename-long-protocol", true);
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|