Re: [PATCH 1/3] libxl: Break down an if() in libxlCapsInitNuma()

[Jim Fehlig]

On 5/12/21 7:23 AM, Michal Privoznik wrote:

There's an if-else statement in libxlCapsInitNuma() that can
really be just two standalone if()-s. Writing it as such helps
with code readability.

Signed-off-by: Michal Privoznik <mpriv...@redhat.com>
---
  src/libxl/libxl_capabilities.c | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)

Reviewed-by: Jim Fehlig <jfeh...@suse.com>

Regards,
Jim

diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c
index ea4f370a6d..a64a9266c4 100644
--- a/src/libxl/libxl_capabilities.c
+++ b/src/libxl/libxl_capabilities.c
@@ -260,13 +260,13 @@ libxlCapsInitNuma(libxl_ctx *ctx, virCaps *caps)
          virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                         _("libxl_get_numainfo failed"));
          goto cleanup;
-    } else {
-        cpu_topo = libxl_get_cpu_topology(ctx, &nr_cpus);
-        if (cpu_topo == NULL || nr_cpus == 0) {
-            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                           _("libxl_get_cpu_topology failed"));
-            goto cleanup;
-        }
+    }
+
+    cpu_topo = libxl_get_cpu_topology(ctx, &nr_cpus);
+    if (cpu_topo == NULL || nr_cpus == 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("libxl_get_cpu_topology failed"));
+        goto cleanup;
      }

cpus = g_new0(virCapsHostNUMACellCPU *, nr_nodes);