2015-05-04 11:36:45 +02:00
|
|
|
vmmdev.patch
|
|
|
|
|
|
|
|
diff --git a/src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDev.cpp b/src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDev.cpp
|
|
|
|
index 8ce46a8..a6b84b0 100644
|
|
|
|
--- a/src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDev.cpp
|
|
|
|
+++ b/src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDev.cpp
|
2016-10-05 16:51:35 +02:00
|
|
|
@@ -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;
|
|
|
|
|
2015-05-04 11:36:45 +02:00
|
|
|
@@ -2179,6 +2179,10 @@ static int vmmdevReqHandler_GetPageSharingStatus(PVMMDEV pThis, VMMDevRequestHea
|
2014-09-23 13:01:47 +02:00
|
|
|
("%u\n", pReq->header.size), VERR_INVALID_PARAMETER);
|
|
|
|
|
|
|
|
pReq->fEnabled = false;
|
|
|
|
+
|
|
|
|
+ if (!pThis || !pThis->pDrv || !pThis->pDrv->pfnIsPageFusionEnabled)
|
|
|
|
+ return VINF_SUCCESS;
|
|
|
|
+
|
|
|
|
int rc = pThis->pDrv->pfnIsPageFusionEnabled(pThis->pDrv, &pReq->fEnabled);
|
|
|
|
if (RT_FAILURE(rc))
|
|
|
|
pReq->fEnabled = false;
|
2016-10-05 16:51:35 +02:00
|
|
|
+++ 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
|
2014-09-23 13:01:47 +02:00
|
|
|
|
2016-10-05 16:51:35 +02:00
|
|
|
/*
|