tests: replace VIR_FREE with g_free in all vir*Free() functions

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Laine Stump 2021-02-03 14:35:02 -05:00
parent 6b1595317c
commit 05332bb866
6 changed files with 25 additions and 25 deletions

View File

@ -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 */

View File

@ -174,7 +174,7 @@ virNWFilterRuleInstFree(virNWFilterRuleInstPtr inst)
return;
virHashFree(inst->vars);
VIR_FREE(inst);
g_free(inst);
}

View File

@ -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);
}

View File

@ -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);
}

View File

@ -76,7 +76,7 @@ testClientNewPostExec(virNetServerClientPtr client,
static void
testClientFree(void *opaque)
{
VIR_FREE(opaque);
g_free(opaque);
}

View File

@ -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)