From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 12 Jul 2012 09:49:15 +0000 (+0200)
Subject: qemu: Do not fail virConnectCompareCPU if host CPU is not known
X-Git-Tag: v0.9.11.5~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cba63bbc2261f4f24ca15e1f49dd5fab1b69c6e6;p=thirdparty%2Flibvirt.git

qemu: Do not fail virConnectCompareCPU if host CPU is not known

When host CPU could not be properly detected, virConnectCompareCPU will
just report that any CPU is incompatible with host CPU instead of
failing.
(cherry picked from commit 87c8623161f19c4f37844991deb1477e53c2b310)
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 72a91d693f..0286e16562 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9322,9 +9322,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);
     }