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

[George Dunlap <george.dunlap@xxxxxxxxxxxxx>]

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
> > +else
> > +CONFIG_QEMU ?= $(QEMU_REMOTE)
> > +endif
> Perhaps this could be better written as
>    CONFIG_QEMU ?= $(or $(wildcard $(XEN_ROOT)/tools/qemu-xen-traditional),\
>                        $(QEMU_REMOTE))
I'll give that a try.

> ?
>
> > +ifneq (,$(wildcard $(XEN_ROOT)/tools/qemu-xen))
> > +QEMU_UPSTREAM_URL ?= $(XEN_ROOT)/tools/qemu-xen
> > +endif
> 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.
 -George

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel