External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-01 20:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemumonitorjsontest: load schema based on specified arch

Browse Source 
There are some architectures that support capabilities that others
do not (e.g. s390x supports cpu comparison and baseline via QEMU).

Let's make testQEMUSchemaLoad accept a string to specify the schema
to load based on the specified arch.

Signed-off-by: Collin Walling <walling@linux.ibm.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Collin Walling 2020-02-20 17:01:46 -05:00 committed by Michal Privoznik
parent c312c8998c
commit 6523a7ea5d
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemublocktest.c
View File

@ -981,7 +981,7 @@ mymain(void)
#define TEST_DISK_TO_JSON(nme) TEST_DISK_TO_JSON_FULL(nme, false)
if (!(diskxmljsondata.schema = testQEMUSchemaLoad())) {
if (!(diskxmljsondata.schema = testQEMUSchemaLoad("x86_64"))) {
ret = -1;
goto cleanup;
}

2
tests/qemuhotplugtest.c
View File

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

4
tests/qemumonitorjsontest.c
View File

@ -2995,7 +2995,7 @@ mymain(void)
virEventRegisterDefaultImpl();
if (!(qapiData.schema = testQEMUSchemaLoad())) {
if (!(qapiData.schema = testQEMUSchemaLoad("x86_64"))) {
VIR_TEST_VERBOSE("failed to load qapi schema");
ret = -1;
goto cleanup;
@ -3232,7 +3232,7 @@ mymain(void)
DO_TEST_QAPI_VALIDATE("alternate 2", "blockdev-add/arg-type", false,
"{\"driver\":\"qcow2\",\"file\": 1234}");
if (!(metaschema = testQEMUSchemaGetLatest()) ||
if (!(metaschema = testQEMUSchemaGetLatest("x86_64")) ||
!(metaschemastr = virJSONValueToString(metaschema, false))) {
VIR_TEST_VERBOSE("failed to load latest qapi schema");
ret = -1;

8
tests/testutilsqemuschema.c
View File

@ -524,7 +524,7 @@ testQEMUSchemaValidate(virJSONValuePtr obj,
* replies file used for qemucapabilitiestest for the x86_64 architecture.
*/
virJSONValuePtr
testQEMUSchemaGetLatest(void)
testQEMUSchemaGetLatest(const char* arch)
{
char *capsLatestFile = NULL;
char *capsLatest = NULL;
@ -533,7 +533,7 @@ testQEMUSchemaGetLatest(void)
virJSONValuePtr reply = NULL;
virJSONValuePtr schema = NULL;
if (!(capsLatestFile = testQemuGetLatestCapsForArch("x86_64", "replies"))) {
if (!(capsLatestFile = testQemuGetLatestCapsForArch(arch, "replies"))) {
VIR_TEST_VERBOSE("failed to find latest caps replies");
return NULL;
}
@ -575,11 +575,11 @@ testQEMUSchemaGetLatest(void)
virHashTablePtr
testQEMUSchemaLoad(void)
testQEMUSchemaLoad(const char* arch)
{
virJSONValuePtr schema;
if (!(schema = testQEMUSchemaGetLatest()))
if (!(schema = testQEMUSchemaGetLatest(arch)))
return NULL;
return virQEMUQAPISchemaConvert(schema);

4
tests/testutilsqemuschema.h
View File

@ -29,7 +29,7 @@ testQEMUSchemaValidate(virJSONValuePtr obj,
virBufferPtr debug);
virJSONValuePtr
testQEMUSchemaGetLatest(void);
testQEMUSchemaGetLatest(const char* arch);
virHashTablePtr
testQEMUSchemaLoad(void);
testQEMUSchemaLoad(const char* arch);