[PATCH 5/6] virMdevctlList: Don't check for !output

Michal Privoznik mprivozn at redhat.com
Thu Aug 24 08:57:39 UTC 2023


After 'mdevctl' was ran, its stdout is captured in @output which
is then compared against NULL and if it is NULL a negative value
is returned (to indicate error to the caller). But this is
effectively a dead code, because virCommand (specifically
virCommandProcessIO()) makes sure both stdout and stderr buffers
are properly '\0' terminated. Therefore, this can never evaluate
to true. Also, if there really is no output from 'mdevctl' (which
was handled in one of earlier commits, but let just assume it
wasn't), then we should not error out and treat such scenario as
'no mdevs defined/active'.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/node_device/node_device_driver.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index ac50c96837..a59cd0875d 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -1650,9 +1650,6 @@ virMdevctlList(bool defined,
         return -1;
     }
 
-    if (!output)
-        return -1;
-
     return nodeDeviceParseMdevctlJSON(output, devs);
 }
 
-- 
2.41.0



More information about the libvir-list mailing list