From: Stefan Berger <stefanb@us.ibm.com>
Date: Mon, 13 Jun 2011 19:59:58 +0000 (-0400)
Subject: qemu: Faster response time to qemu startup errors
X-Git-Tag: v0.9.3-rc1~183
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5358fdc72a2036efbe67eb60047843ae1e7be80;p=thirdparty%2Flibvirt.git

qemu: Faster response time to qemu startup errors

The below patch decreases the response time of libvirt to errors reported by Qemu upon startup by checking whether the qemu process is still alive while polling for the local socket to show up.

This patch also introduces a special handling of signal for the Win32 part of virKillProcess.
---

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 26bb814723..92c44bf3d6 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -247,7 +247,7 @@ qemuMonitorUnwatch(void *monitor)
 }
 
 static int
-qemuMonitorOpenUnix(const char *monitor)
+qemuMonitorOpenUnix(const char *monitor, pid_t cpid)
 {
     struct sockaddr_un addr;
     int monfd;
@@ -274,7 +274,8 @@ qemuMonitorOpenUnix(const char *monitor)
         if (ret == 0)
             break;
 
-        if (errno == ENOENT || errno == ECONNREFUSED) {
+        if ((errno == ENOENT || errno == ECONNREFUSED) &&
+            virKillProcess(cpid, 0) == 0) {
             /* ENOENT       : Socket may not have shown up yet
              * ECONNREFUSED : Leftover socket hasn't been removed yet */
             continue;
@@ -691,7 +692,7 @@ qemuMonitorOpen(virDomainObjPtr vm,
     switch (config->type) {
     case VIR_DOMAIN_CHR_TYPE_UNIX:
         mon->hasSendFD = 1;
-        mon->fd = qemuMonitorOpenUnix(config->data.nix.path);
+        mon->fd = qemuMonitorOpenUnix(config->data.nix.path, vm->pid);
         break;
 
     case VIR_DOMAIN_CHR_TYPE_PTY:
diff --git a/src/util/util.c b/src/util/util.c
index d00f065b56..df4dfacfed 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -2010,7 +2010,7 @@ int virKillProcess(pid_t pid, int sig)
          * TerminateProcess is more or less equiv to SIG_KILL, in that
          * a process can't trap / block it
          */
-        if (!TerminateProcess(proc, sig)) {
+        if (sig != 0 && !TerminateProcess(proc, sig)) {
             errno = ESRCH;
             return -1;
         }