Changeset 25848 in vbox for trunk/include

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/include/VBox

Files:

• VMMDev.h (modified) (4 diffs)
• VMMDev2.h (modified) (1 diff)
• err.h (modified) (1 diff)
• pdmifs.h (modified) (1 diff)

trunk/include/VBox/VMMDev.h

@@ -92 +92 @@
 /** New mouse position data available. */
 #define VMMDEV_EVENT_MOUSE_POSITION_CHANGED                 RT_BIT(9)
+/** CPU hotplug event occurred. */
+#define VMMDEV_EVENT_CPU_HOTPLUG                            RT_BIT(10)
 /** The mask of valid events, for sanity checking. */
-#define VMMDEV_EVENT_VALID_EVENT_MASK                       UINT32_C(0x000003ff)
+#define VMMDEV_EVENT_VALID_EVENT_MASK                       UINT32_C(0x000007ff)
 /** @} */
 
@@ -169 +171 @@
     VMMDevReq_GetVRDPChangeRequest       = 150,
     VMMDevReq_LogString                  = 200,
+    VMMDevReq_GetCpuHotPlugRequest       = 210,
+    VMMDevReq_SetCpuHotPlugStatus        = 211,
     VMMDevReq_SizeHack                   = 0x7fffffff
 } VMMDevRequestType;
@@ -983 +987 @@
 AssertCompileSize(RTRECT, 16);
 AssertCompileSize(VMMDevVideoSetVisibleRegion, 24+4+16);
+
+/**
+ * CPU event types.
+ */
+typedef enum
+{
+    VMMDevCpuStatusType_Invalid  = 0,
+    VMMDevCpuStatusType_Disable  = 1,
+    VMMDevCpuStatusType_Enable   = 2,
+    VMMDevCpuStatusType_SizeHack = 0x7fffffff
+} VMMDevCpuStatusType;
+
+/**
+ * CPU hotplug event status request.
+ */
+typedef struct
+{
+    /** Header. */
+    VMMDevRequestHeader header;
+    /** Status type */
+    VMMDevCpuStatusType enmStatusType;
+} VMMDevCpuHotPlugStatusRequest;
+AssertCompileSize(VMMDevCpuHotPlugStatusRequest, 24+4);
+
+/**
+ * Get the ID of the changed CPU and event type.
+ */
+typedef struct
+{
+    /** Header. */
+    VMMDevRequestHeader header;
+    /** Event type */
+    VMMDevCpuEventType  enmEventType;
+    /** core id of the CPU changed */
+    uint32_t            idCpuCore;
+    /** package id of the CPU changed */
+    uint32_t            idCpuPackage;
+} VMMDevGetCpuHotPlugRequest;
+AssertCompileSize(VMMDevGetCpuHotPlugRequest, 24+4+4+4);
 
 #pragma pack()
@@ -1480 +1523 @@
         case VMMDevReq_CtlGuestFilterMask:
             return sizeof(VMMDevCtlGuestFilterMask);
+        case VMMDevReq_GetCpuHotPlugRequest:
+            return sizeof(VMMDevGetCpuHotPlugRequest);
+        case VMMDevReq_SetCpuHotPlugStatus:
+            return sizeof(VMMDevCpuHotPlugStatusRequest);
         default:
             return 0;

trunk/include/VBox/VMMDev2.h

@@ -56 +56 @@
 } VMMDevSeamlessMode;
 
+/**
+ * CPU event types.
+ *
+ * Used by VbglR3CpuHotplugWaitForEvent
+ *
+ * @ingroup grp_vmmdev_req
+ */
+typedef enum
+{
+    VMMDevCpuEventType_Invalid  = 0,
+    VMMDevCpuEventType_None     = 1,
+    VMMDevCpuEventType_Plug     = 2,
+    VMMDevCpuEventType_Unplug   = 3,
+    VMMDevCpuEventType_SizeHack = 0x7fffffff
+} VMMDevCpuEventType;
 
 /**

trunk/include/VBox/err.h

@@ -1492 +1492 @@
 /** @} */
 
+/** @name VBox CPU hotplug Status codes
+ * @{
+ */
+/** CPU hotplug events from VMMDev are not monitored by the guest */
+#define VERR_CPU_HOTPLUG_NOT_MONITORED_BY_GUEST    (-4700)
+/** @} */
+
 /* SED-END */
 

trunk/include/VBox/pdmifs.h

@@ -1902 +1902 @@
     DECLR3CALLBACKMEMBER(int, pfnVRDPChange, (PPDMIVMMDEVPORT pInterface, bool fVRDPEnabled, uint32_t u32VRDPExperienceLevel));
 
+    /**
+     * Notify the guest of CPU hot-unplug event.
+     *
+     * @returns VBox status code
+     * @param   idCpuCore    The core id of the CPU to remove.
+     * @param   idCpuPackage The package id of the CPU to remove.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnCpuHotUnplug, (PPDMIVMMDEVPORT pInterface, uint32_t idCpuCore, uint32_t idCpuPackage));
+
+    /**
+     * Notify the guest of CPU hot-plug event.
+     *
+     * @returns VBox status code
+     * @param   idCpuCore    The core id of the CPU to add.
+     * @param   idCpuPackage The package id of the CPU to add.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnCpuHotPlug, (PPDMIVMMDEVPORT pInterface, uint32_t idCpuCore, uint32_t idCpuPackage));
+
 } PDMIVMMDEVPORT;