Changeset 19257 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Apr 29, 2009 11:51:55 AM (16 years ago)

Author:

vboxsync

Message:

Reapplied 46658 + fix

File:

• trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -691 +691 @@
  * @returns VBox status code.
  * @param   pVM             The VM to operate on.
+ * @param   idCpu           VMCPU id.
  * @param   enmOperation    Which operation to execute.
  * @param   pReqHdr         This points to a SUPVMMR0REQHDR packet. Optional.
@@ -698 +699 @@
  * @remarks Assume called with interrupts _enabled_.
  */
-static int vmmR0EntryExWorker(PVM pVM, VMMR0OPERATION enmOperation, PSUPVMMR0REQHDR pReqHdr, uint64_t u64Arg, PSUPDRVSESSION pSession)
+static int vmmR0EntryExWorker(PVM pVM, unsigned idCpu, VMMR0OPERATION enmOperation, PSUPVMMR0REQHDR pReqHdr, uint64_t u64Arg, PSUPDRVSESSION pSession)
 {
     /*
@@ -992 +993 @@
 
 /**
- * Argument for vmmR0EntryExWrapper containing the argument s ofr VMMR0EntryEx.
+ * Argument for vmmR0EntryExWrapper containing the arguments for VMMR0EntryEx.
  */
 typedef struct VMMR0ENTRYEXARGS
 {
     PVM                 pVM;
+    unsigned            idCpu;
     VMMR0OPERATION      enmOperation;
     PSUPVMMR0REQHDR     pReq;
@@ -1014 +1016 @@
 {
     return vmmR0EntryExWorker(((PVMMR0ENTRYEXARGS)pvArgs)->pVM,
+                              ((PVMMR0ENTRYEXARGS)pvArgs)->idCpu,
                               ((PVMMR0ENTRYEXARGS)pvArgs)->enmOperation,
                               ((PVMMR0ENTRYEXARGS)pvArgs)->pReq,
@@ -1026 +1029 @@
  * @returns VBox status code.
  * @param   pVM             The VM to operate on.
+ * @param   idCpu           VMCPU id.
  * @param   enmOperation    Which operation to execute.
  * @param   pReq            This points to a SUPVMMR0REQHDR packet. Optional.
@@ -1032 +1036 @@
  * @remarks Assume called with interrupts _enabled_.
  */
-VMMR0DECL(int) VMMR0EntryEx(PVM pVM, VMMR0OPERATION enmOperation, PSUPVMMR0REQHDR pReq, uint64_t u64Arg, PSUPDRVSESSION pSession)
+VMMR0DECL(int) VMMR0EntryEx(PVM pVM, unsigned idCpu, VMMR0OPERATION enmOperation, PSUPVMMR0REQHDR pReq, uint64_t u64Arg, PSUPDRVSESSION pSession)
 {
     /*
@@ -1060 +1064 @@
                 VMMR0ENTRYEXARGS Args;
                 Args.pVM = pVM;
+                Args.idCpu = idCpu;
                 Args.enmOperation = enmOperation;
                 Args.pReq = pReq;
@@ -1071 +1076 @@
         }
     }
-    return vmmR0EntryExWorker(pVM, enmOperation, pReq, u64Arg, pSession);
+    return vmmR0EntryExWorker(pVM, idCpu, enmOperation, pReq, u64Arg, pSession);
 }