Re: [Xen-devel] [PATCH v2 3/4] Clone and build upstream Qemu by default

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Thu, 2011-09-08 at 13:47 -0400, stefano.stabellini@xxxxxxxxxxxxx
wrote:
> Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> 
> diff -r 80ba2c7abbd2 Config.mk
> --- a/Config.mk       Thu Sep 08 16:59:19 2011 +0000
> +++ b/Config.mk       Thu Sep 08 17:18:48 2011 +0000
> @@ -192,6 +192,10 @@ 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

Just a nit, but we should arrange to have a "proper" tree rather than
a /people/... one for the default tree. e.g. to allow automated testing
to automatically push etc.

> +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
> diff -r 80ba2c7abbd2 Makefile
> --- a/Makefile        Thu Sep 08 16:59:19 2011 +0000
> +++ b/Makefile        Thu Sep 08 17:18:48 2011 +0000
> @@ -70,7 +70,7 @@ install-tools:
>       $(MAKE) -C tools install
>  
>  ifeq ($(CONFIG_IOEMU),y)
> -install-tools: tools/qemu-xen-traditional-dir
> +install-tools: tools/qemu-xen-traditional-dir tools/qemu-xen-dir
>  endif
>  
>  .PHONY: install-kernels
> @@ -91,6 +91,9 @@ tools/qemu-xen-traditional-dir:
>  tools/qemu-xen-traditional-dir-force-update:
>       $(MAKE) -C tools qemu-xen-traditional-dir-force-update
>  
> +tools/qemu-xen-dir:
> +     $(MAKE) -C tools qemu-xen-dir-find
> +
>  .PHONY: install-docs
>  install-docs:
>       sh ./docs/check_pkgs && $(MAKE) -C docs install || true
> diff -r 80ba2c7abbd2 tools/Makefile
> --- a/tools/Makefile  Thu Sep 08 16:59:19 2011 +0000
> +++ b/tools/Makefile  Thu Sep 08 17:18:48 2011 +0000
> @@ -31,6 +31,7 @@ SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
>  # do not recurse in to a dir we are about to delete
>  ifneq "$(MAKECMDGOALS)" "distclean"
>  SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-traditional-dir
> +SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir
>  endif
>  
>  SUBDIRS-y += xenpmd
> @@ -71,6 +72,7 @@ clean: subdirs-clean
>  .PHONY: distclean
>  distclean: subdirs-distclean
>       rm -rf qemu-xen-traditional-dir qemu-xen-traditional-dir-remote
> +     rm -rf qemu-xen-dir qemu-xen-dir-remote
>  
>  ifneq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
>  IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH) \
> @@ -81,6 +83,9 @@ endif
>  qemu-xen-traditional-dir-find:
>       $(XEN_ROOT)/tools/qemu-checkout.sh $(CONFIG_QEMU) $(QEMU_TAG) 
> qemu-xen-traditional-dir
>       
> +qemu-xen-dir-find:
> +     $(XEN_ROOT)/tools/qemu-checkout.sh $(QEMU_UPSTREAM_URL) 
> $(QEMU_UPSTREAM_TAG) qemu-xen-dir
> +     
>  .PHONY: qemu-xen-traditional-dir-force-update
>  qemu-xen-traditional-dir-force-update:
>       set -ex; \
> @@ -98,6 +103,14 @@ subdir-clean-qemu-xen-traditional-dir:
>               $(MAKE) -C qemu-xen-traditional-dir clean; \
>       fi
>  
> +subdir-all-qemu-xen-dir subdir-install-qemu-xen-dir: qemu-xen-dir-find
> +
> +subdir-clean-qemu-xen-dir:
> +     set -e; if test -d qemu-xen-dir/.; then \
> +             $(buildmakevars2shellvars); \
> +             $(MAKE) -C qemu-xen-dir clean; \
> +     fi
> +
>  subdir-clean-debugger/gdbsx subdir-distclean-debugger/gdbsx: .phony
>       $(MAKE) -C debugger/gdbsx clean
>  
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxxxxxxxx
> http://lists.xensource.com/xen-devel



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