9:29 p.m.
Signed-off-by: Laine Stump <laine(a)redhat.com>
---
tests/nodedevmdevctltest.c | 4 ++--
tests/nwfilterxml2firewalltest.c | 2 +-
tests/qemuhotplugtest.c | 12 ++++++------
tests/qemumonitortestutils.c | 28 ++++++++++++++--------------
tests/virnetdaemontest.c | 2 +-
tests/virnetserverclienttest.c | 2 +-
6 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/tests/nodedevmdevctltest.c b/tests/nodedevmdevctltest.c
index dab4b487b9..1bad65549b 100644
--- a/tests/nodedevmdevctltest.c
+++ b/tests/nodedevmdevctltest.c
@@ -152,8 +152,8 @@ nodedevTestDriverFree(virNodeDeviceDriverStatePtr drv)
virNodeDeviceObjListFree(drv->devs);
virCondDestroy(&drv->initCond);
virMutexDestroy(&drv->lock);
- VIR_FREE(drv->stateDir);
- VIR_FREE(drv);
+ g_free(drv->stateDir);
+ g_free(drv);
}
/* Add a fake root 'computer' device */
diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c
index 0901250aaf..3e2ab0b0ba 100644
--- a/tests/nwfilterxml2firewalltest.c
+++ b/tests/nwfilterxml2firewalltest.c
@@ -174,7 +174,7 @@ virNWFilterRuleInstFree(virNWFilterRuleInstPtr inst)
return;
virHashFree(inst->vars);
- VIR_FREE(inst);
+ g_free(inst);
}
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 776fb019f3..df5c9c9059 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -383,12 +383,12 @@ testQemuHotplugCpuDataFree(struct testQemuHotplugCpuData *data)
if (!data)
return;
- VIR_FREE(data->file_xml_dom);
- VIR_FREE(data->file_xml_res_live);
- VIR_FREE(data->file_xml_res_conf);
- VIR_FREE(data->file_json_monitor);
+ g_free(data->file_xml_dom);
+ g_free(data->file_xml_res_live);
+ g_free(data->file_xml_res_conf);
+ g_free(data->file_json_monitor);
- VIR_FREE(data->xml_dom);
+ g_free(data->xml_dom);
if (data->vm) {
priv = data->vm->privateData;
@@ -402,7 +402,7 @@ testQemuHotplugCpuDataFree(struct testQemuHotplugCpuData *data)
virObjectLock(mon);
qemuMonitorTestFree(data->mon);
}
- VIR_FREE(data);
+ g_free(data);
}
diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index c4f7082655..ae3fcf9311 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -99,7 +99,7 @@ qemuMonitorTestItemFree(qemuMonitorTestItemPtr item)
if (item->freecb)
(item->freecb)(item->opaque);
- VIR_FREE(item);
+ g_free(item);
}
@@ -423,8 +423,8 @@ qemuMonitorTestFree(qemuMonitorTestPtr test)
if (timer != -1)
virEventRemoveTimeout(timer);
- VIR_FREE(test->incoming);
- VIR_FREE(test->outgoing);
+ g_free(test->incoming);
+ g_free(test->outgoing);
for (i = 0; i < test->nitems; i++) {
if (!test->allowUnusedCommands) {
@@ -435,12 +435,12 @@ qemuMonitorTestFree(qemuMonitorTestPtr test)
qemuMonitorTestItemFree(test->items[i]);
}
- VIR_FREE(test->items);
+ g_free(test->items);
if (test->tmpdir && rmdir(test->tmpdir) < 0)
VIR_WARN("Failed to remove tempdir: %s", g_strerror(errno));
- VIR_FREE(test->tmpdir);
+ g_free(test->tmpdir);
if (!test->allowUnusedCommands &&
test->nitems != 0) {
@@ -448,7 +448,7 @@ qemuMonitorTestFree(qemuMonitorTestPtr test)
}
virMutexDestroy(&test->lock);
- VIR_FREE(test);
+ g_free(test);
}
@@ -518,16 +518,16 @@ qemuMonitorTestHandlerDataFree(void *opaque)
return;
for (i = 0; i < data->nargs; i++) {
- VIR_FREE(data->args[i].argname);
- VIR_FREE(data->args[i].argval);
+ g_free(data->args[i].argname);
+ g_free(data->args[i].argval);
}
- VIR_FREE(data->command_name);
- VIR_FREE(data->cmderr);
- VIR_FREE(data->response);
- VIR_FREE(data->args);
- VIR_FREE(data->expectArgs);
- VIR_FREE(data);
+ g_free(data->command_name);
+ g_free(data->cmderr);
+ g_free(data->response);
+ g_free(data->args);
+ g_free(data->expectArgs);
+ g_free(data);
}
diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c
index a20f351f93..fb40fe9b80 100644
--- a/tests/virnetdaemontest.c
+++ b/tests/virnetdaemontest.c
@@ -76,7 +76,7 @@ testClientNewPostExec(virNetServerClientPtr client,
static void
testClientFree(void *opaque)
{
- VIR_FREE(opaque);
+ g_free(opaque);
}
diff --git a/tests/virnetserverclienttest.c b/tests/virnetserverclienttest.c
index a4341c1641..959100ec66 100644
--- a/tests/virnetserverclienttest.c
+++ b/tests/virnetserverclienttest.c
@@ -41,7 +41,7 @@ testClientNew(virNetServerClientPtr client G_GNUC_UNUSED,
static void
testClientFree(void *opaque)
{
- VIR_FREE(opaque);
+ g_free(opaque);
}
static int testIdentity(const void *opaque G_GNUC_UNUSED)
--
2.29.2