From mboxrd@z Thu Jan  1 00:00:00 1970
From: George Dunlap <george.dunlap@eu.citrix.com>
Subject: Re: [PATCH 1/2] make: Check
 tools/qemu-xen[-traditional] for qemu before downloading
Date: Tue, 8 Jul 2014 11:57:54 +0100
Message-ID: <53BBCEB2.6050504@eu.citrix.com>
References: <1404317712-4191-1-git-send-email-george.dunlap@eu.citrix.com>
	<21435.49304.344637.941064@mariner.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <21435.49304.344637.941064@mariner.uk.xensource.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Ian Jackson <Ian.Jackson@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>, Jan Beulich <jbeulich@suse.com>, xen-devel@lists.xen.org
List-Id: xen-devel@lists.xenproject.org

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