]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Properly advertise cpuselection guest capability
authorJiri Denemark <jdenemar@redhat.com>
Wed, 7 Apr 2010 14:49:04 +0000 (16:49 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Wed, 7 Apr 2010 19:32:46 +0000 (21:32 +0200)
There's no sense in advertising cpuselection capability when host CPU
is not properly detected and advertised in host capabilities.

src/qemu/qemu_conf.c

index f56a7ef55cab63c52136db5545bbd0ce8039adb2..df57d888003f73d7cc374cf250bed4c9e68c09c5 100644 (file)
@@ -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) {