External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 13:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Add support for passing driver to qemu monitor

Browse Source 
The driver is then passed to monitor event handlers.
This commit is contained in:
Jiri Denemark 2013-07-25 19:28:51 +02:00
parent a950b4f91d
commit 201f01ab97
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemuhotplugtest.c
View File

@ -242,7 +242,7 @@ testQemuHotplug(const void *data)
/* Now is the best time to feed the spoofed monitor with predefined /* Now is the best time to feed the spoofed monitor with predefined
* replies. */ * replies. */
if (!(test_mon = qemuMonitorTestNew(true, driver.xmlopt, vm))) if (!(test_mon = qemuMonitorTestNew(true, driver.xmlopt, vm, &driver)))
goto cleanup; goto cleanup;
tmp = test->mon; tmp = test->mon;

5
tests/qemumonitortestutils.c
View File

@ -869,7 +869,8 @@ error:
qemuMonitorTestPtr qemuMonitorTestPtr
qemuMonitorTestNew(bool json, qemuMonitorTestNew(bool json,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
virDomainObjPtr vm) virDomainObjPtr vm,
virQEMUDriverPtr driver)
{ {
qemuMonitorTestPtr test = NULL; qemuMonitorTestPtr test = NULL;
virDomainChrSourceDef src; virDomainChrSourceDef src;
@ -882,7 +883,7 @@ qemuMonitorTestNew(bool json,
&src, &src,
json, json,
&qemuMonitorTestCallbacks, &qemuMonitorTestCallbacks,
NULL))) driver)))
goto error; goto error;
virObjectLock(test->mon); virObjectLock(test->mon);

6
tests/qemumonitortestutils.h
View File

@ -21,6 +21,7 @@
# define __VIR_QEMU_MONITOR_TEST_UTILS_H__ # define __VIR_QEMU_MONITOR_TEST_UTILS_H__
# include "domain_conf.h" # include "domain_conf.h"
# include "qemu/qemu_conf.h"
# include "qemu/qemu_monitor.h" # include "qemu/qemu_monitor.h"
# include "qemu/qemu_agent.h" # include "qemu/qemu_agent.h"
@ -60,11 +61,12 @@ int qemuMonitorTestAddItemParams(qemuMonitorTestPtr test,
ATTRIBUTE_SENTINEL; ATTRIBUTE_SENTINEL;
# define qemuMonitorTestNewSimple(json, xmlopt) \ # define qemuMonitorTestNewSimple(json, xmlopt) \
qemuMonitorTestNew(json, xmlopt, NULL) qemuMonitorTestNew(json, xmlopt, NULL, NULL)
qemuMonitorTestPtr qemuMonitorTestNew(bool json, qemuMonitorTestPtr qemuMonitorTestNew(bool json,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
virDomainObjPtr vm); virDomainObjPtr vm,
virQEMUDriverPtr driver);
qemuMonitorTestPtr qemuMonitorTestNewAgent(virDomainXMLOptionPtr xmlopt); qemuMonitorTestPtr qemuMonitorTestNewAgent(virDomainXMLOptionPtr xmlopt);