[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Xen-devel] [PATCH 1/2] make: Check tools/qemu-xen[-traditional] for qemu before downloading

On 07/08/2014 10:57 AM, Ian Jackson wrote:
George Dunlap writes ("[PATCH 1/2] make: Check tools/qemu-xen[-traditional] for qemu 
before downloading"):
Currently xen, qemu-xen, and qemu-xen-traditional are kept in separate
repositories, but when we release them as a tarball, qemu-xen and
qemu-xen-traditional are in-lined into the tools/ directory.
+# Specify which qemu-dm to use. This may be `ioemu' to use the old
+# Mercurial in-tree version, or a local directory, or a git URL.
+# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
+ifneq (,$(wildcard $(XEN_ROOT)/tools/qemu-xen-traditional))
+CONFIG_QEMU ?= $(XEN_ROOT)/tools/qemu-xen-traditional

Perhaps this could be better written as
   CONFIG_QEMU ?= $(or $(wildcard $(XEN_ROOT)/tools/qemu-xen-traditional),\

I'll give that a try.


+ifneq (,$(wildcard $(XEN_ROOT)/tools/qemu-xen))
+QEMU_UPSTREAM_URL ?= $(XEN_ROOT)/tools/qemu-xen

I'm tempted to complain about the repetition here.  Perhaps
   QEMU_UPSTREAM_INTREE ?= $(XEN_ROOT)/tools/qemu-xen
and use it twice ?

Oh, you mean duplicating the path for the inlined repo. Yeah, I could do something like that.

I was thinking about adding a CONFIG_QEMU_UPSTREAM option, so that _URL could actually mean URL, rather than sometimes meaning URL and sometimes meaning PATH. But I thought that might be too much change to backport.


Xen-devel mailing list



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.