Changeset 25848 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Jan 14, 2010 10:12:21 PM (15 years ago)

Author:

vboxsync

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

56635

Message:

CPU hotplug: Merge the third patch. Guest additions interface for the CPU hot-plug monitor

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (3 diffs)
• VMMDevState.h (modified) (1 diff)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -1624 +1624 @@
         }
 
+        case VMMDevReq_GetCpuHotPlugRequest:
+        {
+            VMMDevGetCpuHotPlugRequest *pReqCpuHotPlug = (VMMDevGetCpuHotPlugRequest *)pRequestHeader;
+
+            if (pRequestHeader->size != sizeof(VMMDevGetCpuHotPlugRequest))
+            {
+                pRequestHeader->rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            {
+                pReqCpuHotPlug->enmEventType = pThis->enmCpuHotPlugEvent;
+                pReqCpuHotPlug->idCpuCore    = pThis->idCpuCore;
+                pReqCpuHotPlug->idCpuPackage = pThis->idCpuPackage;
+                pReqCpuHotPlug->header.rc    = VINF_SUCCESS;
+
+                /* Clear the event */
+                pThis->enmCpuHotPlugEvent = VMMDevCpuEventType_None;
+                pThis->idCpuCore          = UINT32_MAX;
+                pThis->idCpuPackage       = UINT32_MAX;
+            }
+            break;
+        }
+
+        case VMMDevReq_SetCpuHotPlugStatus:
+        {
+            VMMDevCpuHotPlugStatusRequest *pReqCpuHotPlugStatus = (VMMDevCpuHotPlugStatusRequest *)pRequestHeader;
+
+            if (pRequestHeader->size != sizeof(VMMDevCpuHotPlugStatusRequest))
+            {
+                pRequestHeader->rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            {
+                pRequestHeader->rc = VINF_SUCCESS;
+
+                if (pReqCpuHotPlugStatus->enmStatusType == VMMDevCpuStatusType_Disable)
+                    pThis->fCpuHotPlugEventsEnabled = false;
+                else if (pReqCpuHotPlugStatus->enmStatusType == VMMDevCpuStatusType_Enable)
+                    pThis->fCpuHotPlugEventsEnabled = true;
+                else
+                    pRequestHeader->rc = VERR_INVALID_PARAMETER;
+            }
+            break;
+        }
+
 #ifdef DEBUG
         case VMMDevReq_LogString:
@@ -2111 +2156 @@
 }
 
+/**
+ * Notification that a CPU is about to be unplugged from the VM.
+ * The guest has to eject the CPU.
+ *
+ * @returns VBox status code.
+ * @param   idCpu    The id of the CPU.
+ * @param   idCpuCore    The core id of the CPU to remove.
+ * @param   idCpuPackage The package id of the CPU to remove.
+ */
+static DECLCALLBACK(int) vmmdevCpuHotUnplug(PPDMIVMMDEVPORT pInterface, uint32_t idCpuCore, uint32_t idCpuPackage)
+{
+    int rc = VINF_SUCCESS;
+    VMMDevState *pThis = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
+
+    Log(("vmmdevCpuHotUnplug: idCpuCore=%u idCpuPackage=%u\n", idCpuCore, idCpuPackage));
+
+    PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
+
+    if (pThis->fCpuHotPlugEventsEnabled)
+    {
+        pThis->enmCpuHotPlugEvent = VMMDevCpuEventType_Unplug;
+        pThis->idCpuCore          = idCpuCore;
+        pThis->idCpuPackage       = idCpuPackage;
+        VMMDevNotifyGuest (pThis, VMMDEV_EVENT_CPU_HOTPLUG);
+    }
+    else
+        rc = VERR_CPU_HOTPLUG_NOT_MONITORED_BY_GUEST;
+
+    PDMCritSectLeave(&pThis->CritSect);
+    return rc;
+}
+
+/**
+ * Notification that a CPU was attached to the VM
+ * The guest may use it now.
+ *
+ * @returns VBox status code.
+ * @param   idCpuCore    The core id of the CPU to add.
+ * @param   idCpuPackage The package id of the CPU to add.
+ */
+static DECLCALLBACK(int) vmmdevCpuHotPlug(PPDMIVMMDEVPORT pInterface, uint32_t idCpuCore, uint32_t idCpuPackage)
+{
+    int rc = VINF_SUCCESS;
+    VMMDevState *pThis = IVMMDEVPORT_2_VMMDEVSTATE(pInterface);
+
+    Log(("vmmdevCpuPlug: idCpuCore=%u idCpuPackage=%u\n", idCpuCore, idCpuPackage));
+
+    PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
+
+    if (pThis->fCpuHotPlugEventsEnabled)
+    {
+        pThis->enmCpuHotPlugEvent = VMMDevCpuEventType_Plug;
+        pThis->idCpuCore          = idCpuCore;
+        pThis->idCpuPackage       = idCpuPackage;
+        VMMDevNotifyGuest(pThis, VMMDEV_EVENT_CPU_HOTPLUG);
+    }
+    else
+        rc = VERR_CPU_HOTPLUG_NOT_MONITORED_BY_GUEST;
+
+    PDMCritSectLeave(&pThis->CritSect);
+    return rc;
+}
 
 /* -=-=-=-=-=- Saved State -=-=-=-=-=- */
@@ -2409 +2516 @@
     pThis->Port.pfnSetStatisticsInterval  = vmmdevSetStatisticsInterval;
     pThis->Port.pfnVRDPChange             = vmmdevVRDPChange;
+    pThis->Port.pfnCpuHotUnplug           = vmmdevCpuHotUnplug;
+    pThis->Port.pfnCpuHotPlug             = vmmdevCpuHotPlug;
 
     /* Shared folder LED */

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -198 +198 @@
         R3PTRTYPE(PPDMILEDCONNECTORS)       pLedsConnector;
     } SharedFolders;
+
+    /** FLag whether CPU hotplug events are monitored */
+    bool                 fCpuHotPlugEventsEnabled;
+    /** CPU hotplug event */
+    VMMDevCpuEventType   enmCpuHotPlugEvent;
+    /** Core id of the CPU to change */
+    uint32_t             idCpuCore;
+    /** Package id of the CPU to changhe */
+    uint32_t             idCpuPackage;
 } VMMDevState;
 AssertCompileMemberAlignment(VMMDevState, CritSect, 8);