Changeset 20835 in vbox for trunk/include/VBox

Timestamp:

Jun 23, 2009 1:55:08 PM (16 years ago)

Author:

vboxsync

Message:

Interface for generating NMI & SMI added.

Location:

trunk/include/VBox

Files:

• pdmdev.h (modified) (7 diffs)
• vm.h (modified) (1 diff)

trunk/include/VBox/pdmdev.h

@@ -1103 +1103 @@
 } PDMAPICVERSION;
 
+/**
+ * APIC irq argument for SetInterruptFF.
+ */
+typedef enum PDMAPICIRQ
+{
+    /** Invalid 0 entry. */
+    PDMAPICIRQ_INVALID = 0,
+    /** Normal hardware interrupt. */
+    PDMAPICIRQ_HARDWARE,
+    /** NMI. */
+    PDMAPICIRQ_NMI,
+    /** SMI. */
+    PDMAPICIRQ_SMI,
+    /** The usual 32-bit paranoia. */
+    PDMAPICIRQ_32BIT_HACK = 0x7fffffff
+} PDMAPICIRQ;
+
 
 /**
@@ -1116 +1133 @@
      *
      * @param   pDevIns         Device instance of the APIC.
+     * @param   enmType         Irq type
      * @param   idCpu           Virtual CPU to set flag upon.
      */
-    DECLRCCALLBACKMEMBER(void, pfnSetInterruptFF,(PPDMDEVINS pDevIns, VMCPUID idCpu));
+    DECLRCCALLBACKMEMBER(void, pfnSetInterruptFF,(PPDMDEVINS pDevIns, PDMAPICIRQ enmType, VMCPUID idCpu));
 
     /**
@@ -1169 +1187 @@
 
 /** Current PDMAPICHLPRC version number. */
-#define PDM_APICHLPRC_VERSION   0x60010000
+#define PDM_APICHLPRC_VERSION   0x60010001
 
 
@@ -1184 +1202 @@
      *
      * @param   pDevIns         Device instance of the APIC.
+     * @param   enmType         Irq type
      * @param   idCpu           Virtual CPU to set flag upon.
      */
-    DECLR0CALLBACKMEMBER(void, pfnSetInterruptFF,(PPDMDEVINS pDevIns, VMCPUID idCpu));
+    DECLR0CALLBACKMEMBER(void, pfnSetInterruptFF,(PPDMDEVINS pDevIns, PDMAPICIRQ enmType, VMCPUID idCpu));
 
     /**
@@ -1237 +1256 @@
 
 /** Current PDMAPICHLPR0 version number. */
-#define PDM_APICHLPR0_VERSION   0x60010000
+#define PDM_APICHLPR0_VERSION   0x60010001
 
 /**
@@ -1251 +1270 @@
      *
      * @param   pDevIns         Device instance of the APIC.
+     * @param   enmType         IRQ type
      * @param   idCpu           Virtual CPU to set flag upon.
      */
-    DECLR3CALLBACKMEMBER(void, pfnSetInterruptFF,(PPDMDEVINS pDevIns, VMCPUID idCpu));
+    DECLR3CALLBACKMEMBER(void, pfnSetInterruptFF,(PPDMDEVINS pDevIns, PDMAPICIRQ enmType, VMCPUID idCpu));
 
     /**
@@ -1351 +1371 @@
 
 /** Current PDMAPICHLP version number. */
-#define PDM_APICHLPR3_VERSION  0xfd020000
+#define PDM_APICHLPR3_VERSION  0xfd020001
 
 

trunk/include/VBox/vm.h

@@ -294 +294 @@
 
 
-/** This action forces the VM to service check and pending interrups on the APIC. */
+/** This action forces the VM to check any pending interrups on the APIC. */
 #define VMCPU_FF_INTERRUPT_APIC             RT_BIT_32(0)
-/** This action forces the VM to service check and pending interrups on the PIC. */
+/** This action forces the VM to check any pending interrups on the PIC. */
 #define VMCPU_FF_INTERRUPT_PIC              RT_BIT_32(1)
 /** This action forces the VM to schedule and run pending timer (TM).
  * @remarks Don't move - PATM compatability.  */
 #define VMCPU_FF_TIMER                      RT_BIT_32(2)
+/** This action forces the VM to check any pending NMIs. */
+#define VMCPU_FF_INTERRUPT_NMI              RT_BIT_32(3)
+/** This action forces the VM to check any pending SMIs. */
+#define VMCPU_FF_INTERRUPT_SMI              RT_BIT_32(4)
 /** PDM critical section unlocking is pending, process promptly upon return to R3. */
 #define VMCPU_FF_PDM_CRITSECT               RT_BIT_32(5)