Changeset 93022 in vbox

Timestamp:

Dec 17, 2021 6:05:16 PM (3 years ago)

Author:

vboxsync

Message:

Additions/VBoxService: Selective feature compilation fixes -- ballooning is part of VBoxSerivice' management feature.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxServiceInternal.h (modified) (1 diff)
• VBoxServiceStats.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

@@ -133 +133 @@
 
 ifdef VBOX_WITH_VBOXSERVICE_MANAGEMENT
-VBoxService_SOURCES      += \
+ ifdef VBOX_WITH_MEMBALLOON
+  VBoxService_SOURCES    += \
         VBoxServiceBalloon.cpp
- ifdef VBOX_WITH_MEMBALLOON
-VBoxService_DEFS         += VBOX_WITH_MEMBALLOON
+  VBoxService_DEFS       += VBOX_WITH_MEMBALLOON
  endif
 endif

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -263 +263 @@
 #endif /* RT_OS_WINDOWS */
 
-#ifdef VBOX_WITH_VBOXSERVICE_MANAGEMENT
+#ifdef VBOX_WITH_MEMBALLOON
 extern uint32_t                 VGSvcBalloonQueryPages(uint32_t cbPage);
 #endif

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp

@@ -535 +535 @@
                                    | VBOX_GUEST_STAT_MEM_SYSTEM_CACHE
                                    | VBOX_GUEST_STAT_PAGE_FILE_SIZE;
-#ifdef VBOX_WITH_MEMBALLOON
+# ifdef VBOX_WITH_MEMBALLOON
         req.guestStats.u32PhysMemBalloon  = VGSvcBalloonQueryPages(_4K);
         req.guestStats.u32StatCaps       |= VBOX_GUEST_STAT_PHYS_MEM_BALLOON;
-#else
+# else
         req.guestStats.u32PhysMemBalloon  = 0;
-#endif
+# endif
 
         /*