From a7d04eefabeed06a5be89c28e880e1adc51bfb39 Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Mon, 19 Sep 2016 17:37:01 +0200
Subject: [PATCH] vbox5: fix build for vbox

Issue #2081
---
 repos/ports/ports/virtualbox5.hash            |  2 +-
 repos/ports/src/virtualbox/patches/series     |  1 +
 .../src/virtualbox/patches/series_common      |  1 -
 .../src/virtualbox5/patches/dev_e1000.patch   | 36 +++++++++++++++++++
 repos/ports/src/virtualbox5/patches/series    |  1 +
 5 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 repos/ports/src/virtualbox5/patches/dev_e1000.patch

diff --git a/repos/ports/ports/virtualbox5.hash b/repos/ports/ports/virtualbox5.hash
index 73d2d47dc..91c6690c0 100644
--- a/repos/ports/ports/virtualbox5.hash
+++ b/repos/ports/ports/virtualbox5.hash
@@ -1 +1 @@
-a7e90970777f19ba4f1112e927b2c97882dcd8d4
+6f6c20213ce4f96218cd69665d2c1757cebbf269
diff --git a/repos/ports/src/virtualbox/patches/series b/repos/ports/src/virtualbox/patches/series
index 7877d02bb..3b95d9169 100644
--- a/repos/ports/src/virtualbox/patches/series
+++ b/repos/ports/src/virtualbox/patches/series
@@ -10,3 +10,4 @@ tm_smp.patch
 vbox_dd.patch
 force_ioapic.patch
 vbox-cpuhotplug.dsl.patch
+dev_e1000.patch
diff --git a/repos/ports/src/virtualbox/patches/series_common b/repos/ports/src/virtualbox/patches/series_common
index 8f4a7e108..b69142824 100644
--- a/repos/ports/src/virtualbox/patches/series_common
+++ b/repos/ports/src/virtualbox/patches/series_common
@@ -1,6 +1,5 @@
 acpi_drv.patch
 avoid_yield.patch
-dev_e1000.patch
 eminternal.patch
 hostservice.patch
 iconv.patch
diff --git a/repos/ports/src/virtualbox5/patches/dev_e1000.patch b/repos/ports/src/virtualbox5/patches/dev_e1000.patch
new file mode 100644
index 000000000..f3babc690
--- /dev/null
+++ b/repos/ports/src/virtualbox5/patches/dev_e1000.patch
@@ -0,0 +1,36 @@
+dev_e1000.patch
+
+diff --git a/src/app/virtualbox/src/VBox/Devices/Network/DevE1000.cpp b/src/app/virtualbox/src/VBox/Devices/Network/DevE1000.cpp
+index b8f9ebf..aa3eb87 100644
+--- a/src/app/virtualbox/src/VBox/Devices/Network/DevE1000.cpp
++++ b/src/app/virtualbox/src/VBox/Devices/Network/DevE1000.cpp
+@@ -5721,22 +5721,29 @@ static int e1kRegReadUnaligned(PE1KSTATE pThis, uint32_t offReg, void *pv, uint3
+             rc = g_aE1kRegMap[index].pfnRead(pThis, offReg & 0xFFFFFFFC, index, &u32);
+             u32 &= mask;
+             //e1kCsLeave(pThis);
++#ifdef DEBUG
+             E1kLog2(("%s At %08X read  %s          from %s (%s)\n",
+                     pThis->szPrf, offReg, e1kU32toHex(u32, mask, buf), g_aE1kRegMap[index].abbrev, g_aE1kRegMap[index].name));
+             Log6(("%s At %08X read  %s          from %s (%s) [UNALIGNED]\n",
+                   pThis->szPrf, offReg, e1kU32toHex(u32, mask, buf), g_aE1kRegMap[index].abbrev, g_aE1kRegMap[index].name));
++#endif
+             /* Shift back the result. */
+             u32 >>= shift;
+         }
++#ifdef DEBUG
+         else
+             E1kLog(("%s At %08X read (%s) attempt from write-only register %s (%s)\n",
+                     pThis->szPrf, offReg, e1kU32toHex(u32, mask, buf), g_aE1kRegMap[index].abbrev, g_aE1kRegMap[index].name));
++#endif
++
+         if (IOM_SUCCESS(rc))
+             STAM_COUNTER_INC(&pThis->aStatRegReads[index]);
+     }
++#ifdef DEBUG
+     else
+         E1kLog(("%s At %08X read (%s) attempt from non-existing register\n",
+                 pThis->szPrf, offReg, e1kU32toHex(u32, mask, buf)));
++#endif
+ 
+     memcpy(pv, &u32, cb);
+     return rc;
diff --git a/repos/ports/src/virtualbox5/patches/series b/repos/ports/src/virtualbox5/patches/series
index 278e2d8cb..97f4e23a9 100644
--- a/repos/ports/src/virtualbox5/patches/series
+++ b/repos/ports/src/virtualbox5/patches/series
@@ -7,3 +7,4 @@ tm_smp.patch
 vmm.patch
 iem_wip.patch
 dbg.patch
+dev_e1000.patch