Re: [kvm-unit-tests PATCH] x86: fix i386 build by omitting vmware_backdoors

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 10/05/2018 18:42, Radim Krčmář wrote:
> lib/x86/usermode.c and its only user (x86/vmware_backdoors.c) contain
> x86_64 assembly.
> 
> Adding i386 version could be useful for lib/x86/usermode.c, but this
> patch just doesn't compile nor run them on i386.
> 
> Reported-by: Po-Hsu Lin <po-hsu.lin@xxxxxxxxxxxxx>
> Signed-off-by: Radim Krčmář <rkrcmar@xxxxxxxxxx>
> ---
>  x86/Makefile.common | 2 --
>  x86/Makefile.x86_64 | 2 ++
>  x86/unittests.cfg   | 1 +
>  3 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/x86/Makefile.common b/x86/Makefile.common
> index f984acbf83dd..4ddbd19258c2 100644
> --- a/x86/Makefile.common
> +++ b/x86/Makefile.common
> @@ -19,7 +19,6 @@ cflatobjs += lib/x86/desc.o
>  cflatobjs += lib/x86/isr.o
>  cflatobjs += lib/x86/acpi.o
>  cflatobjs += lib/x86/stack.o
> -cflatobjs += lib/x86/usermode.o
>  cflatobjs += lib/x86/fault_test.o
>  cflatobjs += lib/x86/delay.o
>  
> @@ -57,7 +56,6 @@ tests-common = $(TEST_DIR)/vmexit.flat $(TEST_DIR)/tsc.flat \
>                 $(TEST_DIR)/init.flat $(TEST_DIR)/smap.flat \
>                 $(TEST_DIR)/hyperv_synic.flat $(TEST_DIR)/hyperv_stimer.flat \
>                 $(TEST_DIR)/hyperv_connections.flat \
> -               $(TEST_DIR)/vmware_backdoors.flat\
>  
>  ifdef API
>  tests-api = api/api-sample api/dirty-log api/dirty-log-perf
> diff --git a/x86/Makefile.x86_64 b/x86/Makefile.x86_64
> index af2f1dd8ce55..51f9b804a747 100644
> --- a/x86/Makefile.x86_64
> +++ b/x86/Makefile.x86_64
> @@ -5,6 +5,7 @@ COMMON_CFLAGS += -mno-red-zone -mno-sse -mno-sse2
>  
>  cflatobjs += lib/x86/setjmp64.o
>  cflatobjs += lib/x86/intel-iommu.o
> +cflatobjs += lib/x86/usermode.o
>  
>  tests = $(TEST_DIR)/access.flat $(TEST_DIR)/apic.flat \
>  	  $(TEST_DIR)/emulator.flat $(TEST_DIR)/idt_test.flat \
> @@ -17,6 +18,7 @@ tests += $(TEST_DIR)/svm.flat
>  tests += $(TEST_DIR)/vmx.flat
>  tests += $(TEST_DIR)/tscdeadline_latency.flat
>  tests += $(TEST_DIR)/intel-iommu.flat
> +tests += $(TEST_DIR)/vmware_backdoors.flat
>  
>  include $(SRCDIR)/$(TEST_DIR)/Makefile.common
>  
> diff --git a/x86/unittests.cfg b/x86/unittests.cfg
> index dd4e6e5e240b..a61df879990e 100644
> --- a/x86/unittests.cfg
> +++ b/x86/unittests.cfg
> @@ -158,6 +158,7 @@ check = /proc/sys/kernel/nmi_watchdog=0
>  [vmware_backdoors]
>  file = vmware_backdoors.flat
>  extra_params = -machine vmport=on
> +arch = x86_64
>  
>  [port80]
>  file = port80.flat
> 

Queued, thanks (not pushed yet).

Paolo



[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux