From: Julio Faracco <jcfaracco@gmail.com>
Date: Tue, 27 Oct 2020 16:04:24 +0000 (-0300)
Subject: cpu_ppc64: compare CPU function is ignoring return value
X-Git-Tag: v6.10.0-rc1~348
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b356d81b8960c3a43212f8c0e9eab66465c8c10a;p=thirdparty%2Flibvirt.git

cpu_ppc64: compare CPU function is ignoring return value

Function to compare CPU on 64-bits PowerPC is ignoring the flag to avoid failure
in case of CPUs (host and guest) are incompatible. Basically, the function is
returning -1 even if it is set to continue.

Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
index 2fedcd25da..555eeecbe7 100644
--- a/src/cpu/cpu_ppc64.c
+++ b/src/cpu/cpu_ppc64.c
@@ -524,11 +524,11 @@ virCPUppc64Compare(virCPUDefPtr host,
         if (failIncompatible) {
             virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s",
                            _("unknown host CPU"));
-        } else {
-            VIR_WARN("unknown host CPU");
-            ret = VIR_CPU_COMPARE_INCOMPATIBLE;
+            return VIR_CPU_COMPARE_ERROR;
         }
-        return -1;
+
+        VIR_WARN("unknown host CPU");
+        return VIR_CPU_COMPARE_INCOMPATIBLE;
     }
 
     ret = ppc64Compute(host, cpu, NULL, &message);