Open Xen 4.9-unstable

* Change version number in README and xen/Makefile to `4.8-unstable'.

* Set `debug ?= y' in Config.mk.

* Set QEMU_UPSTREAM_REVISION to track qemu-xen.git `master'.

* Set MINIOS_UPSTREAM_REVISION and QEMU_TRADITIONAL_REVISION back to
  commit hashes, rather than 4.8 tags.

Hypervisor debug enablement is left aside for now.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/Config.mk b/Config.mk
index 1de7f36155bc17d2d9a23ecfda11eeeaf23dafa3..1e02f625413df94771e9ca85ff95cafc39c1b2ec 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -18,7 +18,7 @@ or       = $(if $(strip $(1)),$(1),$(if $(strip $(2)),$(2),$(if $(strip $(3)),$(
 
 # A debug build of tools?
 # Hypervisor debug build is controlled by Kconfig.
-debug ?= n
+debug ?= y
 debug_symbols ?= $(debug)
 
 XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/ \
@@ -277,8 +277,8 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
 endif
 OVMF_UPSTREAM_REVISION ?= bc54e50e0fe03c570014f363b547426913e92449
-QEMU_UPSTREAM_REVISION ?= qemu-xen-4.8.0-rc7
-MINIOS_UPSTREAM_REVISION ?= xen-4.8.0-rc1
+QEMU_UPSTREAM_REVISION ?= master
+MINIOS_UPSTREAM_REVISION ?= e20998fbec0af4d783abb1a0695ab4614064c520
 # Wed Sep 28 11:50:04 2016 +0200
 # minios: fix build issue with xen_*mb defines
 
@@ -289,7 +289,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.10.0
 ETHERBOOT_NICS ?= rtl8139 8086100e
 
 
-QEMU_TRADITIONAL_REVISION ?= xen-4.8.0-rc7
+QEMU_TRADITIONAL_REVISION ?= 89c4cbe8d234049b0145e4dc5e5d19d626250b57
+# Tue Nov 29 16:36:38 2016 +0000
+# xen: fix ioreq handling
 
 # 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.

diff --git a/README b/README
index b370ce2bd9f0284197c5e01e8579626fc13b3394..76433a9b4154757fe77ec46fbbf7be0fd033ba6d 100644 (file)
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
 #################################
-__  __            _  _    ___   ___
-\ \/ /___ _ __   | || |  ( _ ) / _ \       _ __ ___
- \  // _ \ '_ \  | || |_ / _ \| | | |_____| '__/ __|
- /  \  __/ | | | |__   _| (_) | |_| |_____| | | (__
-/_/\_\___|_| |_|    |_|(_)___(_)___/      |_|  \___|
+__  __            _  _   ___                        _        _     _
+\ \/ /___ _ __   | || | / _ \       _   _ _ __  ___| |_ __ _| |__ | | ___
+ \  // _ \ '_ \  | || || (_) |_____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
+ /  \  __/ | | | |__   _\__, |_____| |_| | | | \__ \ || (_| | |_) | |  __/
+/_/\_\___|_| |_|    |_|(_)/_/       \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
 
 #################################
 

diff --git a/xen/Makefile b/xen/Makefile
index b8df99f82ab81dc30442afe9a1308250c159d9dd..ddac7e0f9fee078093b23d616fe42bff40ecb777 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -1,8 +1,8 @@
 # This is the correct place to edit the build version.
 # All other places this is stored (eg. compile.h) should be autogenerated.
 export XEN_VERSION       = 4
-export XEN_SUBVERSION    = 8
-export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION)
+export XEN_SUBVERSION    = 9
+export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version