提交 8a52daa2 编写于 作者: M Mark McLoughlin

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
上级 72978b97
......@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册