Re: [Minios-devel] [UNIKRAFT PATCH] plat/kvm: Fix build for x86_64

[Costin Lupu <costin.lup@xxxxxxxxx>]

Hi Justin and Santiago,

This was broken by `build: Add Arm64 multi-thread support files to build
system`. Please be more careful and also test the build for x86_64
before submitting patches or when reviewing. My recommendation would be
to keep a different Unikraft app configured for x86_64, but using the
same dependencies as you are using for your ARM app. Then it would be
just a matter of running make in your x86_64 app to check whether
everything is ok.

Cheers,
Costin

On 10/29/19 9:19 PM, Mihai Pogonaru wrote:
> We were double adding thread.c and sw_ctx.c to build on x86_64.
> 
> Signed-off-by: Mihai Pogonaru <pogonarumihai@xxxxxxxxx>
> ---
>  plat/kvm/Makefile.uk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/plat/kvm/Makefile.uk b/plat/kvm/Makefile.uk
> index 63bd5b06..5d87352f 100644
> --- a/plat/kvm/Makefile.uk
> +++ b/plat/kvm/Makefile.uk
> @@ -81,8 +81,8 @@ LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += 
> $(UK_PLAT_COMMON_BASE)/arm/time.c|commo
>  LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += 
> $(UK_PLAT_COMMON_BASE)/arm/traps.c|common
>  ifeq ($(CONFIG_HAVE_SCHED),y)
>  LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += 
> $(UK_PLAT_COMMON_BASE)/arm/thread_start64.S|common
> -LIBKVMPLAT_SRCS-y += $(UK_PLAT_COMMON_BASE)/thread.c|common
> -LIBKVMPLAT_SRCS-y += $(UK_PLAT_COMMON_BASE)/sw_ctx.c|common
> +LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += 
> $(UK_PLAT_COMMON_BASE)/thread.c|common
> +LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += 
> $(UK_PLAT_COMMON_BASE)/sw_ctx.c|common
>  endif
>  LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += $(LIBKVMPLAT_BASE)/arm/memory.c|arm
>  LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += $(LIBKVMPLAT_BASE)/arm/entry64.S
> 

_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel