[libvirt PATCH 08/11] tests: start/stop an event thread for QEMU monitor/agent tests
Tests which are using the QEMU monitor / agent need to have an
event thread running a private GMainContext.
There is already a thread running the main libvirt event loop
but this can't be eliminated yet as it is used for more than
just the monitor client I/O.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
tests/qemumonitortestutils.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index b29e5d8cd2..a1641050ea 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -36,6 +36,7 @@
#include "virlog.h"
#include "virerror.h"
#include "virstring.h"
+#include "vireventthread.h"
#define VIR_FROM_THIS VIR_FROM_NONE
@@ -66,6 +67,8 @@ struct _qemuMonitorTest {
virNetSocketPtr server;
virNetSocketPtr client;
+ virEventThread *eventThread;
+
qemuMonitorPtr mon;
qemuAgentPtr agent;
@@ -389,6 +392,8 @@ qemuMonitorTestFree(qemuMonitorTestPtr test)
qemuAgentClose(test->agent);
}
+ g_object_unref(test->eventThread);
+
virObjectUnref(test->vm);
if (test->started)
@@ -1142,6 +1147,7 @@ qemuMonitorCommonTestInit(qemuMonitorTestPtr test)
"}"
/* We skip the normal handshake reply of
"{\"execute\":\"qmp_capabilities\"}" */
+
qemuMonitorTestPtr
qemuMonitorTestNew(virDomainXMLOptionPtr xmlopt,
virDomainObjPtr vm,
@@ -1157,6 +1163,9 @@ qemuMonitorTestNew(virDomainXMLOptionPtr xmlopt,
if (!(test = qemuMonitorCommonTestNew(xmlopt, vm, &src)))
goto error;
+ if (!(test->eventThread = virEventThreadNew("mon-test")))
+ goto error;
+
test->qapischema = schema;
if (!(test->mon = qemuMonitorOpen(test->vm,
&src,
@@ -1389,12 +1398,16 @@ qemuMonitorTestNewAgent(virDomainXMLOptionPtr xmlopt)
{
qemuMonitorTestPtr test = NULL;
virDomainChrSourceDef src;
+ g_autofree char *threadName = NULL;
memset(&src, 0, sizeof(src));
if (!(test = qemuMonitorCommonTestNew(xmlopt, NULL, &src)))
goto error;
+ if (!(test->eventThread = virEventThreadNew("agent-test")))
+ goto error;
+
if (!(test->agent = qemuAgentOpen(test->vm,
&src,
&qemuMonitorTestAgentCallbacks)))
--
2.24.1