From 0a8c94fae993dd8f2b27fd4cc694f61c21de84bf Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Tue, 14 Jun 2016 18:40:04 +0100
Subject: [PATCH] QEMU_UPSTREAM_REVISION update (XSA-180)

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 Config.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Config.mk b/Config.mk
index 6d3a5263fa..3e5fbb9b15 100644
--- a/Config.mk
+++ b/Config.mk
@@ -212,9 +212,9 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-xen.git
 SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 endif
 OVMF_UPSTREAM_REVISION ?= 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
-QEMU_UPSTREAM_REVISION ?= c97c20f71240a538a19cb6b0e598bc1bbd5168f1
-# Wed May 4 17:43:36 2016 +0100
-# vga: make sure vga register setup for vbe stays intact (CVE-2016-3712).
+QEMU_UPSTREAM_REVISION ?= 12e8fccf5b5460be7aecddc71d27eceaba6e1f15
+# Thu May 26 16:21:56 2016 +0100
+# main loop: Big hammer to fix logfile disk DoS in Xen setups
 SEABIOS_UPSTREAM_TAG ?= 3a28511b46f0c2af5fae1b6ed2b0c19d7913cee3
 # Wed Jun 26 16:30:45 2013 +0100
 # xen: Don't perform SMP setup.