]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Do not fail virConnectCompareCPU if host CPU is not known
authorJiri Denemark <jdenemar@redhat.com>
Thu, 12 Jul 2012 09:49:15 +0000 (11:49 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Mon, 16 Jul 2012 11:21:38 +0000 (13:21 +0200)
When host CPU could not be properly detected, virConnectCompareCPU will
just report that any CPU is incompatible with host CPU instead of
failing.

src/qemu/qemu_driver.c

index 29ebb4c5402c20dd49ceb92e71928ede7c38a3fa..451159abd81c30806003c3cbe1051a38214dc5d3 100644 (file)
@@ -9423,9 +9423,12 @@ qemuCPUCompare(virConnectPtr conn,
 
     qemuDriverLock(driver);
 
-    if (!driver->caps || !driver->caps->host.cpu) {
-        qemuReportError(VIR_ERR_OPERATION_INVALID,
-                        "%s", _("cannot get host CPU capabilities"));
+    if (!driver->caps) {
+        qemuReportError(VIR_ERR_INTERNAL_ERROR,
+                        "%s", _("cannot get host capabilities"));
+    } else if (!driver->caps->host.cpu) {
+        VIR_WARN("cannot get host CPU capabilities");
+        ret = VIR_CPU_COMPARE_INCOMPATIBLE;
     } else {
         ret = cpuCompareXML(driver->caps->host.cpu, xmlDesc);
     }