]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Don't fail without emulatorpin or cpumask
authorGuido Günther <agx@sigxcpu.org>
Thu, 18 Oct 2012 22:29:17 +0000 (00:29 +0200)
committerGuido Günther <agx@sigxcpu.org>
Thu, 18 Oct 2012 23:25:19 +0000 (01:25 +0200)
This unbreaks qemu:///session that got broken by
ba63d8f7d843461f77a8206c1ef9da38388713e5.

src/qemu/qemu_process.c

index e08ec6757f5102d84f1b010f6df8f19381ad5134..d3951d1326f2b187599aabcc9d28e954cf479ea0 100644 (file)
@@ -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: