Changeset 45674 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Apr 23, 2013 8:45:54 AM (12 years ago)

Author:

vboxsync

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

85197

Message:

Main/Machine+Console+Display+VRDEServer,VBoxManage: allow VMs without graphics controller, eliminate annoying spurious error messages about Console not yet powered up when taking screenshots, getting/setting guest properties and updating metrics, make as many parameters to modifyvm as possible case insensitive

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (3 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -2701 +2701 @@
                 if (strGraphicsControllerType == "VBOXVGA")
                     type = GraphicsControllerType_VBoxVGA;
+                else if (strGraphicsControllerType == "NONE")
+                    type = GraphicsControllerType_Null;
                 else
                     throw ConfigFileError(this, pelmHwChild, N_("Invalid value '%s' in Display/@controller attribute"), strGraphicsControllerType.c_str());
@@ -3879 +3881 @@
 
     xml::ElementNode *pelmDisplay = pelmHardware->createChild("Display");
+    if (hw.graphicsControllerType != GraphicsControllerType_VBoxVGA)
+    {
+        const char *pcszGraphics;
+        switch (hw.graphicsControllerType)
+        {
+            case GraphicsControllerType_VBoxVGA:            pcszGraphics = "VBoxVGA"; break;
+            default: /*case GraphicsControllerType_Null:*/  pcszGraphics = "None"; break;
+        }
+        pelmDisplay->setAttribute("controller", pcszGraphics);
+    }
     pelmDisplay->setAttribute("VRAMSize", hw.ulVRAMSizeMB);
     pelmDisplay->setAttribute("monitorCount", hw.cMonitors);
@@ -5017 +5029 @@
     if (m->sv < SettingsVersion_v1_14)
     {
-        // VirtualBox 4.3 adds default frontend setting.
+        // VirtualBox 4.3 adds default frontend setting, graphics controller
+        // setting, explicit long mode setting.
         if (   !hardwareMachine.strDefaultFrontend.isEmpty()
+            || hardwareMachine.graphicsControllerType != GraphicsControllerType_VBoxVGA
             || hardwareMachine.enmLongMode != Hardware::LongMode_Legacy)
             m->sv = SettingsVersion_v1_14;