WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] Re: [PATCH 1/2] Introduce support for upstream qemu in the x

To: <stefano.stabellini@xxxxxxxxxxxxx>, <xen-devel@xxxxxxxxxxxxxxxxxxx>
Subject: [Xen-devel] Re: [PATCH 1/2] Introduce support for upstream qemu in the xen-unstable build system
From: Keir Fraser <keir.xen@xxxxxxxxx>
Date: Wed, 07 Sep 2011 17:50:36 +0100
Cc:
Delivery-date: Wed, 07 Sep 2011 09:51:12 -0700
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=user-agent:date:subject:from:to:message-id:thread-topic :thread-index:in-reply-to:mime-version:content-type :content-transfer-encoding; bh=Pc4J3/xFwtXbsvXQkaTtCQUcJx5EE8kpyBj6/wAq23I=; b=IZg8EQI5vJ1/DmBy+XPP13zsxOIox01cfZJSzRDCPZ5W83am7MLEXV+LEOvwzCPfRg uLxCGTxEqwkU0HctQ29OaXBbTmLl3ukFEBbQUAPaQy+VwnTsBsEtBCJxEYUXiTbIOgv1 /izG+PeYxUscGk8r/CQArcxJ0wWVcO16Cp1jM=
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <1315406398-8987-1-git-send-email-stefano.stabellini@xxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
Thread-index: AcxtfkPvG0Z0OlnSy06GAJth183C3Q==
Thread-topic: [PATCH 1/2] Introduce support for upstream qemu in the xen-unstable build system
User-agent: Microsoft-Entourage/12.30.0.110427
On 07/09/2011 15:39, "stefano.stabellini@xxxxxxxxxxxxx"
<stefano.stabellini@xxxxxxxxxxxxx> wrote:

> 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.

I think we should build and install both, and select between them via
per-domain config option. That's basically what we need for supporting old
save images.

 -- Keir

> Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> 
> 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:



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel