From: Jonathon Jongsma <jjongsma@redhat.com>
Date: Fri, 23 Oct 2020 21:40:09 +0000 (-0500)
Subject: qemu: combine conditionals
X-Git-Tag: v6.9.0-rc1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04b1c2d1e2e12abcca22380827edaa058399f4fa;p=thirdparty%2Flibvirt.git

qemu: combine conditionals

Trivial fix to improve readability by combining these into a compound
conditional.

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
---

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 604fcda1e3..445d794905 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4020,9 +4020,10 @@ int qemuMonitorJSONAddFileHandleToSet(qemuMonitorPtr mon,
     if (virJSONValueObjectCreate(&args, "S:opaque", opaque, NULL) < 0)
         return -1;
 
-    if (fdset >= 0)
-        if (virJSONValueObjectAdd(args, "j:fdset-id", fdset, NULL) < 0)
-            return -1;
+    if (fdset >= 0 &&
+        virJSONValueObjectAdd(args, "j:fdset-id", fdset, NULL) < 0) {
+        return -1;
+    }
 
     if (!(cmd = qemuMonitorJSONMakeCommandInternal("add-fd", g_steal_pointer(&args))))
         return -1;