ab887478b0
qemuMonitorJSONSetMigrationParams: Take double pointer for @params qemuMonitorJSONAddObject: Take double pointer for @props :qemuMonitorJSONMakeCommandInternal: Clear @arguments when stolen qemuMonitorAddObject: Fix semantics of @alias qemuMonitorAddObject: Refactor cleanup util: json: Replace virJSONValueObjectSteal by virJSONValueObjectRemoveKey qemu: command: Generate commandline of 'masterKey0' secret via JSON qemu: command: Generate commandline of 'sev0' sev-guest object via JSON qemu: command: Generate commandline of iothread objects JSON qemu: capabilities: Introduce QEMU_CAPS_OBJECT_QAPIFIED qemu: monitor: Make wrapping of 'props' of 'object-add' optional qemuMonitorCreateObjectPropsWrap: Open-code in qemuBuildMemoryBackendProps qemu: monitor: Don't add 'props' wrapper if qemu has QEMU_CAPS_OBJECT_QAPIFIED qemu: command: Use JSON for QAPIfied -object directly tests: qemuxml2argv: Validate generation of JSON props for object-add qemu: capabilities: Enable detection of QEMU_CAPS_OBJECT_QAPIFIED Signed-off-by: yezengruan <yezengruan@huawei.com> (cherry picked from commit da25da87c49d1b576b48fd58614ff43833a04f37)
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From 798600dd1fd6d0d96661f9c2b5cbd6e8ae96a229 Mon Sep 17 00:00:00 2001
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Thu, 26 Nov 2020 18:35:55 +0100
|
|
Subject: [PATCH 15/16] tests: qemuxml2argv: Validate generation of JSON props
|
|
for object-add
|
|
|
|
Similarly to the validation for blockdev-add and netdev_add, use the
|
|
qemuxml2argv test repository to drive validation of props for
|
|
object-add.
|
|
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
Signed-off-by: Yan Wang <wangyan122@huawei.com>
|
|
---
|
|
tests/qemuxml2argvtest.c | 18 ++++++++++++++++++
|
|
1 file changed, 18 insertions(+)
|
|
|
|
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
|
|
index 47fce1c3bf..e07d6cf398 100644
|
|
--- a/tests/qemuxml2argvtest.c
|
|
+++ b/tests/qemuxml2argvtest.c
|
|
@@ -546,6 +546,24 @@ testCompareXMLToArgvValidateSchema(virQEMUDriverPtr drv,
|
|
return -1;
|
|
}
|
|
|
|
+ i++;
|
|
+ } else if (STREQ(args[i], "-object")) {
|
|
+
|
|
+ if (*args[i + 1] != '{') {
|
|
+ i++;
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ if (!(jsonargs = virJSONValueFromString(args[i + 1])))
|
|
+ return -1;
|
|
+
|
|
+ if (testQEMUSchemaValidateCommand("object-add", jsonargs,
|
|
+ schema, &debug) < 0) {
|
|
+ VIR_TEST_VERBOSE("failed to validate -object '%s' against QAPI schema: %s",
|
|
+ args[i + 1], virBufferCurrentContent(&debug));
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
i++;
|
|
}
|
|
}
|
|
--
|
|
2.27.0
|
|
|