Changeset 74474 in vbox for trunk

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

Files:

• Devices/Bus/DevPCI.cpp (modified) (2 diffs)
• Devices/Graphics/DevVGA.cpp (modified) (4 diffs)
• Devices/Graphics/DevVGA.h (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• Main/src-server/MachineImpl.cpp (modified) (1 diff)
• Main/xml/Settings.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Bus/DevPCI.cpp

@@ -491 +491 @@
                 break;
             case 0x0300:
+            {
                 if (vendor_id != 0x80ee)
                     goto default_map;
                 /* VGA: map frame buffer to default Bochs VBE address */
-                devpciR3BiosInitSetRegionAddress(pBus, pPciDev, 0, 0xe0000000);
+                int iRegion = devpciR3GetWord(pPciDev, VBOX_PCI_SUBSYSTEM_VENDOR_ID) == 0x15ad ? 1 : 0;
+                devpciR3BiosInitSetRegionAddress(pBus, pPciDev, iRegion, 0xe0000000);
                 /*
                  * Legacy VGA I/O ports are implicitly decoded by a VGA class device. But
@@ -504 +506 @@
                                 | PCI_COMMAND_IOACCESS | PCI_COMMAND_MEMACCESS);
                 break;
+            }
             case 0x0800:
                 /* PIC */

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -6184 +6184 @@
 #ifdef VBOX_WITH_VMSVGA
                                           "VMSVGAEnabled\0"
+                                          "VMSVGAPciId\0"
                                           "VMSVGAFifoSize\0"
 #endif
@@ -6223 +6224 @@
     rc = CFGMR3QueryBoolDef(pCfg, "3DEnabled", &pThis->f3DEnabled, false);
     AssertLogRelRCReturn(rc, rc);
+    Log(("VGA: f3DEnabled=%RTbool\n", pThis->f3DEnabled));
 
 #ifdef VBOX_WITH_VMSVGA
@@ -6228 +6230 @@
     AssertLogRelRCReturn(rc, rc);
     Log(("VMSVGA: VMSVGAEnabled   = %d\n", pThis->fVMSVGAEnabled));
+
+    rc = CFGMR3QueryBoolDef(pCfg, "VMSVGAPciId", &pThis->fVMSVGAPciId, false);
+    AssertLogRelRCReturn(rc, rc);
+    Log(("VMSVGA: VMSVGAPciId   = %d\n", pThis->fVMSVGAPciId));
 
     rc = CFGMR3QueryU32Def(pCfg, "VMSVGAFifoSize", &pThis->svga.cbFIFO, VMSVGA_FIFO_SIZE);
@@ -6257 +6263 @@
     {
         /* Extend our VGA device with VMWare SVGA functionality. */
-        PCIDevSetVendorId(&pThis->Dev, PCI_VENDOR_ID_VMWARE);
-        PCIDevSetDeviceId(&pThis->Dev, PCI_DEVICE_ID_VMWARE_SVGA2);
+        if (pThis->fVMSVGAPciId)
+        {
+            PCIDevSetVendorId(&pThis->Dev, PCI_VENDOR_ID_VMWARE);
+            PCIDevSetDeviceId(&pThis->Dev, PCI_DEVICE_ID_VMWARE_SVGA2);
+        }
+        else
+        {
+            PCIDevSetVendorId(&pThis->Dev, 0x80ee);   /* PCI vendor, just a free bogus value */
+            PCIDevSetDeviceId(&pThis->Dev, 0xbeef);
+        }
         PCIDevSetSubSystemVendorId(&pThis->Dev, PCI_VENDOR_ID_VMWARE);
         PCIDevSetSubSystemId(&pThis->Dev, PCI_DEVICE_ID_VMWARE_SVGA2);

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -343 +343 @@
     /* Whether the SVGA emulation is enabled or not. */
     bool                        fVMSVGAEnabled;
-    bool                        Padding4[0+4];
+    bool                        fVMSVGAPciId;
+    bool                        Padding4[0+3];
 # else
     bool                        Padding4[1+4];

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

@@ -531 +531 @@
                      "                            [--rtcuseutc on|off]\n"
 #ifdef VBOX_WITH_VMSVGA
-                     "                            [--graphicscontroller none|vboxvga|vmsvga]\n"
+                     "                            [--graphicscontroller none|vboxvga|vmsvga|vboxsvga]\n"
 #else
                      "                            [--graphicscontroller none|vboxvga]\n"

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

@@ -865 +865 @@
                          || !RTStrICmp(ValueUnion.psz, "vmware"))
                     CHECK_ERROR(sessionMachine, COMSETTER(GraphicsControllerType)(GraphicsControllerType_VMSVGA));
+                else if (   !RTStrICmp(ValueUnion.psz, "vboxsvga")
+                         || !RTStrICmp(ValueUnion.psz, "svga"))
+                    CHECK_ERROR(sessionMachine, COMSETTER(GraphicsControllerType)(GraphicsControllerType_VBoxSVGA));
 #endif
                 else

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;
             }