Changeset 37774 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jul 4, 2011 9:19:27 PM (14 years ago)

Author:

vboxsync

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

72646

Message:

Build fixes for current FreeBSD 9 (Thanks to Bernhard Froehlich and Jung-uk Kim)

Location:

trunk/src/VBox/Runtime

Files:

• r0drv/freebsd/mp-r0drv-freebsd.c (modified) (6 diffs)
• r3/freebsd/fileaio-freebsd.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c

@@ -164 +164 @@
     if (RTMpGetOnlineCount() > 1)
     {
-#if  __FreeBSD_version >= 700000
-        cpumask_t   Mask = ~(cpumask_t)curcpu;
+#if __FreeBSD_version >= 900000
+        cpuset_t    Mask;
+#elif  __FreeBSD_version >= 700000
+        cpumask_t   Mask;
 #endif
         RTMPARGS    Args;
@@ -175 +177 @@
         Args.cHits = 0;
 #if __FreeBSD_version >= 700000
+# if __FreeBSD_version >= 900000
+    Mask = all_cpus;
+    CPU_CLR(curcpu, &Mask);
+# else
+    Mask = ~(cpumask_t)curcpu;
+# endif
         smp_rendezvous_cpus(Mask, NULL, rtmpOnOthersFreeBSDWrapper, smp_no_rendevous_barrier, &Args);
 #else
@@ -204 +212 @@
 RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
 {
-#if  __FreeBSD_version >= 700000
-    cpumask_t   Mask = 1 << idCpu;
+#if __FreeBSD_version >= 900000
+    cpuset_t    Mask;
+#elif  __FreeBSD_version >= 700000
+    cpumask_t   Mask;
 #endif
     RTMPARGS    Args;
@@ -219 +229 @@
     Args.cHits = 0;
 #if __FreeBSD_version >= 700000
+# if __FreeBSD_version >= 900000
+    CPU_SETOF(idCpu, &Mask);
+# else
     Mask = (cpumask_t)1 << idCpu;
+# endif
     smp_rendezvous_cpus(Mask, NULL, rtmpOnSpecificFreeBSDWrapper, smp_no_rendevous_barrier, &Args);
 #else
@@ -243 +257 @@
 RTDECL(int) RTMpPokeCpu(RTCPUID idCpu)
 {
+#if __FreeBSD_version >= 900000
+    cpuset_t    Mask;
+#elif  __FreeBSD_version >= 700000
     cpumask_t   Mask;
+#endif
 
     /* Will panic if no rendezvousing cpus, so make sure the cpu is online. */
@@ -249 +267 @@
         return VERR_CPU_NOT_FOUND;
 
+# if __FreeBSD_version >= 900000
+    CPU_SETOF(idCpu, &Mask);
+# else
     Mask = (cpumask_t)1 << idCpu;
+# endif
     smp_rendezvous_cpus(Mask, NULL, rtmpFreeBSDPokeCallback, smp_no_rendevous_barrier, NULL);
 

trunk/src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp

@@ -200 +200 @@
     pReqInt->AioCB.aio_sigevent.sigev_value.sival_ptr = pReqInt;
     pReqInt->AioCB.aio_lio_opcode = uTransferDirection;
-    pReqInt->AioCB.aio_fildes     = (int)hFile;
+    pReqInt->AioCB.aio_fildes     = RTFileToNative(hFile);
     pReqInt->AioCB.aio_offset     = off;
     pReqInt->AioCB.aio_nbytes     = cbTransfer;
@@ -236 +236 @@
 
     pReqInt->fFlush           = true;
-    pReqInt->AioCB.aio_fildes = (int)hFile;
+    pReqInt->AioCB.aio_fildes = RTFileToNative(hFile);
     pReqInt->AioCB.aio_offset = 0;
     pReqInt->AioCB.aio_nbytes = 0;