* [PATCH] libacpi: Don't build x86-only AML for ARM64 mk_dsdt
@ 2016-12-20 18:51 Boris Ostrovsky
0 siblings, 0 replies; only message in thread
From: Boris Ostrovsky @ 2016-12-20 18:51 UTC (permalink / raw)
To: xen-devel, julien.grall; +Cc: wei.liu2, Boris Ostrovsky, ian.jackson, jbeulich
Commit d6ac8e22c7c5 ("acpi/x86: define ACPI IO registers for
PVH guests") broke ARM64 build of mk_dsdt.c due to introduction
of XEN_ACPI_CPU_MAP[_LEN] macros that are needed only for x86
guests.
We could fix the build by dealing specifically with those macros
but since post-MADT code is not executed on ARM64 anyway we can
compile it for x86 only.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---
Julien,
Sorry about breakage. I don't have ARM64 build environment for tools
(I do build the hypervisor) --- can you verify that it works for yoU?
tools/libacpi/mk_dsdt.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tools/libacpi/mk_dsdt.c b/tools/libacpi/mk_dsdt.c
index 9421f3f..75c0a97 100644
--- a/tools/libacpi/mk_dsdt.c
+++ b/tools/libacpi/mk_dsdt.c
@@ -109,10 +109,10 @@ static struct option options[] = {
int main(int argc, char **argv)
{
- unsigned int slot, dev, intx, link, cpu, max_cpus;
+ unsigned int cpu, max_cpus;
dm_version dm_version = QEMU_XEN_TRADITIONAL;
-
#if defined(CONFIG_X86)
+ unsigned int slot, dev, intx, link;
max_cpus = HVM_MAX_VCPUS;
#elif defined(CONFIG_ARM_64)
max_cpus = GUEST_MAX_VCPUS;
@@ -242,7 +242,7 @@ int main(int argc, char **argv)
pop_block();
/**** DSDT DefinitionBlock end ****/
return 0;
-#endif
+#else
/* Operation Region 'PRST': bitmask of online CPUs. */
stmt("OperationRegion", "PRST, SystemIO, %#x, %d",
@@ -524,6 +524,7 @@ int main(int argc, char **argv)
/**** DSDT DefinitionBlock end ****/
return 0;
+#endif
}
/*
--
2.7.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-12-20 18:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-20 18:51 [PATCH] libacpi: Don't build x86-only AML for ARM64 mk_dsdt Boris Ostrovsky
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.