tests: Add support for passing driver to qemu monitor

The driver is then passed to monitor event handlers.

diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 71dd9b0f71605049fab0528cd407188e8d61699e..6b71c9f0952edc785e12302f601e77e870ccbc24 100644 (file)
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -242,7 +242,7 @@ testQemuHotplug(const void *data)
 
     /* Now is the best time to feed the spoofed monitor with predefined
      * replies. */
-    if (!(test_mon = qemuMonitorTestNew(true, driver.xmlopt, vm)))
+    if (!(test_mon = qemuMonitorTestNew(true, driver.xmlopt, vm, &driver)))
         goto cleanup;
 
     tmp = test->mon;

diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index 99b913197cc49698a71c304cefb2655756ab5809..20ccc106373a0d3ebce63e1581538ebaeda2f2ee 100644 (file)
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -869,7 +869,8 @@ error:
 qemuMonitorTestPtr
 qemuMonitorTestNew(bool json,
                    virDomainXMLOptionPtr xmlopt,
-                   virDomainObjPtr vm)
+                   virDomainObjPtr vm,
+                   virQEMUDriverPtr driver)
 {
     qemuMonitorTestPtr test = NULL;
     virDomainChrSourceDef src;
@@ -882,7 +883,7 @@ qemuMonitorTestNew(bool json,
                                       &src,
                                       json,
                                       &qemuMonitorTestCallbacks,
-                                      NULL)))
+                                      driver)))
         goto error;
 
     virObjectLock(test->mon);

diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h
index ccb545744a23382d06cd2c139a33148329b5060c..9e39795d93ca97d43bbd1db75a4f23e761203d76 100644 (file)
--- a/tests/qemumonitortestutils.h
+++ b/tests/qemumonitortestutils.h
@@ -21,6 +21,7 @@
 # define __VIR_QEMU_MONITOR_TEST_UTILS_H__
 
 # include "domain_conf.h"
+# include "qemu/qemu_conf.h"
 # include "qemu/qemu_monitor.h"
 # include "qemu/qemu_agent.h"
 
@@ -60,11 +61,12 @@ int qemuMonitorTestAddItemParams(qemuMonitorTestPtr test,
     ATTRIBUTE_SENTINEL;
 
 # define qemuMonitorTestNewSimple(json, xmlopt) \
-    qemuMonitorTestNew(json, xmlopt, NULL)
+    qemuMonitorTestNew(json, xmlopt, NULL, NULL)
 
 qemuMonitorTestPtr qemuMonitorTestNew(bool json,
                                       virDomainXMLOptionPtr xmlopt,
-                                      virDomainObjPtr vm);
+                                      virDomainObjPtr vm,
+                                      virQEMUDriverPtr driver);
 
 qemuMonitorTestPtr qemuMonitorTestNewAgent(virDomainXMLOptionPtr xmlopt);