shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-27 18:03:50 +03:00
Code Releases Activity

lxc: errors after the handshake won't be reported

Browse Source 
Any error happening after the hand shake in the lxc controller
will not result in a failure as errors are checked during the handshake.
Move the handshake after the last possible error.
This commit is contained in:
Cédric Bosdonnat 2016-07-19 16:23:25 +02:00
parent cedd2ab282
commit 8ee6a99e7c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/lxc_controller.c
View File

@ -2444,13 +2444,13 @@ virLXCControllerRun(virLXCControllerPtr ctrl)
if (lxcControllerClearCapabilities() < 0) if (lxcControllerClearCapabilities() < 0)
goto cleanup; goto cleanup;
if (virLXCControllerDaemonHandshake(ctrl) < 0)
goto cleanup;
for (i = 0; i < ctrl->nconsoles; i++) for (i = 0; i < ctrl->nconsoles; i++)
if (virLXCControllerConsoleSetNonblocking(&(ctrl->consoles[i])) < 0) if (virLXCControllerConsoleSetNonblocking(&(ctrl->consoles[i])) < 0)
goto cleanup; goto cleanup;
if (virLXCControllerDaemonHandshake(ctrl) < 0)
goto cleanup;
/* We must not hold open a dbus connection for life /* We must not hold open a dbus connection for life
* of LXC instance, since dbus-daemon is limited to * of LXC instance, since dbus-daemon is limited to
* only a few 100 connections by default * only a few 100 connections by default