Changeset 24315 in vbox

Timestamp:

Nov 4, 2009 11:12:48 AM (15 years ago)

Author:

vboxsync

Message:

Added methods to remove cpuid leafs

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (1 diff)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/MachineImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -1485 +1485 @@
 }
 
+STDMETHODIMP Machine::RemoveCpuIdLeaf(ULONG id)
+{
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
+
+    HRESULT rc = checkStateDependency(MutableStateDep);
+    CheckComRCReturnRC(rc);
+
+    switch(id)
+    {
+    case 0x0:
+    case 0x1:
+    case 0x2:
+    case 0x3:
+    case 0x4:
+    case 0x5:
+    case 0x6:
+    case 0x7:
+    case 0x8:
+    case 0x9:
+    case 0xA:
+        AssertRelease(id < RT_ELEMENTS(mHWData->mCpuIdStdLeafs));
+        /* Invalidate leaf. */
+        mHWData->mCpuIdStdLeafs[id].ulId = -1
+        break;
+
+    case 0x80000000:
+    case 0x80000001:
+    case 0x80000002:
+    case 0x80000003:
+    case 0x80000004:
+    case 0x80000005:
+    case 0x80000006:
+    case 0x80000007:
+    case 0x80000008:
+    case 0x80000009:
+    case 0x8000000A:
+        AssertRelease(id - 0x80000000 < RT_ELEMENTS(mHWData->mCpuIdExtLeafs));
+        /* Invalidate leaf. */
+        mHWData->mCpuIdExtLeafs[id - 0x80000000].ulId  = -1;
+        break;
+
+    default:
+        return E_INVALIDARG;
+    }
+    return S_OK;
+}
+
+STDMETHODIMP Machine::removeAllCpuIdLeafs()
+{
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this);
+
+    HRESULT rc = checkStateDependency(MutableStateDep);
+    CheckComRCReturnRC(rc);
+
+    /* Invalidate all standard leafs. */
+    for (unsigned i = 0; i < RT_ELEMENTS(mHWData->mCpuIdStdLeafs); i++)
+        mHWData->mCpuIdStdLeafs[id].ulId  = -1;
+
+    /* Invalidate all extended leafs. */
+    for (unsigned i = 0; i < RT_ELEMENTS(mHWData->mCpuIdExtLeafs); i++)
+        mHWData->mCpuIdExtLeafs[id].ulId = -1;
+
+    return S_OK;
+}
 
 STDMETHODIMP Machine::GetHWVirtExProperty(HWVirtExPropertyType_T property, BOOL *aVal)

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

@@ -4097 +4097 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="c9e6bf40-f415-4a59-bb86-5190d93e49f6"
+     uuid="e2e5bab4-16ff-4ef4-b9df-f0b4433c1d1b"
      wsmap="managed"
      >
@@ -5246 +5246 @@
     </method>
 
+    <method name="removeCpuIdLeaf" const="yes">
+      <desc>
+        Removes the virtual CPU cpuid leaf for the specified index
+
+        <result name="E_INVALIDARG">
+          Invalid id.
+        </result>
+
+      </desc>
+      <param name="id" type="unsigned long" dir="in">
+        <desc>
+          Cpuid leaf index.
+        </desc>
+      </param>
+    </method>
+
+    <method name="removeAllCpuIdLeafs" const="yes">
+      <desc>
+        Removes all the virtual CPU cpuid leafs
+      </desc>
+    </method>
+
     <method name="getHWVirtExProperty" const="yes">
       <desc>

trunk/src/VBox/Main/include/MachineImpl.h

@@ -599 +599 @@
     STDMETHOD(GetCpuIdLeaf)(ULONG id, ULONG *aValEax, ULONG *aValEbx, ULONG *aValEcx, ULONG *aValEdx);
     STDMETHOD(SetCpuIdLeaf)(ULONG id, ULONG aValEax, ULONG aValEbx, ULONG aValEcx, ULONG aValEdx);
+    STDMETHOD(RemoveCpuIdLeaf)(ULONG id);
+    STDMETHOD(RemoveAllCpuIdLeafs)();
     STDMETHOD(GetHWVirtExProperty)(HWVirtExPropertyType_T property, BOOL *aVal);
     STDMETHOD(SetHWVirtExProperty)(HWVirtExPropertyType_T property, BOOL aVal);