tests: Allow QMP schema testing in qemuMonitorTestNewFromFileFull

Pass in the schema data from the caller if QMP schema testing is
desired.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>

diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index ac9ab6bfce65ff67e11a41d78bb58e7defc0b828..67f57a4fdccf5006780b981810bd08474d12c1e5 100644 (file)
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -82,7 +82,8 @@ testQemuCaps(const void *opaque)
                     data->dataDir, data->base, data->archName) < 0)
         goto cleanup;
 
-    if (!(mon = qemuMonitorTestNewFromFileFull(repliesFile, &data->driver, NULL)))
+    if (!(mon = qemuMonitorTestNewFromFileFull(repliesFile, &data->driver, NULL,
+                                               NULL)))
         goto cleanup;
 
     if (qemuProcessQMPInitMonitor(qemuMonitorTestGetMonitor(mon)) < 0)

diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index fbf488c54cea8783552350083ce0ca054b5579af..08f00b9c721f73b4c93e09789237f031a2337e80 100644 (file)
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -435,7 +435,7 @@ testQemuHotplugCpuPrepare(const char *test,
         virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS);
 
     if (!(data->mon = qemuMonitorTestNewFromFileFull(data->file_json_monitor,
-                                                     &driver, data->vm)))
+                                                     &driver, data->vm, NULL)))
         goto error;
 
     priv->mon = qemuMonitorTestGetMonitor(data->mon);

diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index 0de90482430c2c3ab924a2737e09bfe0b5a1b373..8d7c503c6ecb7fa5cf256a4869110569032f05bf 100644 (file)
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -1396,6 +1396,7 @@ qemuMonitorTestFullAddItem(qemuMonitorTestPtr test,
  * @fileName: File name to load monitor replies from
  * @driver: qemu driver object
  * @vm: domain object (may be null if it's not needed by the test)
+ * @qmpschema: QMP schema data hash table if QMP checking is required
  *
  * Create a JSON test monitor simulator object and fill it with expected command
  * sequence and replies specified in @fileName.
@@ -1409,7 +1410,8 @@ qemuMonitorTestFullAddItem(qemuMonitorTestPtr test,
 qemuMonitorTestPtr
 qemuMonitorTestNewFromFileFull(const char *fileName,
                                virQEMUDriverPtr driver,
-                               virDomainObjPtr vm)
+                               virDomainObjPtr vm,
+                               virHashTablePtr qmpschema)
 {
     qemuMonitorTestPtr ret = NULL;
     char *jsonstr = NULL;
@@ -1423,7 +1425,8 @@ qemuMonitorTestNewFromFileFull(const char *fileName,
     if (virTestLoadFile(fileName, &jsonstr) < 0)
         return NULL;
 
-    if (!(ret = qemuMonitorTestNew(true, driver->xmlopt, vm, driver, NULL, NULL)))
+    if (!(ret = qemuMonitorTestNew(true, driver->xmlopt, vm, driver, NULL,
+                                   qmpschema)))
         goto cleanup;
 
     tmp = jsonstr;

diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h
index d2520e08a4abad8af6b8f0cbaade97dec09a5af8..8461c80caa9e000de6951e9cb58f4b216568464a 100644 (file)
--- a/tests/qemumonitortestutils.h
+++ b/tests/qemumonitortestutils.h
@@ -90,7 +90,8 @@ qemuMonitorTestPtr qemuMonitorTestNewFromFile(const char *fileName,
                                               bool simple);
 qemuMonitorTestPtr qemuMonitorTestNewFromFileFull(const char *fileName,
                                                   virQEMUDriverPtr driver,
-                                                  virDomainObjPtr vm);
+                                                  virDomainObjPtr vm,
+                                                  virHashTablePtr qmpschema);
 
 qemuMonitorTestPtr qemuMonitorTestNewAgent(virDomainXMLOptionPtr xmlopt);