From: Guido Günther <agx@sigxcpu.org>
Date: Thu, 18 Oct 2012 22:29:17 +0000 (+0200)
Subject: qemu: Don't fail without emulatorpin or cpumask
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a605594f8e2feaa77474008212a31a8dd21b03b7;p=libvirt.git

qemu: Don't fail without emulatorpin or cpumask

This unbreaks qemu:///session that got broken by
ba63d8f7d843461f77a8206c1ef9da38388713e5.
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index e08ec6757f..d3951d1326 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2037,12 +2037,14 @@ qemuProcessSetEmulatorAffinites(virConnectPtr conn,
     if (virNodeGetInfo(conn, &nodeinfo) != 0)
         return -1;
 
-    if (def->cputune.emulatorpin)
+    if (def->cputune.emulatorpin) {
         cpumask = def->cputune.emulatorpin->cpumask;
-    else if (def->cpumask)
+    } else if (def->cpumask) {
         cpumask = def->cpumask;
-    else
+    } else {
+        ret = 0;
         goto cleanup;
+    }
 
     ret = virProcessInfoSetAffinity(vm->pid, cpumask);
 cleanup: