From mboxrd@z Thu Jan 1 00:00:00 1970 From: Subject: [PATCH 1/2] Introduce support for upstream qemu in the xen-unstable build system Date: Wed, 7 Sep 2011 15:39:57 +0100 Message-ID: <1315406398-8987-1-git-send-email-stefano.stabellini@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: Stefano Stabellini , keir@xen.org, Stefano.Stabellini@eu.citrix.com List-Id: xen-devel@lists.xenproject.org In order to distinguish between upstream qemu and qemu-xen I am introducing a new variable named "QEMU" that only if is equal to "upstream" switches the build system to the new qemu. Users that want to try the new qemu just have to export QEMU=upstream before calling make in the xen-unstable top level directory. Signed-off-by: Stefano Stabellini diff -r 0ba816e077e6 Config.mk --- a/Config.mk Wed Aug 31 16:04:37 2011 +0000 +++ b/Config.mk Wed Sep 07 11:13:17 2011 +0000 @@ -192,12 +192,21 @@ else QEMU_REMOTE=git://xenbits.xensource.com/qemu-xen-unstable.git endif +# Only available through the git protocol at the moment +QEMU_UPSTREAM_URL=git://xenbits.xen.org/people/sstabellini/qemu-dm.git +QEMU_UPSTREAM_TAG=origin/xen-stable-0.15 + # 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 +ifeq ($(QEMU),upstream) +CONFIG_QEMU ?= $(QEMU_UPSTREAM_URL) +QEMU_TAG ?= $(QEMU_UPSTREAM_TAG) +else CONFIG_QEMU ?= $(QEMU_REMOTE) +QEMU_TAG ?= cd776ee9408ff127f934a707c1a339ee600bc127 +endif -QEMU_TAG ?= cd776ee9408ff127f934a707c1a339ee600bc127 # Tue Jun 28 13:50:53 2011 +0100 # qemu-char.c: fix incorrect CONFIG_STUBDOM handling diff -r 0ba816e077e6 tools/Makefile --- a/tools/Makefile Wed Aug 31 16:04:37 2011 +0000 +++ b/tools/Makefile Wed Sep 07 11:13:17 2011 +0000 @@ -106,7 +106,19 @@ ioemu-dir-find: set -e; \ $(buildmakevars2shellvars); \ cd ioemu-dir; \ - $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS) + if [ "$(QEMU)" = upstream ]; then \ + cd $(QEMU_ROOT); \ + ./configure --enable-xen --target-list=i386-softmmu \ + --extra-cflags="-I$(XEN_ROOT)/tools/include \ + -I$(XEN_ROOT)/tools/libxc \ + -I$(XEN_ROOT)/tools/xenstore" \ + --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \ + -L$(XEN_ROOT)/tools/libxenstore" \ + --disable-kvm \ + $(IOEMU_CONFIGURE_CROSS); \ + else \ + $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS); \ + fi .PHONY: ioemu-dir-force-update ioemu-dir-force-update: