[libvirt] [PATCH 4/4] tests: qemuhotplug: Use schema testing with qemuMonitorTestNewFromFileFull
Pass in the schema since it works with the 'file' test now.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuhotplugtest.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 08f00b9c72..bfbf32baa4 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -27,6 +27,7 @@
#include "qemumonitortestutils.h"
#include "testutils.h"
#include "testutilsqemu.h"
+#include "testutilsqemuschema.h"
#include "virerror.h"
#include "virstring.h"
#include "virthread.h"
@@ -394,7 +395,8 @@ testQemuHotplugCpuDataFree(struct testQemuHotplugCpuData *data)
static struct testQemuHotplugCpuData *
testQemuHotplugCpuPrepare(const char *test,
- bool modern)
+ bool modern,
+ virHashTablePtr qmpschema)
{
qemuDomainObjPrivatePtr priv = NULL;
virCapsPtr caps = NULL;
@@ -435,7 +437,7 @@ testQemuHotplugCpuPrepare(const char *test,
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS);
if (!(data->mon = qemuMonitorTestNewFromFileFull(data->file_json_monitor,
- &driver, data->vm, NULL)))
+ &driver, data->vm,
qmpschema)))
goto error;
priv->mon = qemuMonitorTestGetMonitor(data->mon);
@@ -499,6 +501,7 @@ struct testQemuHotplugCpuParams {
bool state;
bool modern;
bool fail;
+ virHashTablePtr schema;
};
@@ -510,7 +513,8 @@ testQemuHotplugCpuGroup(const void *opaque)
int ret = -1;
int rc;
- if (!(data = testQemuHotplugCpuPrepare(params->test, params->modern)))
+ if (!(data = testQemuHotplugCpuPrepare(params->test, params->modern,
+ params->schema)))
return -1;
rc = qemuDomainSetVcpusInternal(&driver, data->vm, data->vm->def,
@@ -546,7 +550,8 @@ testQemuHotplugCpuIndividual(const void *opaque)
int ret = -1;
int rc;
- if (!(data = testQemuHotplugCpuPrepare(params->test, params->modern)))
+ if (!(data = testQemuHotplugCpuPrepare(params->test, params->modern,
+ params->schema)))
return -1;
if (virBitmapParse(params->cpumap, &map, 128) < 0)
@@ -580,6 +585,7 @@ testQemuHotplugCpuIndividual(const void *opaque)
static int
mymain(void)
{
+ VIR_AUTOPTR(virHashTable) qmpschema = NULL;
int ret = 0;
struct qemuHotplugTestData data = {0};
struct testQemuHotplugCpuParams cpudata;
@@ -604,6 +610,13 @@ mymain(void)
if (!(driver.domainEventState = virObjectEventStateNew()))
return EXIT_FAILURE;
+ if (!(qmpschema = testQEMUSchemaLoad())) {
+ VIR_TEST_VERBOSE("failed to load qapi schema\n");
+ return EXIT_FAILURE;
+ }
+
+ cpudata.schema = qmpschema;
+
driver.lockManager = virLockManagerPluginNew("nop", "qemu",
driver.config->configBaseDir,
0);
--
2.21.0