From: Artem Chernyshev <artem.chernyshev@red-soft.ru>
Date: Thu, 4 Jan 2024 00:16:59 +0000 (+0300)
Subject: lxc: virLXCControllerAddConsole() to void
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=270e36304691429eeaff5cd275fd09ecd7c47674;p=libvirt.git

lxc: virLXCControllerAddConsole() to void

virLXCControllerAddConsole() return value is invariant, so change
it type and remove all dependent checks.

Signed-off-by: Artem Chernyshev <artem.chernyshev@red-soft.ru>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 0a92a24fb7..505b71d05e 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -313,8 +313,8 @@ static void virLXCControllerFree(virLXCController *ctrl)
 }
 
 
-static int virLXCControllerAddConsole(virLXCController *ctrl,
-                                      int hostFd)
+static void virLXCControllerAddConsole(virLXCController *ctrl,
+                                       int hostFd)
 {
     VIR_EXPAND_N(ctrl->consoles, ctrl->nconsoles, 1);
     ctrl->consoles[ctrl->nconsoles-1].daemon = ctrl->daemon;
@@ -326,7 +326,6 @@ static int virLXCControllerAddConsole(virLXCController *ctrl,
 
     ctrl->consoles[ctrl->nconsoles-1].epollFd = -1;
     ctrl->consoles[ctrl->nconsoles-1].epollWatch = -1;
-    return 0;
 }
 
 
@@ -2655,8 +2654,7 @@ int main(int argc, char *argv[])
     }
 
     for (i = 0; i < nttyFDs; i++) {
-        if (virLXCControllerAddConsole(ctrl, ttyFDs[i]) < 0)
-            goto cleanup;
+        virLXCControllerAddConsole(ctrl, ttyFDs[i]);
         ttyFDs[i] = -1;
     }