]> xenbits.xensource.com Git - people/aperard/libvirt.git/commitdiff
lxc: virLXCControllerAddConsole() to void
authorArtem Chernyshev <artem.chernyshev@red-soft.ru>
Thu, 4 Jan 2024 00:16:59 +0000 (03:16 +0300)
committerMichal Privoznik <mprivozn@redhat.com>
Thu, 4 Jan 2024 16:05:52 +0000 (17:05 +0100)
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>
src/lxc/lxc_controller.c

index 0a92a24fb76ad2a52f554855165e8690dd8aa580..505b71d05e9937f1deeedbfb3b853498f6116210 100644 (file)
@@ -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;
     }