From patchwork Fri Dec 2 12:23:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 9458339 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 42C1860585 for ; Fri, 2 Dec 2016 12:25:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3488E284E6 for ; Fri, 2 Dec 2016 12:25:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 297152853D; Fri, 2 Dec 2016 12:25:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C73A2284E6 for ; Fri, 2 Dec 2016 12:25:54 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cCmsE-0006hz-4E; Fri, 02 Dec 2016 12:23:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cCmsC-0006hp-50 for xen-devel@lists.xensource.com; Fri, 02 Dec 2016 12:23:28 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 5E/2A-23854-FB761485; Fri, 02 Dec 2016 12:23:27 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCIsWRWlGSWpSXmKPExsXitHRDpO6+dMc Ig8vfzSzuTXnP7sDosb1vF3sAYxRrZl5SfkUCa8aFA0fYC35JVHzb+4m5gfGNcBcjJ4eEgL/E 8vubWSFsD4nrZ08wgdhsAroSTVv+soHYIgLKEsebvgDVcHAwC4RK7HhhCWIKC2hJ/OrQBjFZB FQkOicYgxTzAg15+/URM8RAOYnzx3+C2ZwCnhLrXrxnAbGFgGr+zN3NDNIqJKAmMXd9PESroM TJmU/ASpgFJCQOvngBNcZS4tv6p8wTGPlnISmbhaRsASPTKkb14tSistQiXQu9pKLM9IyS3MT MHF1DA2O93NTi4sT01JzEpGK95PzcTYzAEGMAgh2MF9qdDzFKcjApifJyaDhGCPEl5adUZiQW Z8QXleakFh9ilOHgUJLg/Z0GlBMsSk1PrUjLzAEGO0xagoNHSYR3ZypQmre4IDG3ODMdInWKU Zdj2rPFT5mEWPLy81KlxHnXgcwQACnKKM2DGwGLvEuMslLCvIxARwnxFKQW5WaWoMq/YhTnYF QS5v0OMoUnM68EbtMroCOYgI7ouG4PckRJIkJKqoGxQI85YNOreMdJjfdPLnp0/cBnpnUlHaq 3eDLuTwo4e32nnS3b0zcSJo9nvLxn4P23eOP8qdur56REFM/vSfy4NSbCoZ3t8qmwPIX/k/Xq VE/5VAuw55pbvpogtPXbi6dzw7vuTJR4+k1g/bmgvLPK4cIHcjI7glauVW9fou17XdehTi36X 4S0EktxRqKhFnNRcSIAkiMTIrcCAAA= X-Env-Sender: prvs=13734adc3=Ian.Jackson@citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1480681405!74124750!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24823 invoked from network); 2 Dec 2016 12:23:26 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-14.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 2 Dec 2016 12:23:26 -0000 X-IronPort-AV: E=Sophos;i="5.33,729,1477958400"; d="scan'208";a="392686338" X-CrossPremisesHeadersFilteredBySendConnector: FTLPEX02AMS01.citrite.net From: Ian Jackson To: Date: Fri, 2 Dec 2016 12:23:00 +0000 Message-ID: <1480681381-1188-2-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1480681381-1188-1-git-send-email-ian.jackson@eu.citrix.com> References: <1480681381-1188-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-OrganizationHeadersPreserved: FTLPEX02AMS01.citrite.net Cc: Ian Jackson Subject: [Xen-devel] [PATCH 1/2] Open Xen 4.9-unstable X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP * 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 --- 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