[lxc-devel] [lxc/lxc] 9451ee: criu: make exec_criu static

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 9451eeffb0688b801034d963c455c8b31ccbf28c
      https://github.com/lxc/lxc/commit/9451eeffb0688b801034d963c455c8b31ccbf28c
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2016-03-10 (Thu, 10 Mar 2016)

  Changed paths:
    M src/lxc/criu.c
    M src/lxc/criu.h

  Log Message:
  -----------
  criu: make exec_criu static

This is no longer needed outside of criu.c with the ->migrate API call, so
let's mark it that way.

Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>


  Commit: 7103fe6f08cb04a498e3090d8416b4275a4a0d7e
      https://github.com/lxc/lxc/commit/7103fe6f08cb04a498e3090d8416b4275a4a0d7e
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2016-03-10 (Thu, 10 Mar 2016)

  Changed paths:
    M src/lxc/cgfsng.c
    M src/lxc/cgroup.h
    M src/lxc/criu.c

  Log Message:
  -----------
  cgroup: cgroup_escape takes no arguments

cgroup_escape() is a slight abuse of the cgroup code: what we really want
here is to escape the *current* process, whether it happens to be the LXC
monitor or not, into the / cgroups.

In the case of dump, we can't do an lxc_init(), because:

lxc 20160310103501.547 ERROR    lxc_commands - commands.c:lxc_cmd_init:993 - ##
lxc 20160310103501.547 ERROR    lxc_commands - commands.c:lxc_cmd_init:994 - # The container appears to be already running!
lxc 20160310103501.547 ERROR    lxc_commands - commands.c:lxc_cmd_init:995 - ##

We don't want to make this a command to send to the handler, because again,
cgroup_escape() is intended to escape the *current* task to the root
cgroups.

So, let's just have cgroup_escape() build its own handler when required.

Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>


  Commit: 1a4faf5165cea79d56436a66acd64794c71b901d
      https://github.com/lxc/lxc/commit/1a4faf5165cea79d56436a66acd64794c71b901d
  Author: Serge Hallyn <serge at hallyn.com>
  Date:   2016-03-10 (Thu, 10 Mar 2016)

  Changed paths:
    M src/lxc/cgfsng.c
    M src/lxc/cgroup.h
    M src/lxc/criu.c
    M src/lxc/criu.h

  Log Message:
  -----------
  Merge pull request #889 from tych0/cgfsng-fixes

Cgfsng fixes


Compare: https://github.com/lxc/lxc/compare/ef37205707c3...1a4faf5165ce