[RFC PATCH 19/43] qemuxml2xmltest: Always include basic set of capabilities
Use virQEMUCapsInitQMPBasicArch to add the basic set of capabilities
which all qemu versions will get.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2xmltest.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index c7030a22e9..f0030966a8 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -15,6 +15,9 @@
#include "virfilewrapper.h"
#include "configmake.h"
+#define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
+#include "qemu/qemu_capspriv.h"
+
#define VIR_FROM_THIS VIR_FROM_NONE
static virQEMUDriver driver;
@@ -26,11 +29,27 @@ enum {
};
+static int
+testXML2XMLCommon(const struct testQemuInfo *info)
+{
+ if (!(info->flags & FLAG_REAL_CAPS)) {
+ virQEMUCapsInitQMPBasicArch(info->qemuCaps);
+ if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0)
+ return -1;
+ }
+
+ return 0;
+}
+
+
static int
testXML2XMLActive(const void *opaque)
{
const struct testQemuInfo *info = opaque;
+ if (testXML2XMLCommon(info) < 0)
+ return -1;
+
return testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt,
info->infile, info->outfile, true,
info->parseFlags,
@@ -43,6 +62,9 @@ testXML2XMLInactive(const void *opaque)
{
const struct testQemuInfo *info = opaque;
+ if (testXML2XMLCommon(info) < 0)
+ return -1;
+
return testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt,
info->infile, info->outfile, false,
info->parseFlags,
--
2.30.2