From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 23 Feb 2021 07:42:13 +0000 (+0100)
Subject: virCPUx86DataParse: Don't check error from x86FeatureNames
X-Git-Tag: v7.2.0-rc1~295
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=542b2b29142305502be25ca8c47e572fe56d79c4;p=thirdparty%2Flibvirt.git

virCPUx86DataParse: Don't check error from x86FeatureNames

x86FeatureNames uses virBuffer and thus can't fail nowadays.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
---

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 92f945beb4..79c5868ae6 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -1856,11 +1856,7 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt)
  */
 #define virX86CpuIncompatible(MSG, CPU_DEF) \
         do { \
-            g_autofree char *flagsStr = NULL; \
-            if (!(flagsStr = x86FeatureNames(map, ", ", (CPU_DEF)))) { \
-                virReportOOMError(); \
-                return VIR_CPU_COMPARE_ERROR; \
-            } \
+            g_autofree char *flagsStr = x86FeatureNames(map, ", ", (CPU_DEF)); \
             if (message) \
                 *message = g_strdup_printf("%s: %s", _(MSG), flagsStr); \
             VIR_DEBUG("%s: %s", MSG, flagsStr); \