[libvirt] [PATCH 1/4] Don't leak vm->monitorpath on re-connect
* src/qemu_driver.c: vm->monitorpath is already initialized in the case
of re-connect, so move the initialization for the normal startup case
out of the common code
---
src/qemu_driver.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 95ea882..636ee9d 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -862,11 +862,6 @@ static int qemudOpenMonitor(virConnectPtr conn,
if (ret != 0)
goto error;
- if (!(vm->monitorpath = strdup(monitor))) {
- virReportOOMError(conn);
- goto error;
- }
-
if ((vm->monitorWatch = virEventAddHandle(vm->monitor, 0,
qemudDispatchVMEvent,
driver, NULL)) < 0)
@@ -967,7 +962,12 @@ qemudFindCharDevicePTYs(virConnectPtr conn,
}
/* Got them all, so now open the monitor console */
- ret = qemudOpenMonitor(conn, driver, vm, monitor, 0);
+ if ((ret = qemudOpenMonitor(conn, driver, vm, monitor, 0)) != 0)
+ goto cleanup;
+
+ vm->monitorpath = monitor;
+
+ return 0;
cleanup:
VIR_FREE(monitor);
--
1.6.2.5