Changeset 57506 in vbox

Timestamp:

Aug 24, 2015 11:28:41 AM (9 years ago)

Author:

vboxsync

Message:

GIM/HyperV: Don't identify as Microsoft as the default vendor ID, use VBox specific ID; made configurable through CFGM.

File:

• trunk/src/VBox/VMM/VMMR3/GIMHv.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/GIMHv.cpp

@@ -94 +94 @@
     int rc;
     PGIMHV pHv = &pVM->gim.s.u.Hv;
+
+    /*
+     * Read configuration.
+     */
+    PCFGMNODE pCfgNode = CFGMR3GetChild(CFGMR3GetRoot(pVM), "GIM/HyperV");
+
+    /** @cfgm{/GIM/HyperV/VendorID, string, 'VBoxVBoxVBox'}
+     * The Hyper-V vendor signature, must be 12 characters. */
+    char szVendor[13];
+    rc = CFGMR3QueryStringDef(pCfgNode, "VendorID", szVendor, sizeof(szVendor), "VBoxVBoxVBox");
+    AssertLogRelRCReturn(rc, rc);
 
     /*
@@ -179 +190 @@
     HyperLeaf.uLeaf        = UINT32_C(0x40000000);
     HyperLeaf.uEax         = UINT32_C(0x40000006); /* Minimum value for Hyper-V is 0x40000005. */
-    HyperLeaf.uEbx         = 0x7263694D;           /* 'Micr' */
-    HyperLeaf.uEcx         = 0x666F736F;           /* 'osof' */
-    HyperLeaf.uEdx         = 0x76482074;           /* 't Hv' */
+    /* Don't report vendor as 'Microsoft Hv' by default, see @bugref{7270#c152}. */
+    {
+        uint32_t uVendorEbx;
+        uint32_t uVendorEcx;
+        uint32_t uVendorEdx;
+        uVendorEbx = ((uint32_t)szVendor[ 3]) << 24 | ((uint32_t)szVendor[ 2]) << 16 | ((uint32_t)szVendor[1]) << 8
+                    | (uint32_t)szVendor[ 0];
+        uVendorEcx = ((uint32_t)szVendor[ 7]) << 24 | ((uint32_t)szVendor[ 6]) << 16 | ((uint32_t)szVendor[5]) << 8
+                    | (uint32_t)szVendor[ 4];
+        uVendorEdx = ((uint32_t)szVendor[11]) << 24 | ((uint32_t)szVendor[10]) << 16 | ((uint32_t)szVendor[9]) << 8
+                    | (uint32_t)szVendor[ 8];
+        HyperLeaf.uEbx         = uVendorEbx;
+        HyperLeaf.uEcx         = uVendorEcx;
+        HyperLeaf.uEdx         = uVendorEdx;
+    }
     rc = CPUMR3CpuIdInsert(pVM, &HyperLeaf);
     AssertLogRelRCReturn(rc, rc);