VirtualBox

Ticket #9228: freebsd_kernel.diff

File freebsd_kernel.diff, 22.7 KB (added by Robert Millan, 13 years ago)
  • include/VBox/VBoxGuest.h

     
    175175# define VBOXGUEST_IOCTL_CODE_FAST_(Function)       _IO(  'V', (Function))
    176176# define VBOXGUEST_IOCTL_STRIP_SIZE(Code)           VBOXGUEST_IOCTL_CODE_(_IOC_NR((Code)), 0)
    177177
    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. */
    179179# include <sys/ioccom.h>
    180180
    181181# define VBOXGUEST_IOCTL_CODE_(Function, Size)      _IOWR('V', (Function), VBGLBIGREQ)
  • include/VBox/usb.h

     
    117117    uint8_t         bBus;
    118118    /** The port number. */
    119119    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__)
    121121    /** Device number. */
    122122    uint8_t         bDevNum;
    123123#endif
  • include/iprt/types.h

     
    5353#  endif
    5454#  include <sys/types.h>
    5555
    56 # elif defined(RT_OS_FREEBSD) && defined(_KERNEL)
     56# elif (defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && defined(_KERNEL)
    5757    /*
    5858     * Kludge for the FreeBSD kernel:
    5959     *  stddef.h and sys/types.h have slightly different offsetof definitions
     
    7171#   error "offsetof is not defined..."
    7272#  endif
    7373
    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)
    7575    /*
    7676     * Kludge for compiling 32-bit code on a 64-bit FreeBSD:
    7777     *  FreeBSD declares uint64_t and int64_t wrong (long unsigned and long int
  • include/iprt/stdint.h

     
    3434 */
    3535#if !(defined(RT_OS_LINUX) && defined(__KERNEL__))  \
    3636  && !(defined(RT_OS_FREEBSD) && defined(_KERNEL)) \
     37  && !(defined(__FreeBSD_kernel__) && defined(_KERNEL)) \
    3738  && !defined(_MSC_VER) \
    3839  && !defined(__IBMC__) \
    3940  && !defined(__IBMCPP__) \
     
    6263#  define UINT32_C(Value)   (Value ## U)
    6364# endif /* 64-bit darwin kludge. */
    6465
    65 #elif defined(RT_OS_FREEBSD) && defined(_KERNEL)
     66#elif (defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && defined(_KERNEL)
    6667
    6768# ifndef __STDC_CONSTANT_MACROS
    6869#  define __STDC_CONSTANT_MACROS
  • include/iprt/string.h

     
    4141# include "xf86_ansic.h"
    4242RT_C_DECLS_END
    4343
    44 #elif defined(RT_OS_FREEBSD) && defined(_KERNEL)
     44#elif (defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && defined(_KERNEL)
    4545RT_C_DECLS_BEGIN
    4646/** @todo
    4747 * XXX: Very ugly hack to get things build on recent FreeBSD builds. They have
     
    9898RT_C_DECLS_END
    9999#endif
    100100
    101 #if defined(RT_OS_FREEBSD) && defined(_KERNEL)
     101#if (defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && defined(_KERNEL)
    102102RT_C_DECLS_BEGIN
    103103#if __FreeBSD_version < 900000
    104104void *memchr(const void *pv, int ch, size_t cb);
  • include/iprt/spinlock.h

     
    6161    unsigned long   flFlags;
    6262#  define RTSPINLOCKTMP_INITIALIZER { 0 }
    6363
    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)
    6565    /** The saved [R|E]FLAGS. */
    6666    RTCCUINTREG     uFlags;
    6767#  define RTSPINLOCKTMP_INITIALIZER { 0 }
  • include/iprt/stdarg.h

     
    2727#define ___iprt_stdarg_h
    2828
    2929#if    !defined(IPRT_NO_CRT) \
    30     && !(defined(RT_OS_FREEBSD) && defined(_KERNEL))
     30    && !((defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && defined(_KERNEL))
    3131
    3232# include <stdarg.h>
    33 #elif defined(RT_OS_FREEBSD) && defined(_KERNEL)
     33#elif (defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && defined(_KERNEL)
    3434# include <machine/stdarg.h>
    3535#else
    3636# include <iprt/types.h>
  • src/VBox/Devices/Storage/DrvHostBase.cpp

     
    9696        /*IN*/ ULONG                Length,
    9797        /*IN*/ FS_INFORMATION_CLASS FileSystemInformationClass );
    9898
    99 #elif defined(RT_OS_FREEBSD)
     99#elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    100100# include <sys/cdefs.h>
    101101# include <sys/param.h>
    102102# include <errno.h>
     
    146146    if (    pThis->fMediaPresent
    147147        &&  pThis->ppScsiTaskDI
    148148        &&  pThis->cbBlock)
    149 #elif RT_OS_FREEBSD
     149#elif RT_OS_FREEBSD || defined(__FreeBSD_kernel__)
    150150    if (    pThis->fMediaPresent
    151151        &&  pThis->cbBlock)
    152152#else
    153153    if (pThis->fMediaPresent)
    154154#endif
    155155    {
    156 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
     156#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    157157        /*
    158158         * Issue a READ(12) request.
    159159         */
     
    225225    {
    226226        if (pThis->fMediaPresent)
    227227        {
    228 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
     228#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    229229            /** @todo write support... */
    230230            rc = VERR_WRITE_PROTECT;
    231231
     
    263263
    264264    if (pThis->fMediaPresent)
    265265    {
    266 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
     266#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    267267        rc = VINF_SUCCESS;
    268268        /** @todo scsi device buffer flush... */
    269269#else
     
    956956    IOObjectRelease(DVDServices);
    957957    return rc;
    958958
    959 #elif defined(RT_OS_FREEBSD)
     959#elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    960960    RTFILE hFileDevice;
    961961    int rc = RTFileOpen(&hFileDevice, pThis->pszDeviceOpen, RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
    962962    if (RT_FAILURE(rc))
     
    11411141 */
    11421142static int drvHostBaseGetMediaSize(PDRVHOSTBASE pThis, uint64_t *pcb)
    11431143{
    1144 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
     1144#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    11451145    /*
    11461146     * Try a READ_CAPACITY command...
    11471147     */
     
    12191219}
    12201220
    12211221
    1222 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
     1222#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    12231223/**
    12241224 * Execute a SCSI command.
    12251225 *
     
    13301330
    13311331    (*ppScsiTaskI)->Release(ppScsiTaskI);
    13321332
    1333 # elif defined(RT_OS_FREEBSD)
     1333# elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    13341334    int rc = VINF_SUCCESS;
    13351335    int rcBSD = 0;
    13361336    union ccb DeviceCCB;
  • src/VBox/Devices/Storage/DrvHostDVD.cpp

     
    8989# undef _interlockedbittestandreset64
    9090# undef USE_MEDIA_POLLING
    9191
    92 #elif defined(RT_OS_FREEBSD)
     92#elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    9393# include <sys/cdefs.h>
    9494# include <sys/param.h>
    9595# include <stdio.h>
     
    146146            /*
    147147             * Eject the disc.
    148148             */
    149 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
     149#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    150150            uint8_t abCmd[16] =
    151151            {
    152152                SCSI_START_STOP_UNIT, 0, 0, 0, 2 /*eject+stop*/, 0,
     
    236236 */
    237237static DECLCALLBACK(int) drvHostDvdDoLock(PDRVHOSTBASE pThis, bool fLock)
    238238{
    239 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
     239#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    240240    uint8_t abCmd[16] =
    241241    {
    242242        SCSI_PREVENT_ALLOW_MEDIUM_REMOVAL, 0, 0, 0, fLock, 0,
     
    324324    /*
    325325     * Poll for media change.
    326326     */
    327 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
     327#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    328328#ifdef RT_OS_DARWIN
    329329    AssertReturn(pThis->ppScsiTaskDI, VERR_INTERNAL_ERROR);
    330330#endif
     
    394394        /*
    395395         * Poll for media change.
    396396         */
    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__)
    398398        /* taken care of above. */
    399399#elif defined(RT_OS_LINUX)
    400400        bool fMediaChanged = ioctl(RTFileToNative(pThis->hFileDevice), CDROM_MEDIA_CHANGED, CDSL_CURRENT) == 1;
     
    424424    int rc;
    425425    LogFlow(("%s: cmd[0]=%#04x txdir=%d pcbBuf=%d timeout=%d\n", __FUNCTION__, pbCmd[0], enmTxDir, *pcbBuf, cTimeoutMillies));
    426426
    427 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
     427#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    428428    /*
    429429     * Pass the request on to the internal scsi command interface.
    430430     * 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

     
    136136    uint8_t                *pbDoubleBuffer;
    137137#endif
    138138
    139 #ifdef RT_OS_FREEBSD
     139#if defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    140140    /** The block size. Set when querying the media size. */
    141141    uint32_t                cbBlock;
    142142    /** SCSI bus number. */
     
    185185int DRVHostBaseMediaPresent(PDRVHOSTBASE pThis);
    186186void DRVHostBaseMediaNotPresent(PDRVHOSTBASE pThis);
    187187DECLCALLBACK(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__)
    189189DECLCALLBACK(int) DRVHostBaseScsiCmd(PDRVHOSTBASE pThis, const uint8_t *pbCmd, size_t cbCmd, PDMBLOCKTXDIR enmTxDir,
    190190                                     void *pvBuf, uint32_t *pcbBuf, uint8_t *pbSense, size_t cbSense, uint32_t cTimeoutMillies);
    191191#endif
  • src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp

     
    3838# include <sys/errno.h>
    3939#elif defined(RT_OS_LINUX) && defined(__KERNEL__)
    4040# include <linux/errno.h>
    41 #elif defined(RT_OS_FREEBSD) && defined(_KERNEL)
     41#elif (defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && defined(_KERNEL)
    4242# include <sys/errno.h>
    4343#else
    4444# include <errno.h>
  • src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp

     
    3737# include <sys/errno.h>
    3838#elif defined(RT_OS_LINUX) && defined(__KERNEL__)
    3939# include <linux/errno.h>
    40 #elif defined(RT_OS_FREEBSD) && defined(_KERNEL)
     40#elif (defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)) && defined(_KERNEL)
    4141# include <sys/errno.h>
    4242#else
    4343# include <errno.h>
  • src/VBox/Runtime/VBox/log-vbox.cpp

     
    131131#  include <Windows.h>
    132132# elif defined(RT_OS_LINUX)
    133133#  include <unistd.h>
    134 # elif defined(RT_OS_FREEBSD)
     134# elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    135135#  include <sys/param.h>
    136136#  include <sys/sysctl.h>
    137137#  include <sys/user.h>
     
    368368            fclose(pFile);
    369369        }
    370370
    371 #  elif defined(RT_OS_FREEBSD)
     371#  elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    372372        /* Retrieve the required length first */
    373373        int aiName[4];
    374374        aiName[0] = CTL_KERN;
  • src/VBox/Main/include/USBProxyService.h

     
    351351};
    352352# endif /* RT_OS_WINDOWS */
    353353
    354 # ifdef RT_OS_FREEBSD
     354# if defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    355355/**
    356356 * The FreeBSD hosted USB Proxy Service.
    357357 */
  • src/VBox/Main/include/ConsoleImpl.h

     
    474474    HRESULT powerDown(IProgress *aProgress = NULL);
    475475
    476476/* 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__))
    478478    HRESULT attachToTapInterface(INetworkAdapter *networkAdapter);
    479479    HRESULT detachFromTapInterface(INetworkAdapter *networkAdapter);
    480480#endif
     
    763763    MediumAttachmentMap mapMediumAttachments;
    764764
    765765/* 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__))
    767767    Utf8Str      maTAPDeviceName[8];
    768768    RTFILE       maTapFD[8];
    769769#endif
  • src/VBox/Main/include/HostUSBDeviceImpl.h

     
    327327
    328328    friend class USBProxyServiceDarwin;
    329329#endif
    330 #ifdef RT_OS_FreeBSD
     330#if defined(RT_OS_FreeBSD) || defined(__FreeBSD_kernel__)
    331331    friend class USBProxyServiceFreeBSD;
    332332#endif
    333333};
  • src/VBox/Main/src-client/ConsoleImpl2.cpp

     
    9090#  include <linux/types.h>
    9191#  include <linux/if.h>
    9292#  include <linux/wireless.h>
    93 # elif defined(RT_OS_FREEBSD)
     93# elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    9494#  include <unistd.h>
    9595#  include <sys/types.h>
    9696#  include <sys/ioctl.h>
     
    21542154                }
    21552155# endif
    21562156#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)
    21582158                case AudioDriverType_OSS:
    21592159                {
    21602160                    InsertConfigString(pCfg, "AudioDriver", "oss");
    21612161                    break;
    21622162                }
    21632163#endif
    2164 #ifdef RT_OS_FREEBSD
     2164#if defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    21652165# ifdef VBOX_WITH_PULSE
    21662166                case AudioDriverType_Pulse:
    21672167                {
     
    37803780
    37813781            case NetworkAttachmentType_Bridged:
    37823782            {
    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)
    37843784                hrc = attachToTapInterface(aNetworkAdapter);
    37853785                if (FAILED(hrc))
    37863786                {
     
    39893989                const char *pszTrunk = szTrunkName;
    39903990                /* we're not releasing the INetCfg stuff here since we use it later to figure out whether it is wireless */
    39913991
    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__)
    39943994                /*
    39953995                 * If we bridge to a tap interface open it the `old' direct way.
    39963996                 * This works and performs better than bridging a physical
     
    40894089                }
    40904090                else
    40914091                    Log(("Failed to open wireless socket\n"));
    4092 # elif defined(RT_OS_FREEBSD)
     4092# elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    40934093                int iSock = socket(AF_INET, SOCK_DGRAM, 0);
    40944094                if (iSock >= 0)
    40954095                {
     
    42074207            /* NOTHING TO DO HERE */
    42084208#elif defined(RT_OS_LINUX)
    42094209/// @todo aleksey: is there anything to be done here?
    4210 #elif defined(RT_OS_FREEBSD)
     4210#elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    42114211/** @todo FreeBSD: Check out this later (HIF networking). */
    42124212#else
    42134213# error "Port me"
  • src/VBox/Main/src-client/ConsoleImpl.cpp

     
    2929#   include <stdio.h>
    3030#   include <stdlib.h>
    3131#   include <string.h>
    32 #elif defined(RT_OS_FREEBSD)
     32#elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    3333#   include <errno.h>
    3434#   include <sys/ioctl.h>
    3535#   include <sys/poll.h>
     
    78327832#endif /* VBOX_WITH_USB */
    78337833
    78347834/* 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__))
    78367836/**
    78377837 * Helper function to handle host interface device creation and attachment.
    78387838 *
     
    79497949        }
    79507950    }
    79517951
    7952 # elif defined(RT_OS_FREEBSD)
     7952# elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    79537953    /*
    79547954     * Set/obtain the tap interface.
    79557955     */
     
    80678067    LogFlowThisFunc(("returning %d\n", rc));
    80688068    return rc;
    80698069}
    8070 #endif /* (RT_OS_LINUX || RT_OS_FREEBSD) && !VBOX_WITH_NETFLT */
     8070#endif /* (RT_OS_LINUX || RT_OS_FREEBSD || __FreeBSD_kernel__) && !VBOX_WITH_NETFLT */
    80718071
    80728072/**
    80738073 * Called at power down to terminate host interface networking.
     
    81008100        pNetworkAdapter->COMGETTER(AttachmentType)(&attachment);
    81018101        if (attachment == NetworkAttachmentType_Bridged)
    81028102        {
    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))
    81048104            HRESULT rc2 = detachFromTapInterface(pNetworkAdapter);
    81058105            if (FAILED(rc2) && SUCCEEDED(rc))
    81068106                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 */
    81088108        }
    81098109    }
    81108110
  • src/VBox/Main/src-server/MachineImpl.cpp

     
    15871587STDMETHODIMP Machine::COMSETTER(MemoryBalloonSize)(ULONG memoryBalloonSize)
    15881588{
    15891589    /* 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__))
    15911591    /* check limits */
    15921592    if (memoryBalloonSize >= VMMDEV_MAX_MEMORY_BALLOON(mHWData->mMemorySize))
    15931593        return setError(E_INVALIDARG,
     
    1064310643                    E_FAIL);
    1064410644#elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER)
    1064510645# 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)
    1064710647    /** @todo Check that this still works correctly. */
    1064810648    AssertCompileSize(key_t, 8);
    1064910649#  else
  • src/VBox/HostDrivers/Support/SUPDrvIDC.h

     
    226226#if defined(RT_OS_DARWIN)
    227227extern int VBOXCALL SUPDrvDarwinIDC(uint32_t iReq, PSUPDRVIDCREQHDR pReq);
    228228
    229 #elif defined(RT_OS_FREEBSD)
     229#elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    230230extern int VBOXCALL SUPDrvFreeBSDIDC(uint32_t iReq, PSUPDRVIDCREQHDR pReq);
    231231
    232232#elif defined(RT_OS_LINUX)
  • src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp

     
    6262#  ifndef CAP_TO_MASK
    6363#   define CAP_TO_MASK(cap) RT_BIT(cap)
    6464#  endif
    65 # elif defined(RT_OS_FREEBSD)
     65# elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    6666#  include <sys/param.h>
    6767#  include <sys/sysctl.h>
    6868# elif defined(RT_OS_SOLARIS)
     
    317317     *
    318318     * Darwin, OS/2 and Windows all have proper APIs for getting the program file name.
    319319     */
    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)
    321321# ifdef RT_OS_LINUX
    322322    int cchLink = readlink("/proc/self/exe", &g_szSupLibHardenedExePath[0], sizeof(g_szSupLibHardenedExePath) - 1);
    323323
  • src/VBox/HostDrivers/Support/SUPDrvInternal.h

     
    115115
    116116#elif defined(RT_OS_OS2)
    117117
    118 #elif defined(RT_OS_FREEBSD)
     118#elif defined(RT_OS_FREEBSD) || defined(__FreeBSD_kernel__)
    119119#   define memset  libkern_memset /** @todo these are just hacks to get it compiling, check out later. */
    120120#   define memcmp  libkern_memcmp
    121121#   define strchr  libkern_strchr

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy