[libvirt] [PATCH v2 3/4] tests: qemuxml2argv: report error on ARG_* collisions
Cole Robinson
crobinso at redhat.com
Thu Mar 21 19:55:05 UTC 2019
* ARG_CAPS_ARCH must be specified with ARG_CAPS_VER
* ARG_QEMU_CAPS shouldn't be specified with ARG_CAPS_*
Signed-off-by: Cole Robinson <crobinso at redhat.com>
---
tests/qemuxml2argvtest.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 191a43726d..34394181c1 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -688,6 +688,18 @@ testInfoSetArgs(struct testInfo *info,
}
}
+ if (!!capsarch ^ !!capsver) {
+ fprintf(stderr, "ARG_CAPS_ARCH and ARG_CAPS_VER "
+ "must be specified together.\n");
+ goto cleanup;
+ }
+
+ if (qemuCaps && (capsarch || capsver)) {
+ fprintf(stderr, "ARG_QEMU_CAPS can not be combined with ARG_CAPS_ARCH "
+ "or ARG_CAPS_VER\n");
+ goto cleanup;
+ }
+
if (!qemuCaps && capsarch && capsver) {
bool stripmachinealiases = false;
--
2.21.0
More information about the libvir-list
mailing list