From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 7 Apr 2010 14:49:04 +0000 (+0200)
Subject: Properly advertise cpuselection guest capability
X-Git-Tag: v0.8.0~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71d5686f7841fad073d1107a5e8b9e799ae54640;p=thirdparty%2Flibvirt.git

Properly advertise cpuselection guest capability

There's no sense in advertising cpuselection capability when host CPU
is not properly detected and advertised in host capabilities.
---

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index f56a7ef55c..df57d88800 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -892,9 +892,10 @@ qemudCapsInitGuest(virCapsPtr caps,
 
     guest->arch.defaultInfo.emulator_mtime = binary_mtime;
 
-    if (qemudProbeCPUModels(binary, info->arch, &ncpus, NULL) == 0
-        && ncpus > 0
-        && !virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0))
+    if (caps->host.cpu &&
+        qemudProbeCPUModels(binary, info->arch, &ncpus, NULL) == 0 &&
+        ncpus > 0 &&
+        !virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0))
         goto error;
 
     if (hvm) {