ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vbox: remove debug messages 

stay more silent

Issue #2110
This commit is contained in:
Alexander Boettcher 2016-10-05 16:51:35 +02:00 committed by Christian Helmuth
parent a5ff866ef7
commit a0c9915cee
7 changed files with 53 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/ports/ports/virtualbox.hash
View File

@ -1 +1 @@
02d35b49aef0818e5c3f17720d7cf659661b45ed
cfd788e7883eb32d28a8d9504f55e0dfd09421a0

2
repos/ports/ports/virtualbox5.hash
View File

@ -1 +1 @@
35ce173a7916f4a2f3b8bd6bf616506f63e43ac0
3fa7f8218dd03a4752dc8cf34e113cbacc720b98

2
repos/ports/run/vbox_auto_win7_share.run
View File

@ -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"

5
repos/ports/src/virtualbox/libc.cc
View File

@ -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;
}

63
repos/ports/src/virtualbox/patches/vmmdev.patch
View File

@ -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 <iprt/alloc.h>
#include <iprt/asm.h>
#include <iprt/assert.h>
/*

5
repos/ports/src/virtualbox/thread.cc
View File

@ -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)

52
repos/ports/src/virtualbox5/patches/vmmdev.patch
View File

@ -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 <iprt/alloc.h>
#include <iprt/asm.h>
#include <iprt/assert.h>
/*