Changeset 51282 in vbox for trunk/src/VBox/VMM

Timestamp:

May 19, 2014 4:52:41 AM (11 years ago)

Author:

vboxsync

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

93748

Message:

VMM: Disallow modifying leaves that has SSM deps. through CPUMR3CpuIdInsert().

File:

• trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp (modified) (1 diff)

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

@@ -926 +926 @@
 VMMR3DECL(int) CPUMR3CpuIdInsert(PVM pVM, PCPUMCPUIDLEAF pNewLeaf)
 {
-    /** @todo Should we disallow here inserting/replacing the standard leaves that
-     *        PATM relies on? See @bugref{7270}. */
+    /*
+     * Validate parameters.
+     */
+    AssertReturn(pVM, VERR_INVALID_PARAMETER);
+    AssertReturn(pNewLeaf, VERR_INVALID_PARAMETER);
+
+    /*
+     * Disallow replacing CPU ID leaves that this API currently cannot manage.                                                                                .
+     * These leaves have dependencies on saved-states, see PATMCpuidReplacement().
+     * If you want to modify these leaves, use CPUMSetGuestCpuIdFeature().                                                                         .
+     */
+    if (   pNewLeaf->uLeaf == UINT32_C(0x00000000)  /* Standard */
+        || pNewLeaf->uLeaf == UINT32_C(0x80000000)  /* Extended */
+        || pNewLeaf->uLeaf == UINT32_C(0xc0000000)) /* Centaur */
+    {
+        return VERR_NOT_SUPPORTED;
+    }
+
     return cpumR3CpuIdInsert(pVM, NULL /* ppaLeaves */, NULL /* pcLeaves */, pNewLeaf);
 }