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

[Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>]

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))
?

> +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 ?

Ian.

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