diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2013-08-06 11:32:32 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-08-21 10:32:42 +0100 |
| commit | b0f69ec5c71de1248d915c193b57c43e786857dd (patch) | |
| tree | 3e1d239ee2b68d08b80fe25385da22e71d4c6bd3 /stubdom/Makefile | |
| parent | 874f76a86adf1da70921884f5a868eec105cf8cd (diff) | |
| download | xen-b0f69ec5c71de1248d915c193b57c43e786857dd.tar.gz xen-b0f69ec5c71de1248d915c193b57c43e786857dd.tar.bz2 xen-b0f69ec5c71de1248d915c193b57c43e786857dd.zip | |
tools: Make qemu-xen-traditional build optional.
Now that we have upstream qemu people may want to avoid building this extra
code.
There is a little bit of trickery in stubdom/configure.ac to ensure that the
ioemu stubdom is only built if qemu-traditional is enabled.
libxl will return an error if a caller tries to build a domain using
qemu-xen-traditional when this support was disabled at build time. Since
qemu-xen-traditional has been historically tightly bound to the Xen releases I
don't see any value in supporting "3rd party" provision of
qemu-xen-traditional.
We also do not want/need this on ARM therefore default is on for x86 and off
otherwise.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
[ ijc -- trivial conflicts in Tools.mk.in and tools/configure.ac.
Reran autogen.sh ]
Diffstat (limited to 'stubdom/Makefile')
| -rw-r--r-- | stubdom/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/stubdom/Makefile b/stubdom/Makefile index 35295f0bce..19f2228951 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -264,6 +264,10 @@ $(CROSS_ROOT): cross-newlib cross-zlib cross-libpci QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo "$(CONFIG_QEMU)"; else echo .; fi) +ifneq ($(filter ioemu,$(STUBDOM_TARGETS)),) +IOEMU_LINKFARM_TARGET := ioemu/linkfarm.stamp +endif + ifeq ($(QEMU_ROOT),.) $(XEN_ROOT)/tools/qemu-xen-traditional-dir: $(MAKE) DESTDIR= -C $(XEN_ROOT)/tools qemu-xen-traditional-dir-find @@ -289,7 +293,7 @@ ioemu/linkfarm.stamp: touch ioemu/linkfarm.stamp endif -mk-headers-$(XEN_TARGET_ARCH): ioemu/linkfarm.stamp +mk-headers-$(XEN_TARGET_ARCH): $(IOEMU_LINKFARM_TARGET) mkdir -p include/xen && \ ln -sf $(wildcard $(XEN_ROOT)/xen/include/public/*.h) include/xen && \ ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 hvm io xsm) include/xen && \ |