Changeset 74474 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA.cpp

Timestamp:

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

Author:

vboxsync

Message:

Main,Devices: Graphics controller updates. bugref:8893

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (4 diffs)

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