From b0f69ec5c71de1248d915c193b57c43e786857dd Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 6 Aug 2013 11:32:32 +0100 Subject: 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 Acked-by: Ian Jackson [ ijc -- trivial conflicts in Tools.mk.in and tools/configure.ac. Reran autogen.sh ] --- tools/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/Makefile') diff --git a/tools/Makefile b/tools/Makefile index 381af04849..6fa589b09c 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -28,7 +28,7 @@ SUBDIRS-$(CONFIG_Linux) += libvchan # do not recurse in to a dir we are about to delete ifneq "$(MAKECMDGOALS)" "distclean" -SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-traditional-dir +SUBDIRS-$(CONFIG_QEMU_TRAD) += qemu-xen-traditional-dir SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir endif -- cgit v1.2.3