Re: [libvirt] [PATCH 5/7] Add pidfile argument to __virExec

virExec will write out the pid of the daemonized process only. Use this in the QEMU driver, rather than QEMU's pidfile, so we can errors we might miss if the emulator bails early.

diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 5200532..2f17f6c 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1396,6 +1397,11 @@ static int qemudStartVMDaemon(virConnectPtr conn, goto cleanup; } + if (!(pidfile = virFilePid(driver->stateDir, vm->def->name))) { + virReportSystemError(conn, errno, + "%s", _("Failed to build pidfile path.")); + goto cleanup; + } vm->def->id = driver->nextvmid++; if (qemudBuildCommandLine(conn, driver, vm->def, @@ -1437,13 +1443,15 @@ static int qemudStartVMDaemon(virConnectPtr conn, ret = virExecDaemonize(conn, argv, progenv, &keepfd, &child, stdin_fd, &vm->logfile, &vm->logfile, VIR_EXEC_NONBLOCK | VIR_EXEC_DAEMON, - qemudSecurityHook, &hookData); + qemudSecurityHook, &hookData, + pidfile); + VIR_FREE(pidfile); /* wait for qemu process to to show up */ if (ret == 0) { - int retries = 100; + int retries = 10; - while (retries) { + while (retries*10) { if ((ret = virFileReadPid(driver->stateDir, vm->def->name, &vm->pid)) == 0) break;