diff --git a/repos/ports/ports/virtualbox.hash b/repos/ports/ports/virtualbox.hash index bcb1bf0bf..eb165e0c1 100644 --- a/repos/ports/ports/virtualbox.hash +++ b/repos/ports/ports/virtualbox.hash @@ -1 +1 @@ -02d35b49aef0818e5c3f17720d7cf659661b45ed +cfd788e7883eb32d28a8d9504f55e0dfd09421a0 diff --git a/repos/ports/ports/virtualbox5.hash b/repos/ports/ports/virtualbox5.hash index aa43a0cc3..adf194a72 100644 --- a/repos/ports/ports/virtualbox5.hash +++ b/repos/ports/ports/virtualbox5.hash @@ -1 +1 @@ -35ce173a7916f4a2f3b8bd6bf616506f63e43ac0 +3fa7f8218dd03a4752dc8cf34e113cbacc720b98 diff --git a/repos/ports/run/vbox_auto_win7_share.run b/repos/ports/run/vbox_auto_win7_share.run index 888f147eb..239fcff84 100644 --- a/repos/ports/run/vbox_auto_win7_share.run +++ b/repos/ports/run/vbox_auto_win7_share.run @@ -304,7 +304,7 @@ puts $noux_id "sleep 5" puts $noux_id "done" # Wait until VM signaled shutdown state -run_genode_until {\[init -\> vbox\] EMT PDMR3PowerOff: .* ns run time} 120 $serial_id +run_genode_until {\[init\] child "vbox" exited with exit value 0} 120 $serial_id # SHA1 of copied file puts $noux_id "sha1sum to/test.bin" diff --git a/repos/ports/src/virtualbox/libc.cc b/repos/ports/src/virtualbox/libc.cc index 024773bfb..e75f8b954 100644 --- a/repos/ports/src/virtualbox/libc.cc +++ b/repos/ports/src/virtualbox/libc.cc @@ -111,12 +111,12 @@ extern "C" char *getenv(const char *name) "+rem_printf.e.l.f" // "+rem_run.e.l.f" // "+pgm.e.l.f" - "+pdm" +// "+pdm" // "+cpum.e.l.f" // "+dev_pcnet.e.l.f" // "+dev_pic.e.l.f" // "+dev_apic.e.l.f" - "+dev_vmm.e" +// "+dev_vmm.e" // "+usb_mouse.e.l.f" // "+main.e.l.f" // "+hgcm.e.l.f" @@ -129,7 +129,6 @@ extern "C" char *getenv(const char *name) Genode::strcmp(name, "VBOX_RELEASE_LOG_FLAGS") == 0) return (char *)"thread"; - Genode::warning("getenv called for non-existent variable \"", name, "\""); return 0; } diff --git a/repos/ports/src/virtualbox/patches/vmmdev.patch b/repos/ports/src/virtualbox/patches/vmmdev.patch index e1a2b36d5..a400ca977 100644 --- a/repos/ports/src/virtualbox/patches/vmmdev.patch +++ b/repos/ports/src/virtualbox/patches/vmmdev.patch @@ -4,6 +4,20 @@ diff --git a/src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDev.cpp b/src/app/vir index 8ce46a8..a6b84b0 100644 --- a/src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDev.cpp +++ b/src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDev.cpp +@@ -774,11 +774,11 @@ + fu32Caps |= pReq->u32OrMask; + fu32Caps &= ~pReq->u32NotMask; + +- LogRel(("Guest Additions capability report: (%#x -> %#x) seamless: %s, hostWindowMapping: %s, graphics: %s\n", ++ RTLogPrintf("Guest Additions capability report: (%#x -> %#x) seamless: %s, hostWindowMapping: %s, graphics: %s\n", + pThis->guestCaps, fu32Caps, + fu32Caps & VMMDEV_GUEST_SUPPORTS_SEAMLESS ? "yes" : "no", + fu32Caps & VMMDEV_GUEST_SUPPORTS_GUEST_HOST_WINDOW_MAPPING ? "yes" : "no", +- fu32Caps & VMMDEV_GUEST_SUPPORTS_GRAPHICS ? "yes" : "no")); ++ fu32Caps & VMMDEV_GUEST_SUPPORTS_GRAPHICS ? "yes" : "no"); + + pThis->guestCaps = fu32Caps; + @@ -2179,6 +2179,10 @@ static int vmmdevReqHandler_GetPageSharingStatus(PVMMDEV pThis, VMMDevRequestHea ("%u\n", pReq->header.size), VERR_INVALID_PARAMETER); @@ -15,43 +29,14 @@ index 8ce46a8..a6b84b0 100644 int rc = pThis->pDrv->pfnIsPageFusionEnabled(pThis->pDrv, &pReq->fEnabled); if (RT_FAILURE(rc)) pReq->fEnabled = false; -@@ -2404,7 +2408,6 @@ static int vmmdevReqDispatcher(PVMMDEV pThis, VMMDevRequestHeader *pReqHdr, RTGC - pReqHdr->rc = vmmdevReqHandler_HGCMCall(pThis, pReqHdr, GCPhysReqHdr); - *pfDelayedUnlock = true; - break; --#endif /* VBOX_WITH_HGCM */ ++++ a/src/app/virtualbox/src/VBox/VMM/VMMR3/VM.cpp ++++ b/src/app/virtualbox/src/VBox/VMM/VMMR3/VM.cpp +@@ -2805,7 +2805,7 @@ + * Debug logging. + */ + RTLogPrintf("\n\nThe VM was reset:\n"); +- DBGFR3Info(pVM->pUVM, "cpum", "verbose", NULL); ++// DBGFR3Info(pVM->pUVM, "cpum", "verbose", NULL); + #endif - case VMMDevReq_HGCMCancel: - pReqHdr->rc = vmmdevReqHandler_HGCMCancel(pThis, pReqHdr, GCPhysReqHdr); -@@ -2414,6 +2417,7 @@ static int vmmdevReqDispatcher(PVMMDEV pThis, VMMDevRequestHeader *pReqHdr, RTGC - case VMMDevReq_HGCMCancel2: - pReqHdr->rc = vmmdevReqHandler_HGCMCancel2(pThis, pReqHdr); - break; -+#endif /* VBOX_WITH_HGCM */ - - case VMMDevReq_VideoAccelEnable: - pReqHdr->rc = vmmdevReqHandler_VideoAccelEnable(pThis, pReqHdr); -@@ -3595,8 +3599,10 @@ static DECLCALLBACK(void) vmmdevReset(PPDMDEVINS pDevIns) - /* disabled statistics updating */ - pThis->u32LastStatIntervalSize = 0; - -+#ifdef VBOX_WITH_HGCM - /* Clear the "HGCM event enabled" flag so the event can be automatically reenabled. */ - pThis->u32HGCMEnabled = 0; -+#endif - - /* - * Clear the event variables. -diff --git a/src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp b/src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp -index d495599..21dfada 100644 ---- a/src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp -+++ b/src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp -@@ -19,7 +19,7 @@ - /******************************************************************************* - * Header Files * - *******************************************************************************/ --#define LOG_GROUP LOG_GROUP_DEV_VMM -+#define LOG_GROUP LOG_GROUP_HGCM - #include - #include - #include + /* diff --git a/repos/ports/src/virtualbox/thread.cc b/repos/ports/src/virtualbox/thread.cc index cd66bb40a..c8b10a27c 100644 --- a/repos/ports/src/virtualbox/thread.cc +++ b/repos/ports/src/virtualbox/thread.cc @@ -75,11 +75,6 @@ static int create_thread(pthread_t *thread, const pthread_attr_t *attr, if (rtthread->cbStack < stack_size) stack_size = rtthread->cbStack; - else - Genode::warning("requested stack for " - "thread '", Genode::Cstring(rtthread->szName), "' " - "of ", rtthread->cbStack, " Bytes is too large, " - "limit to ", stack_size, " Bytes"); /* sanity check - emt and vcpu thread have to have same prio class */ if (strstr(rtthread->szName, "EMT") == rtthread->szName) diff --git a/repos/ports/src/virtualbox5/patches/vmmdev.patch b/repos/ports/src/virtualbox5/patches/vmmdev.patch index cbdded4ad..d4cd48032 100644 --- a/repos/ports/src/virtualbox5/patches/vmmdev.patch +++ b/repos/ports/src/virtualbox5/patches/vmmdev.patch @@ -4,6 +4,20 @@ diff --git a/src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDev.cpp b/src/app/vir index 8ce46a8..a6b84b0 100644 --- a/src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDev.cpp +++ b/src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDev.cpp +@@ -976,11 +976,11 @@ + fu32Caps |= pReq->u32OrMask; + fu32Caps &= ~pReq->u32NotMask; + +- LogRel(("VMMDev: Guest Additions capability report: (%#x -> %#x) seamless: %s, hostWindowMapping: %s, graphics: %s\n", ++ RTLogPrintf("VMMDev: Guest Additions capability report: (%#x -> %#x) seamless: %s, hostWindowMapping: %s, graphics: %s\n", + pThis->guestCaps, fu32Caps, + fu32Caps & VMMDEV_GUEST_SUPPORTS_SEAMLESS ? "yes" : "no", + fu32Caps & VMMDEV_GUEST_SUPPORTS_GUEST_HOST_WINDOW_MAPPING ? "yes" : "no", +- fu32Caps & VMMDEV_GUEST_SUPPORTS_GRAPHICS ? "yes" : "no")); ++ fu32Caps & VMMDEV_GUEST_SUPPORTS_GRAPHICS ? "yes" : "no"); + + pThis->guestCaps = fu32Caps; + @@ -2179,6 +2179,10 @@ static int vmmdevReqHandler_GetPageSharingStatus(PVMMDEV pThis, VMMDevRequestHea ("%u\n", pReq->header.size), VERR_INVALID_PARAMETER); @@ -15,32 +29,14 @@ index 8ce46a8..a6b84b0 100644 int rc = pThis->pDrv->pfnIsPageFusionEnabled(pThis->pDrv, &pReq->fEnabled); if (RT_FAILURE(rc)) pReq->fEnabled = false; -@@ -2404,7 +2408,6 @@ static int vmmdevReqDispatcher(PVMMDEV pThis, VMMDevRequestHeader *pReqHdr, RTGC - pReqHdr->rc = vmmdevReqHandler_HGCMCall(pThis, pReqHdr, GCPhysReqHdr); - *pfDelayedUnlock = true; - break; --#endif /* VBOX_WITH_HGCM */ ++++ a/src/app/virtualbox/src/VBox/VMM/VMMR3/VM.cpp ++++ b/src/app/virtualbox/src/VBox/VMM/VMMR3/VM.cpp +@@ -2805,7 +2805,7 @@ + * Debug logging. + */ + RTLogPrintf("\n\nThe VM was reset:\n"); +- DBGFR3Info(pVM->pUVM, "cpum", "verbose", NULL); ++// DBGFR3Info(pVM->pUVM, "cpum", "verbose", NULL); + #endif - case VMMDevReq_HGCMCancel: - pReqHdr->rc = vmmdevReqHandler_HGCMCancel(pThis, pReqHdr, GCPhysReqHdr); -@@ -2414,6 +2417,7 @@ static int vmmdevReqDispatcher(PVMMDEV pThis, VMMDevRequestHeader *pReqHdr, RTGC - case VMMDevReq_HGCMCancel2: - pReqHdr->rc = vmmdevReqHandler_HGCMCancel2(pThis, pReqHdr); - break; -+#endif /* VBOX_WITH_HGCM */ - - case VMMDevReq_VideoAccelEnable: - pReqHdr->rc = vmmdevReqHandler_VideoAccelEnable(pThis, pReqHdr); -diff --git a/src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp b/src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp -index d495599..21dfada 100644 ---- a/src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp -+++ b/src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp -@@ -19,7 +19,7 @@ - /********************************************************************************************************************************* - * Header Files * - *********************************************************************************************************************************/ --#define LOG_GROUP LOG_GROUP_DEV_VMM -+#define LOG_GROUP LOG_GROUP_HGCM - #include - #include - #include + /*