From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
To: xen-devel@lists.xen.org
Cc: wei.liu2@citrix.com, andrew.cooper3@citrix.com,
ian.jackson@eu.citrix.com, julien.grall@arm.com,
jbeulich@suse.com, zhaoshenglong@huawei.com,
boris.ostrovsky@oracle.com, roger.pau@citrix.com
Subject: [PATCH v2 14/23] acpi: Move ACPI code to tools/libacpi
Date: Thu, 4 Aug 2016 17:06:42 -0400 [thread overview]
Message-ID: <1470344811-14225-15-git-send-email-boris.ostrovsky@oracle.com> (raw)
In-Reply-To: <1470344811-14225-1-git-send-email-boris.ostrovsky@oracle.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
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\"
CFLAGS += -I$(ACPI_PATH)
vpath build.c $(ACPI_PATH)
vpath static_tables.c $(ACPI_PATH)
@@ -118,6 +119,7 @@ endif
clean: subdirs-clean
rm -f roms.inc roms.inc.new acpi.h
rm -f hvmloader hvmloader.tmp *.o $(DEPS)
+ $(MAKE) -C $(ACPI_PATH) ACPI_BUILD_DIR=$(CURDIR) clean
.PHONY: distclean
distclean: clean
diff --git a/tools/firmware/hvmloader/ovmf.c b/tools/firmware/hvmloader/ovmf.c
index b4bcc93..7878276 100644
--- a/tools/firmware/hvmloader/ovmf.c
+++ b/tools/firmware/hvmloader/ovmf.c
@@ -23,7 +23,7 @@
#include "config.h"
#include "smbios_types.h"
-#include "acpi/libacpi.h"
+#include "libacpi.h"
#include "apic_regs.h"
#include "../rombios/config.h"
#include "util.h"
diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/libacpi/Makefile
similarity index 98%
rename from tools/firmware/hvmloader/acpi/Makefile
rename to tools/libacpi/Makefile
index 6937ff4..816322f 100644
--- a/tools/firmware/hvmloader/acpi/Makefile
+++ b/tools/libacpi/Makefile
@@ -12,7 +12,7 @@
# NU Lesser General Public License for more details.
#
-XEN_ROOT = $(CURDIR)/../../../..
+XEN_ROOT = $(CURDIR)/../..
include $(XEN_ROOT)/tools/firmware/Rules.mk
MK_DSDT = $(ACPI_BUILD_DIR)/mk_dsdt
diff --git a/tools/firmware/hvmloader/acpi/README b/tools/libacpi/README
similarity index 100%
rename from tools/firmware/hvmloader/acpi/README
rename to tools/libacpi/README
diff --git a/tools/firmware/hvmloader/acpi/acpi2_0.h b/tools/libacpi/acpi2_0.h
similarity index 100%
rename from tools/firmware/hvmloader/acpi/acpi2_0.h
rename to tools/libacpi/acpi2_0.h
diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/libacpi/build.c
similarity index 100%
rename from tools/firmware/hvmloader/acpi/build.c
rename to tools/libacpi/build.c
diff --git a/tools/firmware/hvmloader/acpi/dsdt.asl b/tools/libacpi/dsdt.asl
similarity index 100%
rename from tools/firmware/hvmloader/acpi/dsdt.asl
rename to tools/libacpi/dsdt.asl
diff --git a/tools/firmware/hvmloader/acpi/libacpi.h b/tools/libacpi/libacpi.h
similarity index 100%
rename from tools/firmware/hvmloader/acpi/libacpi.h
rename to tools/libacpi/libacpi.h
diff --git a/tools/firmware/hvmloader/acpi/mk_dsdt.c b/tools/libacpi/mk_dsdt.c
similarity index 100%
rename from tools/firmware/hvmloader/acpi/mk_dsdt.c
rename to tools/libacpi/mk_dsdt.c
diff --git a/tools/firmware/hvmloader/acpi/ssdt_pm.asl b/tools/libacpi/ssdt_pm.asl
similarity index 100%
rename from tools/firmware/hvmloader/acpi/ssdt_pm.asl
rename to tools/libacpi/ssdt_pm.asl
diff --git a/tools/firmware/hvmloader/acpi/ssdt_s3.asl b/tools/libacpi/ssdt_s3.asl
similarity index 100%
rename from tools/firmware/hvmloader/acpi/ssdt_s3.asl
rename to tools/libacpi/ssdt_s3.asl
diff --git a/tools/firmware/hvmloader/acpi/ssdt_s4.asl b/tools/libacpi/ssdt_s4.asl
similarity index 100%
rename from tools/firmware/hvmloader/acpi/ssdt_s4.asl
rename to tools/libacpi/ssdt_s4.asl
diff --git a/tools/firmware/hvmloader/acpi/ssdt_tpm.asl b/tools/libacpi/ssdt_tpm.asl
similarity index 100%
rename from tools/firmware/hvmloader/acpi/ssdt_tpm.asl
rename to tools/libacpi/ssdt_tpm.asl
diff --git a/tools/firmware/hvmloader/acpi/static_tables.c b/tools/libacpi/static_tables.c
similarity index 100%
rename from tools/firmware/hvmloader/acpi/static_tables.c
rename to tools/libacpi/static_tables.c
diff --git a/tools/firmware/hvmloader/acpi/x86.h b/tools/libacpi/x86.h
similarity index 100%
rename from tools/firmware/hvmloader/acpi/x86.h
rename to tools/libacpi/x86.h
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-08-04 21:06 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-04 21:06 [PATCH v2 00/23] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
2016-08-04 21:06 ` [PATCH v2 01/23] hvmloader: Provide hvmloader_acpi_build_tables() Boris Ostrovsky
2016-08-04 21:06 ` [PATCH v2 02/23] acpi/hvmloader: Allow acpi_build_tables() callers specify acpi_info values Boris Ostrovsky
2016-08-09 12:29 ` Jan Beulich
2016-08-04 21:06 ` [PATCH v2 03/23] acpi/hvmloader: Initialize vm_gid data outside ACPI code Boris Ostrovsky
2016-08-09 13:11 ` Jan Beulich
2016-08-09 13:50 ` Boris Ostrovsky
2016-08-09 14:31 ` Jan Beulich
2016-08-09 14:47 ` Andrew Cooper
2016-08-09 15:09 ` Boris Ostrovsky
2016-08-09 15:13 ` Andrew Cooper
2016-08-09 15:15 ` Jan Beulich
2016-08-04 21:06 ` [PATCH v2 04/23] acpi/hvmloader: Decide which SSDTs to install in hvmloader Boris Ostrovsky
2016-08-04 21:06 ` [PATCH v2 05/23] acpi/hvmloader: Move passthrough initialization from ACPI code Boris Ostrovsky
2016-08-09 13:14 ` Jan Beulich
2016-08-04 21:06 ` [PATCH v2 06/23] acpi/hvmloader: Collect processor and NUMA info in hvmloader Boris Ostrovsky
2016-08-09 13:27 ` Jan Beulich
2016-08-09 13:43 ` Boris Ostrovsky
2016-08-09 13:57 ` Boris Ostrovsky
2016-08-09 14:44 ` Jan Beulich
2016-08-04 21:06 ` [PATCH v2 07/23] acpi/hvmloader: Set TIS header address " Boris Ostrovsky
2016-08-04 21:06 ` [PATCH v2 08/23] acpi/hvmloader: Make providing IOAPIC in MADT optional Boris Ostrovsky
2016-08-04 21:06 ` [PATCH v2 09/23] acpi/hvmloader: Build WAET optionally Boris Ostrovsky
2016-08-09 13:29 ` Jan Beulich
2016-08-09 13:51 ` Boris Ostrovsky
2016-08-09 14:48 ` Jan Beulich
2016-08-09 15:13 ` Boris Ostrovsky
2016-08-09 15:17 ` Jan Beulich
2016-08-04 21:06 ` [PATCH v2 10/23] acpi/hvmloader: Replace mem_alloc() and virt_to_phys() with memory ops Boris Ostrovsky
2016-08-09 13:36 ` Jan Beulich
2016-08-04 21:06 ` [PATCH v2 11/23] acpi/hvmloader: Translate all addresses when assigning addresses in ACPI tables Boris Ostrovsky
2016-08-04 21:06 ` [PATCH v2 12/23] acpi/hvmloader: Link ACPI object files directly Boris Ostrovsky
2016-08-10 13:17 ` Jan Beulich
2016-08-10 14:17 ` Boris Ostrovsky
2016-08-04 21:06 ` [PATCH v2 13/23] acpi/hvmloader: Include file/paths adjustments Boris Ostrovsky
2016-08-10 13:30 ` Jan Beulich
2016-08-10 14:20 ` Boris Ostrovsky
2016-08-04 21:06 ` Boris Ostrovsky [this message]
2016-08-05 10:43 ` [PATCH v2 14/23] acpi: Move ACPI code to tools/libacpi Jan Beulich
2016-08-05 11:01 ` Wei Liu
2016-08-16 8:13 ` Shannon Zhao
2016-08-16 8:29 ` Wei Liu
2016-08-16 9:36 ` Shannon Zhao
2016-08-16 9:44 ` Wei Liu
2016-08-04 21:06 ` [PATCH v2 15/23] x86: Add more checks verifying that PIT/PIC/IOAPIC are emulated Boris Ostrovsky
2016-08-04 21:06 ` [PATCH v2 16/23] x86: Allow LAPIC-only emulation_flags for HVM guests Boris Ostrovsky
2016-08-04 21:06 ` [PATCH v2 17/23] libacpi: Build DSDT for PVH guests Boris Ostrovsky
2016-08-10 13:50 ` Jan Beulich
2016-08-04 21:06 ` [PATCH v2 18/23] libxc/libxl: Allow multiple ACPI modules Boris Ostrovsky
2016-08-11 16:36 ` Wei Liu
2016-08-04 21:06 ` [PATCH v2 19/23] libxl/acpi: Add ACPI e820 entry Boris Ostrovsky
2016-08-11 16:36 ` Wei Liu
2016-08-04 21:06 ` [PATCH v2 20/23] libxl/pvhv2: Include APIC page in MMIO hole for PVHv2 guests Boris Ostrovsky
2016-08-04 21:06 ` [PATCH v2 21/23] ilibxl: Initialize domain build info before calling libxl__domain_make Boris Ostrovsky
2016-08-04 21:06 ` [PATCH v2 22/23] libxl/acpi: Build ACPI tables for HVMlite guests Boris Ostrovsky
2016-08-09 14:46 ` Jan Beulich
2016-08-09 15:07 ` Boris Ostrovsky
2016-08-11 16:36 ` Wei Liu
2016-08-11 18:08 ` Boris Ostrovsky
2016-08-04 21:06 ` [PATCH v2 23/23] libxc/xc_dom_core: Copy ACPI tables to guest space Boris Ostrovsky
2016-08-11 16:40 ` Wei Liu
2016-08-11 18:16 ` Boris Ostrovsky
2016-08-11 18:19 ` Andrew Cooper
2016-08-11 18:34 ` Boris Ostrovsky
2016-08-15 7:48 ` Shannon Zhao
2016-08-15 12:49 ` Boris Ostrovsky
2016-08-16 1:07 ` Shannon Zhao
2016-08-15 6:37 ` [PATCH v2 00/23] Make ACPI builder available to components other than hvmloader Shannon Zhao
2016-08-15 12:43 ` Boris Ostrovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1470344811-14225-15-git-send-email-boris.ostrovsky@oracle.com \
--to=boris.ostrovsky@oracle.com \
--cc=andrew.cooper3@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=jbeulich@suse.com \
--cc=julien.grall@arm.com \
--cc=roger.pau@citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
--cc=zhaoshenglong@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).