From: Ian Jackson <ian.jackson@eu.citrix.com>
To: xen-devel@lists.xensource.com
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>
Subject: [PATCH 1/2] Open Xen 4.9-unstable
Date: Fri, 2 Dec 2016 12:23:00 +0000 [thread overview]
Message-ID: <1480681381-1188-2-git-send-email-ian.jackson@eu.citrix.com> (raw)
In-Reply-To: <1480681381-1188-1-git-send-email-ian.jackson@eu.citrix.com>
* 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>
---
Config.mk | 10 ++++++----
README | 10 +++++-----
xen/Makefile | 4 ++--
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/Config.mk b/Config.mk
index 1de7f36..1e02f62 100644
--- 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 b370ce2..76433a9 100644
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
#################################
-__ __ _ _ ___ ___
-\ \/ /___ _ __ | || | ( _ ) / _ \ _ __ ___
- \ // _ \ '_ \ | || |_ / _ \| | | |_____| '__/ __|
- / \ __/ | | | |__ _| (_) | |_| |_____| | | (__
-/_/\_\___|_| |_| |_|(_)___(_)___/ |_| \___|
+__ __ _ _ ___ _ _ _
+\ \/ /___ _ __ | || | / _ \ _ _ _ __ ___| |_ __ _| |__ | | ___
+ \ // _ \ '_ \ | || || (_) |_____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
+ / \ __/ | | | |__ _\__, |_____| |_| | | | \__ \ || (_| | |_) | | __/
+/_/\_\___|_| |_| |_|(_)/_/ \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
#################################
diff --git a/xen/Makefile b/xen/Makefile
index b8df99f..ddac7e0 100644
--- 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
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-12-02 12:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-02 12:22 [PATCH 0/2] Open Xen 4.9-unstable, reenable debug Ian Jackson
2016-12-02 12:23 ` Ian Jackson [this message]
2016-12-02 12:53 ` [PATCH 1/2] Open Xen 4.9-unstable Andrew Cooper
2016-12-02 12:23 ` [PATCH 2/2] Re-enable hypervisor debug as part of opening 4.9 Ian Jackson
2016-12-02 12:46 ` Jan Beulich
2016-12-02 12:51 ` Ian Jackson
2016-12-02 13:18 ` [PATCH 0/2] Open Xen 4.9-unstable, reenable debug Olaf Hering
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1480681381-1188-2-git-send-email-ian.jackson@eu.citrix.com \
--to=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).