Changeset 74474 in vbox for trunk/src/VBox/Main

Timestamp:

Sep 26, 2018 11:55:47 AM (6 years ago)

Author:

vboxsync

Message:

Main,Devices: Graphics controller updates. bugref:8893

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• src-server/MachineImpl.cpp (modified) (1 diff)
• xml/Settings.cpp (modified) (2 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -4762 +4762 @@
   <enum
     name="GraphicsControllerType"
-    uuid="79c96ca0-9f39-4900-948e-68c41cbe127a"
-    >
-    <desc>Graphics controller type, used with <link to="IMachine::unregister" />.
+    uuid="3e009bb0-2b57-4283-a39b-4c363d4f0808"
+    >
+    <desc>Graphics controller type, used with <link to="IMachine::graphicsControllerType" />.
     </desc>
     <const name="Null"      value="0">
@@ -4770 +4770 @@
     </const>
     <const name="VBoxVGA"   value="1">
-      <desc>Default VirtualBox VGA device.</desc>
+      <desc>VirtualBox VGA device.</desc>
     </const>
     <const name="VMSVGA"    value="2">
       <desc>VMware SVGA II device.</desc>
+    </const>
+    <const name="VBoxSVGA"  value="3">
+      <desc>VirtualBox VGA device with VMware SVGA II extensions.</desc>
     </const>
   </enum>

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1667 +1667 @@
 #ifdef VBOX_WITH_VMSVGA
             case GraphicsControllerType_VMSVGA:
+            case GraphicsControllerType_VBoxSVGA:
 #endif
                 rc = i_configGraphicsController(pDevices, enmGraphicsController, pBusMgr, pMachine, biosSettings,
@@ -3824 +3825 @@
 
 #ifdef VBOX_WITH_VMSVGA
-        if (enmGraphicsController == GraphicsControllerType_VMSVGA)
+        if (   enmGraphicsController == GraphicsControllerType_VMSVGA
+            || enmGraphicsController == GraphicsControllerType_VBoxSVGA)
         {
             InsertConfigInteger(pCfg, "VMSVGAEnabled", true);
+            if (enmGraphicsController == GraphicsControllerType_VMSVGA)
+                InsertConfigInteger(pCfg, "VMSVGAPciId", true);
 #ifdef VBOX_WITH_VMSVGA3D
             IFramebuffer *pFramebuffer = NULL;

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -2021 +2021 @@
 #ifdef VBOX_WITH_VMSVGA
         case GraphicsControllerType_VMSVGA:
+        case GraphicsControllerType_VBoxSVGA:
 #endif
             break;

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

@@ -4259 +4259 @@
                 else if (strGraphicsControllerType == "VMSVGA")
                     type = GraphicsControllerType_VMSVGA;
+                else if (strGraphicsControllerType == "VBOXSVGA")
+                    type = GraphicsControllerType_VBoxSVGA;
                 else if (strGraphicsControllerType == "NONE")
                     type = GraphicsControllerType_Null;
@@ -5647 +5649 @@
                 case GraphicsControllerType_VBoxVGA:            pcszGraphics = "VBoxVGA"; break;
                 case GraphicsControllerType_VMSVGA:             pcszGraphics = "VMSVGA"; break;
+                case GraphicsControllerType_VBoxSVGA:           pcszGraphics = "VBoxSVGA"; break;
                 default: /*case GraphicsControllerType_Null:*/  pcszGraphics = "None"; break;
             }