Changeset 49983 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Dec 19, 2013 12:23:17 PM (11 years ago)

Author:

vboxsync

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

91415

Message:

Devices/Graphics: VMware SVGA II compatible graphics emulation (2D only), including the associated small API and VBoxManage changes, contributed by trivirt AG.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageModifyVM.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -83 +83 @@
         $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH) \
         $(if $(VBOX_WITH_VPX),VBOX_WITH_VPX) \
-        $(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE)
+        $(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE) \
+        $(if $(VBOX_WITH_VMSVGA),VBOX_WITH_VMSVGA)
 
 # VBoxNetPortForwardString.h

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -197 +197 @@
                      "                            [--cpuexecutioncap <1-100>]\n"
                      "                            [--rtcuseutc on|off]\n"
+#ifdef VBOX_WITH_VMSVGA
+                     "                            [--graphicscontroller none|vboxvga|vmsvga]\n"
+#else
                      "                            [--graphicscontroller none|vboxvga]\n"
+#endif
                      "                            [--monitorcount <number>]\n"
                      "                            [--accelerate3d on|off]\n"

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -735 +735 @@
                          || !RTStrICmp(ValueUnion.psz, "vesa"))
                     CHECK_ERROR(machine, COMSETTER(GraphicsControllerType)(GraphicsControllerType_VBoxVGA));
+#ifdef VBOX_WITH_VMSVGA
+                else if (   !RTStrICmp(ValueUnion.psz, "vmsvga")
+                         || !RTStrICmp(ValueUnion.psz, "vmware"))
+                    CHECK_ERROR(machine, COMSETTER(GraphicsControllerType)(GraphicsControllerType_VMSVGA));
+#endif
                 else
                 {