[libvirt PATCH 04/15] libxl: replace VIR_FREE with g_free in all *Dispose() functions
Signed-off-by: Laine Stump <laine(a)redhat.com>
---
src/libxl/libxl_conf.c | 20 ++++++++++----------
src/libxl/libxl_migration.c | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index de0fd66842..37a2c2e3cd 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -76,16 +76,16 @@ libxlDriverConfigDispose(void *obj)
if (cfg->logger)
libxlLoggerFree(cfg->logger);
- VIR_FREE(cfg->configBaseDir);
- VIR_FREE(cfg->configDir);
- VIR_FREE(cfg->autostartDir);
- VIR_FREE(cfg->logDir);
- VIR_FREE(cfg->stateDir);
- VIR_FREE(cfg->libDir);
- VIR_FREE(cfg->saveDir);
- VIR_FREE(cfg->autoDumpDir);
- VIR_FREE(cfg->lockManagerName);
- VIR_FREE(cfg->channelDir);
+ g_free(cfg->configBaseDir);
+ g_free(cfg->configDir);
+ g_free(cfg->autostartDir);
+ g_free(cfg->logDir);
+ g_free(cfg->stateDir);
+ g_free(cfg->libDir);
+ g_free(cfg->saveDir);
+ g_free(cfg->autoDumpDir);
+ g_free(cfg->lockManagerName);
+ g_free(cfg->channelDir);
virFirmwareFreeList(cfg->firmwares, cfg->nfirmwares);
}
diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c
index 72b6cb32cb..c56fdd98ab 100644
--- a/src/libxl/libxl_migration.c
+++ b/src/libxl/libxl_migration.c
@@ -228,7 +228,7 @@ libxlMigrationDstArgsDispose(void *obj)
libxlMigrationDstArgs *args = obj;
libxlMigrationCookieFree(args->migcookie);
- VIR_FREE(args->socks);
+ g_free(args->socks);
virObjectUnref(args->conn);
virObjectUnref(args->vm);
}
--
2.29.2