George Dunlap
2011-May-09 11:48 UTC
[Xen-devel] [PATCH] [PATCH v2] build: Don''t fetch tools/ioemu-dir unless needed
c/s 18482 made both stubdom and tools dependent on tools/ioemu-dir to fix a race condition where both build paths might try to fetch qemu in parallel. But this means that even if you build the tools with CONFIG_IOEMU=n, qemu is still fetched first. This patch causes tools/ioemu-dir to be a dependency for tools only if CONFIG_IOEMU is enabled. It''s still unconditional for stubdoms, as it doesn''t make much sense to build stubdoms without it. Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com> diff -r 4b0692880dfa -r cf5d1c7bbbfd Makefile --- a/Makefile Thu May 05 17:40:34 2011 +0100 +++ b/Makefile Mon May 09 12:44:09 2011 +0100 @@ -13,6 +13,11 @@ SUBARCH := $(subst x86_32,i386,$(XEN_TAR export XEN_TARGET_ARCH SUBARCH XEN_SYSTYPE include buildconfigs/Rules.mk +# If building with CONFIG_IOEMU, get ioemu-dir before building +# tools or stubdom (or they may race) +SHARED_SUBDIRS-y :+SHARED_SUBDIRS-$(CONFIG_IOEMU) += tools/ioemu-dir + # build and install everything into the standard system directories .PHONY: install install: install-xen install-kernels install-tools install-stubdom install-docs @@ -66,7 +71,7 @@ install-xen: $(MAKE) -C xen install .PHONY: install-tools -install-tools: tools/ioemu-dir +install-tools: $(SHARED_SUBDIRS-y) $(MAKE) -C tools install .PHONY: install-kernels @@ -74,6 +79,7 @@ install-kernels: for i in $(XKERNELS) ; do $(MAKE) $$i-install || exit 1; done .PHONY: install-stubdom +# NB: depend on tools/ioemu-dir unconditionally for stubdoms install-stubdom: tools/ioemu-dir install-tools $(MAKE) -C stubdom install ifeq (x86_64,$(XEN_TARGET_ARCH)) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Jackson
2011-May-24 16:16 UTC
Re: [Xen-devel] [PATCH] [PATCH v2] build: Don''t fetch tools/ioemu-dir unless needed
George Dunlap writes ("[Xen-devel] [PATCH] [PATCH v2] build: Don''t
fetch tools/ioemu-dir unless needed"):> c/s 18482 made both stubdom and tools dependent on tools/ioemu-dir
> to fix a race condition where both build paths might try to fetch
> qemu in parallel. But this means that even if you build the tools
> with CONFIG_IOEMU=n, qemu is still fetched first.
This seems to conflict with 0e9322ece398, which is also a patch of
yours to do apparently the same thing. Was that an earlier version ?
Am I just behind the times ? There may have been discussion of this
on the list, that I missed, in which case sorry ....
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Keir Fraser
2011-May-24 18:00 UTC
Re: [Xen-devel] [PATCH] [PATCH v2] build: Don''t fetch tools/ioemu-dir unless needed
On 24/05/2011 17:16, "Ian Jackson" <Ian.Jackson@eu.citrix.com> wrote:> George Dunlap writes ("[Xen-devel] [PATCH] [PATCH v2] build: Don''t fetch > tools/ioemu-dir unless needed"): >> c/s 18482 made both stubdom and tools dependent on tools/ioemu-dir >> to fix a race condition where both build paths might try to fetch >> qemu in parallel. But this means that even if you build the tools >> with CONFIG_IOEMU=n, qemu is still fetched first. > > This seems to conflict with 0e9322ece398, which is also a patch of > yours to do apparently the same thing. Was that an earlier version ? > Am I just behind the times ? There may have been discussion of this > on the list, that I missed, in which case sorry ....I picked up George''s patch and ''reinterpreted'' it. -- Keir> Ian. > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel