Re: [Xen-devel] [PATCH v2 14/23] acpi: Move ACPI code to tools/libacpi

[Shannon Zhao <zhaoshenglong@xxxxxxxxxx>]

Hi,

On 2016/8/5 5:06, Boris Ostrovsky wrote:
> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
> Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
> ---
> v2:
> * Minor cleanup of hvmloader's Makefile
> 
>  tools/firmware/hvmloader/Makefile                          | 14 
> ++++++++------
>  tools/firmware/hvmloader/ovmf.c                            |  2 +-
>  tools/{firmware/hvmloader/acpi => libacpi}/Makefile        |  2 +-
>  tools/{firmware/hvmloader/acpi => libacpi}/README          |  0
>  tools/{firmware/hvmloader/acpi => libacpi}/acpi2_0.h       |  0
>  tools/{firmware/hvmloader/acpi => libacpi}/build.c         |  0
>  tools/{firmware/hvmloader/acpi => libacpi}/dsdt.asl        |  0
>  tools/{firmware/hvmloader/acpi => libacpi}/libacpi.h       |  0
>  tools/{firmware/hvmloader/acpi => libacpi}/mk_dsdt.c       |  0
>  tools/{firmware/hvmloader/acpi => libacpi}/ssdt_pm.asl     |  0
>  tools/{firmware/hvmloader/acpi => libacpi}/ssdt_s3.asl     |  0
>  tools/{firmware/hvmloader/acpi => libacpi}/ssdt_s4.asl     |  0
>  tools/{firmware/hvmloader/acpi => libacpi}/ssdt_tpm.asl    |  0
>  tools/{firmware/hvmloader/acpi => libacpi}/static_tables.c |  0
>  tools/{firmware/hvmloader/acpi => libacpi}/x86.h           |  0
>  15 files changed, 10 insertions(+), 8 deletions(-)
>  rename tools/{firmware/hvmloader/acpi => libacpi}/Makefile (98%)
>  rename tools/{firmware/hvmloader/acpi => libacpi}/README (100%)
>  rename tools/{firmware/hvmloader/acpi => libacpi}/acpi2_0.h (100%)
>  rename tools/{firmware/hvmloader/acpi => libacpi}/build.c (100%)
>  rename tools/{firmware/hvmloader/acpi => libacpi}/dsdt.asl (100%)
>  rename tools/{firmware/hvmloader/acpi => libacpi}/libacpi.h (100%)
>  rename tools/{firmware/hvmloader/acpi => libacpi}/mk_dsdt.c (100%)
>  rename tools/{firmware/hvmloader/acpi => libacpi}/ssdt_pm.asl (100%)
>  rename tools/{firmware/hvmloader/acpi => libacpi}/ssdt_s3.asl (100%)
>  rename tools/{firmware/hvmloader/acpi => libacpi}/ssdt_s4.asl (100%)
>  rename tools/{firmware/hvmloader/acpi => libacpi}/ssdt_tpm.asl (100%)
>  rename tools/{firmware/hvmloader/acpi => libacpi}/static_tables.c (100%)
>  rename tools/{firmware/hvmloader/acpi => libacpi}/x86.h (100%)
> 
> diff --git a/tools/firmware/hvmloader/Makefile 
> b/tools/firmware/hvmloader/Makefile
> index db64a61..694d9f1 100644
> --- a/tools/firmware/hvmloader/Makefile
> +++ b/tools/firmware/hvmloader/Makefile
> @@ -20,9 +20,6 @@
>  XEN_ROOT = $(CURDIR)/../../..
>  include $(XEN_ROOT)/tools/firmware/Rules.mk
>  
> -export ACPI_BUILD_DIR=$(shell pwd)
> -SUBDIRS := acpi
> -
>  # The HVM loader is started in 32-bit mode at the address below:
>  LOADADDR = 0x100000
>  
> @@ -67,16 +64,20 @@ ROMS += $(ROMBIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) 
> $(ETHERBOOT_ROMS)
>  endif
>  
>  .PHONY: all
> -all: subdirs-all
> +all: acpi subdirs-all
>       $(MAKE) hvmloader
>  
> +.PHONY: acpi
> +acpi:
> +     $(MAKE) -C $(ACPI_PATH)  ACPI_BUILD_DIR=$(CURDIR)
> +
>  rombios.o: roms.inc
>  smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(SMBIOS_REL_DATE)\""
>  
> -ACPI_PATH = ./acpi
> +ACPI_PATH = ../../libacpi
>  ACPI_FILES = dsdt_anycpu.c dsdt_15cpu.c dsdt_anycpu_qemu_xen.c
>  ACPI_OBJS = $(patsubst %.c,%.o,$(ACPI_FILES)) build.o static_tables.o
> -$(ACPI_OBJS): CFLAGS += -I. -DSTDUTILS=\"../util.h\"
> +$(ACPI_OBJS): CFLAGS += -I. -DSTDUTILS=\"$(CURDIR)/util.h\"

Not sure if I do something wrong, but I got bellow errors when compiling
this series on x86 just using "./autogen.sh;./configure;make tools".

In file included from tcgbios.c:26:0:
../util.h:4:39: fatal error: ../hvmloader/acpi/acpi2_0.h: No such file
or directory
 #include "../hvmloader/acpi/acpi2_0.h"

In file included from tpm_drivers.c:24:0:
../util.h:4:39: fatal error: ../hvmloader/acpi/acpi2_0.h: No such file
or directory
 #include "../hvmloader/acpi/acpi2_0.h"

Thanks,
-- 
Shannon


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel