mirror of https://gitee.com/openkylin/libvirt.git
tests: Add support for passing driver to qemu monitor
The driver is then passed to monitor event handlers.
This commit is contained in:
parent
a950b4f91d
commit
201f01ab97
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in New Issue