[CRIU] [PATCH] ia32: Clearify if 32bit C/R is compile-disabled

Andrei Vagin avagin at virtuozzo.com
Fri Apr 21 17:07:28 PDT 2017


Accepted, thanks!

On Fri, Apr 21, 2017 at 02:15:05PM +0300, Dmitry Safonov wrote:
> Point that ia32 C/R was disabled due to missed packages.
> 
> Signed-off-by: Dmitry Safonov <dsafonov at virtuozzo.com>
> ---
>  Makefile.config | 3 +++
>  criu/cr-check.c | 4 ++++
>  2 files changed, 7 insertions(+)
> 
> diff --git a/Makefile.config b/Makefile.config
> index 50516109a7e3..0dd9d0433a18 100644
> --- a/Makefile.config
> +++ b/Makefile.config
> @@ -24,6 +24,9 @@ ifeq ($(SRCARCH),x86)
>  ifeq ($(call try-cc,$(FEATURE_TEST_X86_COMPAT),-m32),true)
>          export CONFIG_COMPAT := y
>          FEATURE_DEFINES	+= -DCONFIG_COMPAT
> +else
> +        $(info Note: Building without ia32 C/R, missed packages:)
> +        $(info $(info)      libc6-dev-i386, gcc-multilib)
>  endif
>  endif
>  
> diff --git a/criu/cr-check.c b/criu/cr-check.c
> index a91eac6df6d2..1a1cd80ebe0e 100644
> --- a/criu/cr-check.c
> +++ b/criu/cr-check.c
> @@ -1058,9 +1058,13 @@ static int check_loginuid(void)
>  
>  static int check_compat_cr(void)
>  {
> +#ifdef CONFIG_COMPAT
>  	if (kdat_compat_sigreturn_test())
>  		return 0;
>  	pr_warn("compat_cr is not supported. Requires kernel >= v4.9\n");
> +#else
> +	pr_warn("CRIU built without CONFIG_COMPAT - can't C/R ia32\n");
> +#endif
>  	return -1;
>  }
>  
> -- 
> 2.12.2
> 
> _______________________________________________
> CRIU mailing list
> CRIU at openvz.org
> https://lists.openvz.org/mailman/listinfo/criu


More information about the CRIU mailing list