Ticket #9228: freebsd_kernel.diff
| File freebsd_kernel.diff, 22.7 KB (added by , 13 years ago) |
|---|
-
include/VBox/VBoxGuest.h
175 175 # define VBOXGUEST_IOCTL_CODE_FAST_(Function) _IO( 'V', (Function)) 176 176 # define VBOXGUEST_IOCTL_STRIP_SIZE(Code) VBOXGUEST_IOCTL_CODE_(_IOC_NR((Code)), 0) 177 177 178 #elif defined(RT_OS_FREEBSD) /** @todo r=bird: Please do it like SUPDRVIOC to keep it as similar as possible. */178 #elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) /** @todo r=bird: Please do it like SUPDRVIOC to keep it as similar as possible. */ 179 179 # include <sys/ioccom.h> 180 180 181 181 # define VBOXGUEST_IOCTL_CODE_(Function, Size) _IOWR('V', (Function), VBGLBIGREQ) -
include/VBox/usb.h
117 117 uint8_t bBus; 118 118 /** The port number. */ 119 119 uint8_t bPort; 120 #if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) 120 #if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 121 121 /** Device number. */ 122 122 uint8_t bDevNum; 123 123 #endif -
include/iprt/types.h
53 53 # endif 54 54 # include <sys/types.h> 55 55 56 # elif defined(RT_OS_FREEBSD) && defined(_KERNEL)56 # elif (defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && defined(_KERNEL) 57 57 /* 58 58 * Kludge for the FreeBSD kernel: 59 59 * stddef.h and sys/types.h have slightly different offsetof definitions … … 71 71 # error "offsetof is not defined..." 72 72 # endif 73 73 74 # elif defined(RT_OS_FREEBSD) && HC_ARCH_BITS == 64 && defined(RT_ARCH_X86)74 # elif (defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && HC_ARCH_BITS == 64 && defined(RT_ARCH_X86) 75 75 /* 76 76 * Kludge for compiling 32-bit code on a 64-bit FreeBSD: 77 77 * FreeBSD declares uint64_t and int64_t wrong (long unsigned and long int -
include/iprt/stdint.h
34 34 */ 35 35 #if !(defined(RT_OS_LINUX) && defined(__KERNEL__)) \ 36 36 && !(defined(RT_OS_FREEBSD) && defined(_KERNEL)) \ 37 && !(defined(__FreeBSD_kernel__) && defined(_KERNEL)) \ 37 38 && !defined(_MSC_VER) \ 38 39 && !defined(__IBMC__) \ 39 40 && !defined(__IBMCPP__) \ … … 62 63 # define UINT32_C(Value) (Value ## U) 63 64 # endif /* 64-bit darwin kludge. */ 64 65 65 #elif defined(RT_OS_FREEBSD) && defined(_KERNEL)66 #elif (defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && defined(_KERNEL) 66 67 67 68 # ifndef __STDC_CONSTANT_MACROS 68 69 # define __STDC_CONSTANT_MACROS -
include/iprt/string.h
41 41 # include "xf86_ansic.h" 42 42 RT_C_DECLS_END 43 43 44 #elif defined(RT_OS_FREEBSD) && defined(_KERNEL)44 #elif (defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && defined(_KERNEL) 45 45 RT_C_DECLS_BEGIN 46 46 /** @todo 47 47 * XXX: Very ugly hack to get things build on recent FreeBSD builds. They have … … 98 98 RT_C_DECLS_END 99 99 #endif 100 100 101 #if defined(RT_OS_FREEBSD) && defined(_KERNEL)101 #if (defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && defined(_KERNEL) 102 102 RT_C_DECLS_BEGIN 103 103 #if __FreeBSD_version < 900000 104 104 void *memchr(const void *pv, int ch, size_t cb); -
include/iprt/spinlock.h
61 61 unsigned long flFlags; 62 62 # define RTSPINLOCKTMP_INITIALIZER { 0 } 63 63 64 # elif defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined( RT_OS_SOLARIS)64 # elif defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) || defined(RT_OS_SOLARIS) 65 65 /** The saved [R|E]FLAGS. */ 66 66 RTCCUINTREG uFlags; 67 67 # define RTSPINLOCKTMP_INITIALIZER { 0 } -
include/iprt/stdarg.h
27 27 #define ___iprt_stdarg_h 28 28 29 29 #if !defined(IPRT_NO_CRT) \ 30 && !( defined(RT_OS_FREEBSD) && defined(_KERNEL))30 && !((defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && defined(_KERNEL)) 31 31 32 32 # include <stdarg.h> 33 #elif defined(RT_OS_FREEBSD) && defined(_KERNEL)33 #elif (defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && defined(_KERNEL) 34 34 # include <machine/stdarg.h> 35 35 #else 36 36 # include <iprt/types.h> -
src/VBox/Devices/Storage/DrvHostBase.cpp
96 96 /*IN*/ ULONG Length, 97 97 /*IN*/ FS_INFORMATION_CLASS FileSystemInformationClass ); 98 98 99 #elif defined(RT_OS_FREEBSD) 99 #elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 100 100 # include <sys/cdefs.h> 101 101 # include <sys/param.h> 102 102 # include <errno.h> … … 146 146 if ( pThis->fMediaPresent 147 147 && pThis->ppScsiTaskDI 148 148 && pThis->cbBlock) 149 #elif RT_OS_FREEBSD 149 #elif RT_OS_FREEBSD || defined(__FreeBSD_kernel__) 150 150 if ( pThis->fMediaPresent 151 151 && pThis->cbBlock) 152 152 #else 153 153 if (pThis->fMediaPresent) 154 154 #endif 155 155 { 156 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) 156 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 157 157 /* 158 158 * Issue a READ(12) request. 159 159 */ … … 225 225 { 226 226 if (pThis->fMediaPresent) 227 227 { 228 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) 228 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 229 229 /** @todo write support... */ 230 230 rc = VERR_WRITE_PROTECT; 231 231 … … 263 263 264 264 if (pThis->fMediaPresent) 265 265 { 266 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) 266 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 267 267 rc = VINF_SUCCESS; 268 268 /** @todo scsi device buffer flush... */ 269 269 #else … … 956 956 IOObjectRelease(DVDServices); 957 957 return rc; 958 958 959 #elif defined(RT_OS_FREEBSD) 959 #elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 960 960 RTFILE hFileDevice; 961 961 int rc = RTFileOpen(&hFileDevice, pThis->pszDeviceOpen, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE); 962 962 if (RT_FAILURE(rc)) … … 1141 1141 */ 1142 1142 static int drvHostBaseGetMediaSize(PDRVHOSTBASE pThis, uint64_t *pcb) 1143 1143 { 1144 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) 1144 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 1145 1145 /* 1146 1146 * Try a READ_CAPACITY command... 1147 1147 */ … … 1219 1219 } 1220 1220 1221 1221 1222 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) 1222 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 1223 1223 /** 1224 1224 * Execute a SCSI command. 1225 1225 * … … 1330 1330 1331 1331 (*ppScsiTaskI)->Release(ppScsiTaskI); 1332 1332 1333 # elif defined(RT_OS_FREEBSD) 1333 # elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 1334 1334 int rc = VINF_SUCCESS; 1335 1335 int rcBSD = 0; 1336 1336 union ccb DeviceCCB; -
src/VBox/Devices/Storage/DrvHostDVD.cpp
89 89 # undef _interlockedbittestandreset64 90 90 # undef USE_MEDIA_POLLING 91 91 92 #elif defined(RT_OS_FREEBSD) 92 #elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 93 93 # include <sys/cdefs.h> 94 94 # include <sys/param.h> 95 95 # include <stdio.h> … … 146 146 /* 147 147 * Eject the disc. 148 148 */ 149 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) 149 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 150 150 uint8_t abCmd[16] = 151 151 { 152 152 SCSI_START_STOP_UNIT, 0, 0, 0, 2 /*eject+stop*/, 0, … … 236 236 */ 237 237 static DECLCALLBACK(int) drvHostDvdDoLock(PDRVHOSTBASE pThis, bool fLock) 238 238 { 239 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) 239 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 240 240 uint8_t abCmd[16] = 241 241 { 242 242 SCSI_PREVENT_ALLOW_MEDIUM_REMOVAL, 0, 0, 0, fLock, 0, … … 324 324 /* 325 325 * Poll for media change. 326 326 */ 327 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) 327 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 328 328 #ifdef RT_OS_DARWIN 329 329 AssertReturn(pThis->ppScsiTaskDI, VERR_INTERNAL_ERROR); 330 330 #endif … … 394 394 /* 395 395 * Poll for media change. 396 396 */ 397 #if defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) 397 #if defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 398 398 /* taken care of above. */ 399 399 #elif defined(RT_OS_LINUX) 400 400 bool fMediaChanged = ioctl(RTFileToNative(pThis->hFileDevice), CDROM_MEDIA_CHANGED, CDSL_CURRENT) == 1; … … 424 424 int rc; 425 425 LogFlow(("%s: cmd[0]=%#04x txdir=%d pcbBuf=%d timeout=%d\n", __FUNCTION__, pbCmd[0], enmTxDir, *pcbBuf, cTimeoutMillies)); 426 426 427 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) 427 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 428 428 /* 429 429 * Pass the request on to the internal scsi command interface. 430 430 * The command seems to be 12 bytes long, the docs a bit copy&pasty on the command length point... -
src/VBox/Devices/Storage/DrvHostBase.h
136 136 uint8_t *pbDoubleBuffer; 137 137 #endif 138 138 139 #if def RT_OS_FREEBSD139 #if defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 140 140 /** The block size. Set when querying the media size. */ 141 141 uint32_t cbBlock; 142 142 /** SCSI bus number. */ … … 185 185 int DRVHostBaseMediaPresent(PDRVHOSTBASE pThis); 186 186 void DRVHostBaseMediaNotPresent(PDRVHOSTBASE pThis); 187 187 DECLCALLBACK(void) DRVHostBaseDestruct(PPDMDRVINS pDrvIns); 188 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) 188 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 189 189 DECLCALLBACK(int) DRVHostBaseScsiCmd(PDRVHOSTBASE pThis, const uint8_t *pbCmd, size_t cbCmd, PDMBLOCKTXDIR enmTxDir, 190 190 void *pvBuf, uint32_t *pcbBuf, uint8_t *pbSense, size_t cbSense, uint32_t cTimeoutMillies); 191 191 #endif -
src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp
38 38 # include <sys/errno.h> 39 39 #elif defined(RT_OS_LINUX) && defined(__KERNEL__) 40 40 # include <linux/errno.h> 41 #elif defined(RT_OS_FREEBSD) && defined(_KERNEL)41 #elif (defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && defined(_KERNEL) 42 42 # include <sys/errno.h> 43 43 #else 44 44 # include <errno.h> -
src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp
37 37 # include <sys/errno.h> 38 38 #elif defined(RT_OS_LINUX) && defined(__KERNEL__) 39 39 # include <linux/errno.h> 40 #elif defined(RT_OS_FREEBSD) && defined(_KERNEL)40 #elif (defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && defined(_KERNEL) 41 41 # include <sys/errno.h> 42 42 #else 43 43 # include <errno.h> -
src/VBox/Runtime/VBox/log-vbox.cpp
131 131 # include <Windows.h> 132 132 # elif defined(RT_OS_LINUX) 133 133 # include <unistd.h> 134 # elif defined(RT_OS_FREEBSD) 134 # elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 135 135 # include <sys/param.h> 136 136 # include <sys/sysctl.h> 137 137 # include <sys/user.h> … … 368 368 fclose(pFile); 369 369 } 370 370 371 # elif defined(RT_OS_FREEBSD) 371 # elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 372 372 /* Retrieve the required length first */ 373 373 int aiName[4]; 374 374 aiName[0] = CTL_KERN; -
src/VBox/Main/include/USBProxyService.h
351 351 }; 352 352 # endif /* RT_OS_WINDOWS */ 353 353 354 # if def RT_OS_FREEBSD354 # if defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 355 355 /** 356 356 * The FreeBSD hosted USB Proxy Service. 357 357 */ -
src/VBox/Main/include/ConsoleImpl.h
474 474 HRESULT powerDown(IProgress *aProgress = NULL); 475 475 476 476 /* Note: FreeBSD needs this whether netflt is used or not. */ 477 #if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD) )477 #if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) 478 478 HRESULT attachToTapInterface(INetworkAdapter *networkAdapter); 479 479 HRESULT detachFromTapInterface(INetworkAdapter *networkAdapter); 480 480 #endif … … 763 763 MediumAttachmentMap mapMediumAttachments; 764 764 765 765 /* Note: FreeBSD needs this whether netflt is used or not. */ 766 #if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD) )766 #if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) 767 767 Utf8Str maTAPDeviceName[8]; 768 768 RTFILE maTapFD[8]; 769 769 #endif -
src/VBox/Main/include/HostUSBDeviceImpl.h
327 327 328 328 friend class USBProxyServiceDarwin; 329 329 #endif 330 #if def RT_OS_FreeBSD330 #if defined(RT_OS_FreeBSD) || defined(__FreeBSD_kernel__) 331 331 friend class USBProxyServiceFreeBSD; 332 332 #endif 333 333 }; -
src/VBox/Main/src-client/ConsoleImpl2.cpp
90 90 # include <linux/types.h> 91 91 # include <linux/if.h> 92 92 # include <linux/wireless.h> 93 # elif defined(RT_OS_FREEBSD) 93 # elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 94 94 # include <unistd.h> 95 95 # include <sys/types.h> 96 96 # include <sys/ioctl.h> … … 2154 2154 } 2155 2155 # endif 2156 2156 #endif /* RT_OS_LINUX */ 2157 #if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined( VBOX_WITH_SOLARIS_OSS)2157 #if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) || defined(VBOX_WITH_SOLARIS_OSS) 2158 2158 case AudioDriverType_OSS: 2159 2159 { 2160 2160 InsertConfigString(pCfg, "AudioDriver", "oss"); 2161 2161 break; 2162 2162 } 2163 2163 #endif 2164 #if def RT_OS_FREEBSD2164 #if defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 2165 2165 # ifdef VBOX_WITH_PULSE 2166 2166 case AudioDriverType_Pulse: 2167 2167 { … … 3780 3780 3781 3781 case NetworkAttachmentType_Bridged: 3782 3782 { 3783 #if (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) ) && !defined(VBOX_WITH_NETFLT)3783 #if (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && !defined(VBOX_WITH_NETFLT) 3784 3784 hrc = attachToTapInterface(aNetworkAdapter); 3785 3785 if (FAILED(hrc)) 3786 3786 { … … 3989 3989 const char *pszTrunk = szTrunkName; 3990 3990 /* we're not releasing the INetCfg stuff here since we use it later to figure out whether it is wireless */ 3991 3991 3992 # elif defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) 3993 # if defined(RT_OS_FREEBSD) 3992 # elif defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 3993 # if defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 3994 3994 /* 3995 3995 * If we bridge to a tap interface open it the `old' direct way. 3996 3996 * This works and performs better than bridging a physical … … 4089 4089 } 4090 4090 else 4091 4091 Log(("Failed to open wireless socket\n")); 4092 # elif defined(RT_OS_FREEBSD) 4092 # elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 4093 4093 int iSock = socket(AF_INET, SOCK_DGRAM, 0); 4094 4094 if (iSock >= 0) 4095 4095 { … … 4207 4207 /* NOTHING TO DO HERE */ 4208 4208 #elif defined(RT_OS_LINUX) 4209 4209 /// @todo aleksey: is there anything to be done here? 4210 #elif defined(RT_OS_FREEBSD) 4210 #elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 4211 4211 /** @todo FreeBSD: Check out this later (HIF networking). */ 4212 4212 #else 4213 4213 # error "Port me" -
src/VBox/Main/src-client/ConsoleImpl.cpp
29 29 # include <stdio.h> 30 30 # include <stdlib.h> 31 31 # include <string.h> 32 #elif defined(RT_OS_FREEBSD) 32 #elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 33 33 # include <errno.h> 34 34 # include <sys/ioctl.h> 35 35 # include <sys/poll.h> … … 7832 7832 #endif /* VBOX_WITH_USB */ 7833 7833 7834 7834 /* Note: FreeBSD needs this whether netflt is used or not. */ 7835 #if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD) )7835 #if ((defined(RT_OS_LINUX) && !defined(VBOX_WITH_NETFLT)) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) 7836 7836 /** 7837 7837 * Helper function to handle host interface device creation and attachment. 7838 7838 * … … 7949 7949 } 7950 7950 } 7951 7951 7952 # elif defined(RT_OS_FREEBSD) 7952 # elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 7953 7953 /* 7954 7954 * Set/obtain the tap interface. 7955 7955 */ … … 8067 8067 LogFlowThisFunc(("returning %d\n", rc)); 8068 8068 return rc; 8069 8069 } 8070 #endif /* (RT_OS_LINUX || RT_OS_FREEBSD ) && !VBOX_WITH_NETFLT */8070 #endif /* (RT_OS_LINUX || RT_OS_FREEBSD || __FreeBSD_kernel__) && !VBOX_WITH_NETFLT */ 8071 8071 8072 8072 /** 8073 8073 * Called at power down to terminate host interface networking. … … 8100 8100 pNetworkAdapter->COMGETTER(AttachmentType)(&attachment); 8101 8101 if (attachment == NetworkAttachmentType_Bridged) 8102 8102 { 8103 #if ((defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) ) && !defined(VBOX_WITH_NETFLT))8103 #if ((defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && !defined(VBOX_WITH_NETFLT)) 8104 8104 HRESULT rc2 = detachFromTapInterface(pNetworkAdapter); 8105 8105 if (FAILED(rc2) && SUCCEEDED(rc)) 8106 8106 rc = rc2; 8107 #endif /* (RT_OS_LINUX || RT_OS_FREEBSD ) && !VBOX_WITH_NETFLT */8107 #endif /* (RT_OS_LINUX || RT_OS_FREEBSD || __FreeBSD_kernel__) && !VBOX_WITH_NETFLT */ 8108 8108 } 8109 8109 } 8110 8110 -
src/VBox/Main/src-server/MachineImpl.cpp
1587 1587 STDMETHODIMP Machine::COMSETTER(MemoryBalloonSize)(ULONG memoryBalloonSize) 1588 1588 { 1589 1589 /* This must match GMMR0Init; currently we only support memory ballooning on all 64-bit hosts except Mac OS X */ 1590 #if HC_ARCH_BITS == 64 && (defined(RT_OS_WINDOWS) || defined(RT_OS_SOLARIS) || defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) )1590 #if HC_ARCH_BITS == 64 && (defined(RT_OS_WINDOWS) || defined(RT_OS_SOLARIS) || defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) 1591 1591 /* check limits */ 1592 1592 if (memoryBalloonSize >= VMMDEV_MAX_MEMORY_BALLOON(mHWData->mMemorySize)) 1593 1593 return setError(E_INVALIDARG, … … 10643 10643 E_FAIL); 10644 10644 #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER) 10645 10645 # ifdef VBOX_WITH_NEW_SYS_V_KEYGEN 10646 # if defined(RT_OS_FREEBSD) && (HC_ARCH_BITS == 64)10646 # if (defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && (HC_ARCH_BITS == 64) 10647 10647 /** @todo Check that this still works correctly. */ 10648 10648 AssertCompileSize(key_t, 8); 10649 10649 # else -
src/VBox/HostDrivers/Support/SUPDrvIDC.h
226 226 #if defined(RT_OS_DARWIN) 227 227 extern int VBOXCALL SUPDrvDarwinIDC(uint32_t iReq, PSUPDRVIDCREQHDR pReq); 228 228 229 #elif defined(RT_OS_FREEBSD) 229 #elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 230 230 extern int VBOXCALL SUPDrvFreeBSDIDC(uint32_t iReq, PSUPDRVIDCREQHDR pReq); 231 231 232 232 #elif defined(RT_OS_LINUX) -
src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp
62 62 # ifndef CAP_TO_MASK 63 63 # define CAP_TO_MASK(cap) RT_BIT(cap) 64 64 # endif 65 # elif defined(RT_OS_FREEBSD) 65 # elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 66 66 # include <sys/param.h> 67 67 # include <sys/sysctl.h> 68 68 # elif defined(RT_OS_SOLARIS) … … 317 317 * 318 318 * Darwin, OS/2 and Windows all have proper APIs for getting the program file name. 319 319 */ 320 #if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined( RT_OS_SOLARIS)320 #if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) || defined(RT_OS_SOLARIS) 321 321 # ifdef RT_OS_LINUX 322 322 int cchLink = readlink("/proc/self/exe", &g_szSupLibHardenedExePath[0], sizeof(g_szSupLibHardenedExePath) - 1); 323 323 -
src/VBox/HostDrivers/Support/SUPDrvInternal.h
115 115 116 116 #elif defined(RT_OS_OS2) 117 117 118 #elif defined(RT_OS_FREEBSD) 118 #elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__) 119 119 # define memset libkern_memset /** @todo these are just hacks to get it compiling, check out later. */ 120 120 # define memcmp libkern_memcmp 121 121 # define strchr libkern_strchr

