]> xenbits.xensource.com Git - xen.git/commitdiff
QEMU_UPSTREAM_REVISION update
authorIan Jackson <ian.jackson@eu.citrix.com>
Tue, 14 Jun 2016 17:37:35 +0000 (18:37 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 14 Jun 2016 17:37:35 +0000 (18:37 +0100)
Includes XSA-180 fix and Ubuntu build fix.

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

index eeac312494daadb7084d283a51d795c5e2fb9657..cef8632937d750293750ef4b02b73eee676786b5 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -252,9 +252,9 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-traditional.git
 SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 endif
 OVMF_UPSTREAM_REVISION ?= 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
-QEMU_UPSTREAM_REVISION ?= 63d6eab2fda43e9cfdaa33e9ffde755da8e98e32
-# Tue Apr 26 14:48:06 2016 +0200
-# vga: make sure vga register setup for vbe stays intact (CVE-2016-3712).
+QEMU_UPSTREAM_REVISION ?= 5e40cec825a2582d8a91119c485f5130cc2648e9
+# Wed Sep 16 17:38:44 2015 +0200
+# trace: remove malloc tracing
 SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5
 # Thu May 22 16:59:16 2014 -0400
 # python3 fixes for vgabios and csm builds.