Changeset 68550 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibBalloon.cpp

Timestamp:

Aug 31, 2017 12:09:41 PM (7 years ago)

Author:

vboxsync

Message:

merging vbglioc r117689: Initial VBoxGuest I/O control changes.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibBalloon.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibBalloon.cpp

@@ -30 +30 @@
 *********************************************************************************************************************************/
 #include "VBGLR3Internal.h"
+#include <iprt/string.h>
 
 
@@ -41 +42 @@
 VBGLR3DECL(int) VbglR3MemBalloonRefresh(uint32_t *pcChunks, bool *pfHandleInR3)
 {
-    VBoxGuestCheckBalloonInfo Info;
-    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_CHECK_BALLOON, &Info, sizeof(Info));
+    VBGLIOCCHECKBALLOON Info;
+    VBGLREQHDR_INIT(&Info.Hdr, CHECK_BALLOON);
+    int rc = vbglR3DoIOCtl(VBGL_IOCTL_CHECK_BALLOON, &Info.Hdr, sizeof(Info));
     if (RT_SUCCESS(rc))
     {
-        *pcChunks = Info.cBalloonChunks;
-        Assert(Info.fHandleInR3 == (uint32_t)false || Info.fHandleInR3 == (uint32_t)true || RT_FAILURE(rc));
-        *pfHandleInR3 = Info.fHandleInR3 != false;
+        *pcChunks = Info.u.Out.cBalloonChunks;
+        *pfHandleInR3 = Info.u.Out.fHandleInR3 != false;
     }
     return rc;
@@ -63 +64 @@
 VBGLR3DECL(int) VbglR3MemBalloonChange(void *pv, bool fInflate)
 {
-    VBoxGuestChangeBalloonInfo Info;
-    Info.u64ChunkAddr = (uint64_t)((uintptr_t)pv);
-    Info.fInflate = fInflate;
-    return vbglR3DoIOCtl(VBOXGUEST_IOCTL_CHANGE_BALLOON, &Info, sizeof(Info));
+    VBGLIOCCHANGEBALLOON Info;
+    VBGLREQHDR_INIT(&Info.Hdr, CHANGE_BALLOON);
+    Info.u.In.pvChunk  = pv;
+    Info.u.In.fInflate = fInflate;
+    RT_ZERO(Info.u.In.abPadding);
+    return vbglR3DoIOCtl(VBGL_IOCTL_CHANGE_BALLOON, &Info.Hdr, sizeof(Info));
 }