Changeset 86823 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Nov 6, 2020 12:57:57 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

141268

Message:

Additions/VBoxService: The DRM resizing code needs guest properties (VBOX_WITH_GUEST_PROPS).

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• Makefile.kmk (modified) (3 diffs)
• VBoxService.cpp (modified) (3 diffs)

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

@@ -62 +62 @@
 endif
 
+# DRM Resize.
+ifeq ($(KBUILD_TARGET),linux) && defined(VBOX_WITH_GUEST_PROPS)
+ # The DRM resizing code needs guest properties.
+ VBOX_WITH_VBOXSERVICE_DRMRESIZE    := 1
+endif
+
 #
 # VBoxService
@@ -75 +81 @@
         $(if $(VBOX_WITH_VBOXSERVICE_CONTROL),VBOX_WITH_VBOXSERVICE_CONTROL,) \
         $(if $(VBOX_WITH_VBOXSERVICE_CPUHOTPLUG),VBOX_WITH_VBOXSERVICE_CPUHOTPLUG,) \
+        $(if $(VBOX_WITH_VBOXSERVICE_DRMRESIZE),VBOX_WITH_VBOXSERVICE_DRMRESIZE,) \
         $(if $(VBOX_WITH_VBOXSERVICE_MANAGEMENT),VBOX_WITH_VBOXSERVICE_MANAGEMENT,) \
         $(if $(VBOX_WITH_VBOXSERVICE_PAGE_SHARING),VBOX_WITH_VBOXSERVICE_PAGE_SHARING,) \
@@ -193 +200 @@
 endif
 
-VBoxServiceVMInfo.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
-VBoxServiceVMInfo.cpp_DEPS = $(VBOX_SVN_REV_KMK)
+ifdef VBOX_WITH_VBOXSERVICE_VMINFO
+ VBoxServiceVMInfo.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
+ VBoxServiceVMInfo.cpp_DEPS = $(VBOX_SVN_REV_KMK)
+endif
 
 VBoxService_USES.win += vboximportchecker

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

@@ -894 +894 @@
 }
 
-#ifdef RT_OS_LINUX
+#ifdef VBOX_WITH_VBOXSERVICE_DRMRESIZE
 /**
  * Check for a guest property and start VBoxDRMClient if it exists.
@@ -921 +921 @@
     }
 }
-#endif
+#endif /* VBOX_WITH_VBOXSERVICE_DRMRESIZE */
 
 int main(int argc, char **argv)
@@ -1187 +1187 @@
         return rcExit;
 
-#ifdef RT_OS_LINUX
+#ifdef VBOX_WITH_VBOXSERVICE_DRMRESIZE
     startDRMResize();
-#endif
+#endif /* VBOX_WITH_VBOXSERVICE_DRMRESIZE */
 
 #ifdef RT_OS_WINDOWS