From 5f0008cbc94db33a34f7cf53bb31d7518d396b34 Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Tue, 22 Nov 2016 00:14:37 +0100
Subject: [PATCH] vbox: update to 5.1.10

Issue #2059
---
 repos/ports/lib/mk/virtualbox5-devices.mk | 4 ++--
 repos/ports/ports/virtualbox5.hash        | 2 +-
 repos/ports/ports/virtualbox5.port        | 8 ++++----
 repos/ports/src/virtualbox5/devices.cc    | 2 +-
 repos/ports/src/virtualbox5/mm.cc         | 3 ++-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/repos/ports/lib/mk/virtualbox5-devices.mk b/repos/ports/lib/mk/virtualbox5-devices.mk
index e7ed8e682..f74c04466 100644
--- a/repos/ports/lib/mk/virtualbox5-devices.mk
+++ b/repos/ports/lib/mk/virtualbox5-devices.mk
@@ -37,10 +37,10 @@ SRC_CC += Devices/PC/DevIoApic.cpp
 
 SRC_CC += Devices/Audio/AudioMixBuffer.cpp
 SRC_CC += Devices/Audio/AudioMixer.cpp
+SRC_CC += Devices/Audio/DevHDA.cpp
 SRC_CC += Devices/Audio/DevIchAc97.cpp
-SRC_CC += Devices/Audio/DevIchHda.cpp
-SRC_CC += Devices/Audio/DevIchHdaCodec.cpp
 SRC_CC += Devices/Audio/DrvAudioCommon.cpp
+SRC_CC += Devices/Audio/HDACodec.cpp
 SRC_CC += Devices/USB/DevOHCI.cpp
 SRC_CC += Devices/USB/USBProxyDevice.cpp
 SRC_CC += Devices/USB/VUSBBufferedPipe.cpp
diff --git a/repos/ports/ports/virtualbox5.hash b/repos/ports/ports/virtualbox5.hash
index 0e83ec78e..3b6170539 100644
--- a/repos/ports/ports/virtualbox5.hash
+++ b/repos/ports/ports/virtualbox5.hash
@@ -1 +1 @@
-6c256743d02114e0e47001386465def6e01e0c03
+02e3a77e26ec09cc832fc4a45216377883241a47
diff --git a/repos/ports/ports/virtualbox5.port b/repos/ports/ports/virtualbox5.port
index 3e9360fb3..27c7efdd8 100644
--- a/repos/ports/ports/virtualbox5.port
+++ b/repos/ports/ports/virtualbox5.port
@@ -1,17 +1,17 @@
 LICENSE         := GPLv2
-VERSION         := 5.1.8
+VERSION         := 5.1.10
 DOWNLOADS       := virtualbox.archive virtualbox_sdk.archive
 
 VIRTUALBOX_TBZ2    := VirtualBox-$(VERSION).tar.bz2
-VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-111374.zip
+VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-112026.zip
 
 URL(virtualbox) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_TBZ2)
 DIR(virtualbox) := src/app/virtualbox
-SHA(virtualbox) := fe968ecbe9f8945220dbd388971cd1ce596cfd22
+SHA(virtualbox) := 041b0cf8f7fe292da34fc520eaa2c8894e76c7fe
 
 URL(virtualbox_sdk) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_SDK_ZIP)
 DIR(virtualbox_sdk) := src/app/virtualbox_sdk
-SHA(virtualbox_sdk) := c7ffc8d179b43ffc7e05011a22c44577da4fde4a
+SHA(virtualbox_sdk) := d6262eb7d897030ffdcd2622ec01535ed34db4dd
 
 PATCHES_DIR       := src/virtualbox5/patches
 PATCHES_DIR_VBOX4 := src/virtualbox/patches
diff --git a/repos/ports/src/virtualbox5/devices.cc b/repos/ports/src/virtualbox5/devices.cc
index b65f0060f..6f0d3ba51 100644
--- a/repos/ports/src/virtualbox5/devices.cc
+++ b/repos/ports/src/virtualbox5/devices.cc
@@ -54,7 +54,7 @@ extern "C" int VBoxDevicesRegister(PPDMDEVREGCB pCallbacks, uint32_t u32Version)
 	REGISTER(DeviceVMMDev);
 	REGISTER(DeviceOHCI);
 	REGISTER(DeviceICHAC97);
-	REGISTER(DeviceICH6_HDA);
+	REGISTER(DeviceHDA);
 
 	return VINF_SUCCESS;
 }
diff --git a/repos/ports/src/virtualbox5/mm.cc b/repos/ports/src/virtualbox5/mm.cc
index 22e5f40c8..0ae1d8034 100644
--- a/repos/ports/src/virtualbox5/mm.cc
+++ b/repos/ports/src/virtualbox5/mm.cc
@@ -295,7 +295,8 @@ int MMR3AdjustFixedReservation(PVM, int32_t, const char *pszDesc)
 }
 
 
-int MMR3HyperMapMMIO2(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion,
+int MMR3HyperMapMMIO2(PVM pVM, PPDMDEVINS pDevIns, uint32_t iSubDev,
+                      uint32_t iRegion,
                       RTGCPHYS off, RTGCPHYS cb, const char *pszDesc,
                       PRTRCPTR pRCPtr)
 {