Re: [Xen-devel] [PATCH RFC 15/20] acpi: Move ACPI code to xen/common/libacpi

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 06.04.16 at 03:25, <boris.ostrovsky@xxxxxxxxxx> wrote:
>  .gitignore                                                        | 8 
> ++++----
>  tools/firmware/hvmloader/Makefile                                 | 3 +--
>  tools/firmware/hvmloader/smbios.c                                 | 1 +
>  tools/firmware/rombios/32bit/Makefile                             | 2 +-
>  tools/firmware/rombios/32bit/tcgbios/Makefile                     | 2 +-
>  {tools/firmware/hvmloader/acpi => xen/common/libacpi}/Makefile    | 6 +++---
>  {tools/firmware/hvmloader/acpi => xen/common/libacpi}/README      | 0
>  {tools/firmware/hvmloader/acpi => xen/common/libacpi}/acpi2_0.h   | 0
>  {tools/firmware/hvmloader/acpi => xen/common/libacpi}/build.c     | 0
>  {tools/firmware/hvmloader/acpi => xen/common/libacpi}/dsdt.asl    | 0
>  {tools/firmware/hvmloader/acpi => xen/common/libacpi}/mk_dsdt.c   | 0
>  {tools/firmware/hvmloader/acpi => xen/common/libacpi}/ssdt_pm.asl | 0
>  {tools/firmware/hvmloader/acpi => xen/common/libacpi}/ssdt_s3.asl | 0
>  {tools/firmware/hvmloader/acpi => xen/common/libacpi}/ssdt_s4.asl | 0
>  .../firmware/hvmloader/acpi => xen/common/libacpi}/ssdt_tpm.asl   | 0
>  .../hvmloader/acpi => xen/common/libacpi}/static_tables.c         | 0
>  {tools/firmware/hvmloader/acpi => xen/common/libacpi}/x86.h       | 0
>  17 files changed, 11 insertions(+), 11 deletions(-)

As mentioned before, new placement subject to determination
whether this is to eventually be used by the hypervisor.

> --- a/tools/firmware/hvmloader/smbios.c
> +++ b/tools/firmware/hvmloader/smbios.c
> @@ -24,6 +24,7 @@
>  #include <xen/version.h>
>  #include "smbios_types.h"
>  #include "util.h"
> +#include "acpi2_0.h"
>  #include "hypercall.h"
>  #include <xen/hvm/hvm_xs_strings.h>

This change doesn't seem to belong here (since you only move
around files, and adjustments get done solely to makefiles).

> --- a/tools/firmware/hvmloader/acpi/Makefile
> +++ b/xen/common/libacpi/Makefile
> @@ -14,13 +14,13 @@
>  # this program; If not, see <http://www.gnu.org/licenses/>.
>  #
>  
> -XEN_ROOT = $(CURDIR)/../../../..
> -include $(XEN_ROOT)/tools/firmware/Rules.mk
> +XEN_ROOT = $(CURDIR)/../../..
> +include $(XEN_ROOT)/Config.mk
>  
>  C_SRC = build.c dsdt_anycpu.c dsdt_15cpu.c static_tables.c 
> dsdt_anycpu_qemu_xen.c
>  OBJS  = $(patsubst %.c,%.o,$(C_SRC))
>  
> -CFLAGS += $(CFLAGS_xeninclude)
> +CFLAGS_xeninclude = -I$(XEN_ROOT)/tools/include

Where would this now get consumed? This appears to be a tools/
only setting, which should thus no longer be needed here.

Jan


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