From feb61ced7bc08c544dc89d50b3f5947736bbc64f Mon Sep 17 00:00:00 2001
From: Hannes Weisbach <hannes.weisbach@tu-dresden.de>
Date: Fri, 15 Jul 2016 13:31:36 +0200
Subject: [PATCH 1/2] doxygen: cmake syntax fix

Remove superfluous closing brace in cmake file.

Change-Id: I95224f7a42007f6779a6d4950161e7208355edc6
---
 cmake/doxygen.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/doxygen.cmake b/cmake/doxygen.cmake
index 90b29766..6ac054f8 100644
--- a/cmake/doxygen.cmake
+++ b/cmake/doxygen.cmake
@@ -16,7 +16,7 @@ file(MAKE_DIRECTORY ${FAIL_DOC_OUTPUT})
 #        means, the path to your Fail* directory should not contain any blanks.
 
 configure_file(${PROJECT_SOURCE_DIR}/cmake/Doxyfile.in
-		${PROJECT_BINARY_DIR}/Doxyfile @ONLY}
+		${PROJECT_BINARY_DIR}/Doxyfile @ONLY
 )
 
 ## call make doc to generate documentation

From 3fc3c6a6893dc7846f96987829fe3d766979cb1a Mon Sep 17 00:00:00 2001
From: Hannes Weisbach <hannes.weisbach@tu-dresden.de>
Date: Fri, 15 Jul 2016 13:48:25 +0200
Subject: [PATCH 2/2] bochs: backport fix for out-of-bounds memory access

Upstream SVN r11912: "Fixed some gcc 4.8.1 warnings"

Change-Id: I599eb4d6bb8d5a7a2585bcca7d9a738ac2930aac
---
 simulators/bochs/iodev/vga.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simulators/bochs/iodev/vga.cc b/simulators/bochs/iodev/vga.cc
index d3d0e0ac..446613c6 100644
--- a/simulators/bochs/iodev/vga.cc
+++ b/simulators/bochs/iodev/vga.cc
@@ -558,7 +558,7 @@ void bx_vga_c::determine_screen_dimensions(unsigned *piHeight, unsigned *piWidth
 {
   int ai[0x20];
   int i,h,v;
-  for (i = 0 ; i < 0x20 ; i++)
+  for (i = 0 ; i < 0x19 ; i++)
    ai[i] = BX_VGA_THIS s.CRTC.reg[i];
 
   h = (ai[1] + 1) * 8;