[Xen-changelog] [xen stable-4.5] Config.mk: Fix QEMU_TAG and QEMU_TRADITIONAL_REVISION handling

[patchbot@xxxxxxx]

commit d41906197d9a89355f43d4359d795b1d0257a53a
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Tue Apr 21 14:47:38 2015 +0100
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Tue Apr 21 14:47:38 2015 +0100

    Config.mk: Fix QEMU_TAG and QEMU_TRADITIONAL_REVISION handling
    
    In 2417e243 "QEMU_TAG update" my tag update script mangled the
    machinery which sets QEMU_TRADITIONAL_REVISION, by replacing the first
    assignment to QEMU_TRADITIONAL_REVISION it found rather than the one
    which ought to have been replaced.
    
    The result was that from that commit on, QEMU_TAG was no longer
    honoured although QEMU_TRADITIONAL_REVISION still was.
    
    Fix this by restoring the transfer from QEMU_TAG.
    
    This fix is analogous to 5d4c0952 "Config.mk: Fix (and, effectively,
    update) QEMU_TAG" from xen.git#staging, but in 4.5 there has not been
    a subsequent attempt to update the qemu revision, so both settings of
    QEMU_TRADITIONAL_REVISION are the same, and restoring the proper
    behaviour will not have the side effect of making a previous qemu tag
    update effective.
    
    Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
    CC: Wei Liu <wei.liu2@xxxxxxxxxx>
    CC: Ian Campbell <ian.campbell@xxxxxxxxxx>
    CC: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
    CC: Jan Beulich <jbeulich@xxxxxxxx>
    Reported-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 Config.mk |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/Config.mk b/Config.mk
index cb1d23b..08df07d 100644
--- a/Config.mk
+++ b/Config.mk
@@ -237,9 +237,7 @@ ifneq (,$(CONFIG_QEMU))
 QEMU_TRADITIONAL_LOC ?= $(CONFIG_QEMU)
 endif
 ifneq (,$(QEMU_TAG))
-QEMU_TRADITIONAL_REVISION ?= 62e41581f69c3fd4a8f829a773015eb4c17f1f3e
-# Tue Mar 31 16:27:45 2015 +0100
-# xen: limit guest control of PCI command register
+QEMU_TRADITIONAL_REVISION ?= $(QEMU_TAG)
 endif
 
 ifeq ($(GIT_HTTP),y)
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.5

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog