Changeset 63510 in vbox for trunk/src/VBox/HostDrivers/Support/darwin
- Timestamp:
- Aug 15, 2016 11:08:03 PM (9 years ago)
- svn:sync-xref-src-repo-rev:
- 110164
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp
r62490 r63510 212 212 /*.d_mmap = */eno_mmap, 213 213 /*.d_strategy = */eno_strat, 214 /*.d_getc = */ eno_getc,215 /*.d_putc = */ eno_putc,214 /*.d_getc = */(void *)(uintptr_t)&enodev, //eno_getc, 215 /*.d_putc = */(void *)(uintptr_t)&enodev, //eno_putc, 216 216 /*.d_type = */0 217 217 }; … … 257 257 static kern_return_t VBoxDrvDarwinStart(struct kmod_info *pKModInfo, void *pvData) 258 258 { 259 RT_NOREF(pKModInfo, pvData); 259 260 int rc; 260 261 #ifdef DEBUG … … 394 395 * MSR prober stuff - optional! 395 396 */ 396 intrc2 = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "rdmsr_carefully", (void **)&g_pfnRdMsrCarefully);397 rc2 = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "rdmsr_carefully", (void **)&g_pfnRdMsrCarefully); 397 398 if (RT_FAILURE(rc2)) 398 399 g_pfnRdMsrCarefully = NULL; … … 425 426 static kern_return_t VBoxDrvDarwinStop(struct kmod_info *pKModInfo, void *pvData) 426 427 { 428 RT_NOREF(pKModInfo, pvData); 427 429 int rc; 428 430 LogFlow(("VBoxDrvDarwinStop\n")); … … 476 478 static int VBoxDrvDarwinOpen(dev_t Dev, int fFlags, int fDevType, struct proc *pProcess) 477 479 { 480 RT_NOREF(fFlags, fDevType); 478 481 #ifdef DEBUG_DARWIN_GIP 479 482 char szName[128]; … … 561 564 static int VBoxDrvDarwinClose(dev_t Dev, int fFlags, int fDevType, struct proc *pProcess) 562 565 { 566 RT_NOREF(Dev, fFlags, fDevType, pProcess); 563 567 Log(("VBoxDrvDarwinClose: pid=%d\n", (int)RTProcSelf())); 564 568 Assert(proc_pid(pProcess) == (int)RTProcSelf()); … … 584 588 static int VBoxDrvDarwinIOCtl(dev_t Dev, u_long iCmd, caddr_t pData, int fFlags, struct proc *pProcess) 585 589 { 590 RT_NOREF(fFlags); 586 591 const bool fUnrestricted = minor(Dev) == 0; 587 592 const RTPROCESS Process = proc_pid(pProcess); … … 692 697 static int VBoxDrvDarwinIOCtlSlow(PSUPDRVSESSION pSession, u_long iCmd, caddr_t pData, struct proc *pProcess) 693 698 { 699 RT_NOREF(pProcess); 694 700 LogFlow(("VBoxDrvDarwinIOCtlSlow: pSession=%p iCmd=%p pData=%p pProcess=%p\n", pSession, iCmd, pData, pProcess)); 695 701 … … 741 747 { 742 748 OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: bad magic fFlags=%#x; iCmd=%#lx\n", Hdr.fFlags, iCmd)); 743 IPRT_DARWIN_ SAVE_EFL_AC();749 IPRT_DARWIN_RESTORE_EFL_AC(); 744 750 return EINVAL; 745 751 } … … 750 756 { 751 757 OSDBGPRINT(("VBoxDrvDarwinIOCtlSlow: max(%#x,%#x); iCmd=%#lx\n", Hdr.cbIn, Hdr.cbOut, iCmd)); 752 IPRT_DARWIN_ SAVE_EFL_AC();758 IPRT_DARWIN_RESTORE_EFL_AC(); 753 759 return EINVAL; 754 760 } … … 959 965 static DECLCALLBACK(void) vboxdrvDarwinVmxEnableFix(RTCPUID idCpu, void *pvUser1, void *pvUser2) 960 966 { 967 RT_NOREF(idCpu, pvUser1, pvUser2); 961 968 RTCCUINTREG uCr4 = ASMGetCR4(); 962 969 if (!(uCr4 & X86_CR4_VMXE)) … … 1000 1007 { 1001 1008 uint32_t fCaps; 1002 intrc = supdrvQueryVTCapsInternal(&fCaps);1009 rc = supdrvQueryVTCapsInternal(&fCaps); 1003 1010 if (RT_SUCCESS(rc)) 1004 1011 { … … 1314 1321 static DECLCALLBACK(void) supdrvDarwinMsrProberModifyOnCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2) 1315 1322 { 1323 RT_NOREF(idCpu, pvUser2); 1316 1324 PSUPMSRPROBER pReq = (PSUPMSRPROBER)pvUser1; 1317 1325 register uint32_t uMsr = pReq->u.In.uMsr;
Note:
See TracChangeset
for help on using the changeset viewer.