[CRIU] [PATCH 4/5] net: add --macvlan-pair rewriting option

[Tycho Andersen]

On Wed, Jun 15, 2016 at 03:03:02PM +0300, Pavel Emelyanov wrote:
> Would you also add RPC bits for the new option?
> 
> > diff --git a/Documentation/criu.txt b/Documentation/criu.txt
> > index 55f05c0..9a96502 100644
> > --- a/Documentation/criu.txt
> > +++ b/Documentation/criu.txt
> > @@ -354,6 +354,10 @@ migrated to a less capable processor and one need to *restore*
> >  this application, by default *criu* will refuse to proceed without
> >  relaxing capability with *--cpu-cap*=*none* parameter.
> >  
> > +*--macvlan-pair* '<IN>'*=*'<OUT>'::
> > +    Similar to *--veth-pair*, except '<OUT>' is the interface to attach the
> 
> OUT is the interface __index__, the --veth-pair works on names (IIRC).

It's the same with macvlan, we convert it to an ifindex in
macvlan_pair_add for use with IFLA_LINK since we're still in the
host's netns at that point.

> > +    macvlan device to.
> > +
> >  *check*
> >  ~~~~~~~
> >  Checks whether the kernel supports the features that *criu* needs to
> > diff --git a/criu/crtools.c b/criu/crtools.c
> > index a6d5d94..d989523 100644
> > --- a/criu/crtools.c
> > +++ b/criu/crtools.c
> > @@ -324,6 +325,7 @@ int main(int argc, char *argv[], char *envp[])
> >  		{ "cgroup-props",		required_argument,	0, 1080	},
> >  		{ "cgroup-props-file",		required_argument,	0, 1081	},
> >  		{ "cgroup-dump-controller",	required_argument,	0, 1082	},
> > +		{ "veth-pair",			required_argument,	0, 1083	},
> 
> We already have the --veth-pair one :)

Hmm. A rebase gone bad I think :(. Thanks for catching this.

Tycho

> >  		{ },
> >  	};
> >  
>