VirtualBox

Changeset 76404 in vbox for trunk


Ignore:
Timestamp:
Dec 23, 2018 3:48:33 PM (6 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
127705
Message:

VBox/vmm/pdmnetshaper.h,pdmdev.h: Don't include err.h and assert.h in the former, and don't include the former from the latter. bugref:9344

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/types.h

    r76393 r76404  
    941941 * @remarks This is part of the internal network GSO packets.  Take great care
    942942 *          when making changes.  The size is expected to be exactly 8 bytes.
     943 *
     944 * @ingroup grp_pdm
    943945 */
    944946typedef struct PDMNETWORKGSO
    … …  
    960962    uint8_t             u8Unused;
    961963} PDMNETWORKGSO;
    962 /** Pointer to a GSO context. */
     964/** Pointer to a GSO context.
     965 * @ingroup grp_pdm */
    963966typedef PDMNETWORKGSO *PPDMNETWORKGSO;
    964 /** Pointer to a const GSO context. */
     967/** Pointer to a const GSO context.
     968 * @ingroup grp_pdm */
    965969typedef PDMNETWORKGSO const *PCPDMNETWORKGSO;
     970
     971/** Pointer to a PDM filter handle.
     972 * @ingroup grp_pdm_net_shaper  */
     973typedef struct PDMNSFILTER *PPDMNSFILTER;
     974/** Pointer to a network shaper.
     975 * @ingroup grp_pdm_net_shaper */
     976typedef struct PDMNETSHAPER *PPDMNETSHAPER;
    966977
    967978
    … …  
    970981 *
    971982 * @remarks This is part of the saved state.
     983 * @ingroup grp_pgm
    972984 */
    973985typedef enum PGMROMPROT
    … …  
    9961008/**
    9971009 * Page mapping lock.
     1010 * @ingroup grp_pgm
    9981011 */
    9991012typedef struct PGMPAGEMAPLOCK
    … …  
    10201033#endif
    10211034} PGMPAGEMAPLOCK;
    1022 /** Pointer to a page mapping lock. */
     1035/** Pointer to a page mapping lock.
     1036 * @ingroup grp_pgm */
    10231037typedef PGMPAGEMAPLOCK *PPGMPAGEMAPLOCK;
    10241038
    … …  
    10821096/**
    10831097 * Shared region description (needed by GMM and others, thus global).
     1098 * @ingroup grp_vmmdev
    10841099 */
    10851100typedef struct VMMDEVSHAREDREGIONDESC

  • trunk/include/VBox/vmm/pdmdrv.h

    r76403 r76404  
    3636# include <VBox/vmm/pdmasynccompletion.h>
    3737# include <VBox/vmm/pdmblkcache.h>
    38 #endif
    39 #ifdef VBOX_WITH_NETSHAPER
    40 # include <VBox/vmm/pdmnetshaper.h>
    4138#endif
    4239#include <VBox/vmm/tm.h>
    … …  
    11851182                                                                const char *pszDesc));
    11861183
    1187 #ifdef VBOX_WITH_NETSHAPER
    11881184    /**
    11891185     * Attaches network filter driver to a bandwidth group.
    … …  
    11941190     * @param   pFilter         Pointer to the filter we attach.
    11951191     */
    1196     DECLR3CALLBACKMEMBER(int, pfnNetShaperAttach,(PPDMDRVINS pDrvIns, const char *pszBwGroup,
    1197                                                   PPDMNSFILTER pFilter));
    1198 
     1192    DECLR3CALLBACKMEMBER(int, pfnNetShaperAttach,(PPDMDRVINS pDrvIns, const char *pszBwGroup, PPDMNSFILTER pFilter));
    11991193
    12001194    /**
    … …  
    12061200     */
    12071201    DECLR3CALLBACKMEMBER(int, pfnNetShaperDetach,(PPDMDRVINS pDrvIns, PPDMNSFILTER pFilter));
    1208 #endif /* VBOX_WITH_NETSHAPER */
    1209 
    12101202
    12111203    /**

  • trunk/include/VBox/vmm/pdmnetshaper.h

    r69107 r76404  
    2828
    2929#include <VBox/types.h>
    30 #include <VBox/err.h>
    3130#include <VBox/vmm/pdmnetifs.h>
    32 #include <iprt/assert.h>
    3331#include <iprt/sg.h>
    3432
    … …  
    6159} PDMNSFILTER;
    6260
    63 /** Pointer to a PDM filter handle. */
    64 typedef struct PDMNSFILTER *PPDMNSFILTER;
    65 /** Pointer to a network shaper. */
    66 typedef struct PDMNETSHAPER *PPDMNETSHAPER;
    67 
    68 
    6961VMMDECL(bool)       PDMNsAllocateBandwidth(PPDMNSFILTER pFilter, size_t cbTransfer);
    7062VMMR3_INT_DECL(int) PDMR3NsAttach(PUVM pUVM, PPDMDRVINS pDrvIns, const char *pcszBwGroup, PPDMNSFILTER pFilter);

  • trunk/src/VBox/Devices/Storage/DrvHostBase-darwin.cpp

    r76396 r76404  
    3030#include <DiskArbitration/DiskArbitration.h>
    3131#include <mach/mach_error.h>
     32#include <VBox/err.h>
    3233#include <VBox/scsi.h>
    3334#include <iprt/string.h>

  • trunk/src/VBox/Devices/Storage/DrvHostBase-freebsd.cpp

    r69500 r76404  
    1515 * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1616 */
     17
     18
     19/*********************************************************************************************************************************
     20*   Header Files                                                                                                                 *
     21*********************************************************************************************************************************/
    1722#define LOG_GROUP LOG_GROUP_DRV_HOST_BASE
    1823#include <sys/cdefs.h>
    … …  
    2429#include <cam/scsi/scsi_message.h>
    2530#include <cam/scsi/scsi_pass.h>
     31#include <VBox/err.h>
     32
    2633#include <VBox/scsi.h>
    2734#include <iprt/log.h>
    2835
    29 /** Maximum buffer size supported by the CAM subsystem. */
    30 #define FBSD_SCSI_MAX_BUFFER_SIZE (64 * _1K)
    31 
     36
     37/*********************************************************************************************************************************
     38*   Structures and Typedefs                                                                                                      *
     39*********************************************************************************************************************************/
    3240/**
    3341 * Host backend specific data.
    … …  
    5260#define DRVHOSTBASE_OS_INT_DECLARED
    5361#include "DrvHostBase.h"
     62
     63
     64/*********************************************************************************************************************************
     65*   Defined Constants And Macros                                                                                                 *
     66*********************************************************************************************************************************/
     67/** Maximum buffer size supported by the CAM subsystem. */
     68#define FBSD_SCSI_MAX_BUFFER_SIZE (64 * _1K)
     69
    5470
    5571

  • trunk/src/VBox/Devices/Storage/DrvHostBase-linux.cpp

    r76396 r76404  
    4343#include <iprt/file.h>
    4444#include <iprt/string.h>
     45#include <VBox/err.h>
    4546#include <VBox/scsi.h>
    4647

  • trunk/src/VBox/Devices/Storage/DrvHostBase-solaris.cpp

    r76386 r76404  
    3737extern "C" char *getfullblkname(char *);
    3838
     39#include <VBox/err.h>
    3940#include <iprt/file.h>
    4041#include <iprt/string.h>

  • trunk/src/VBox/Devices/Storage/DrvHostBase-win.cpp

    r76385 r76404  
    2828#include <iprt/file.h>
    2929#include <iprt/string.h>
     30#include <VBox/err.h>
    3031#include <VBox/scsi.h>
    3132

  • trunk/src/VBox/Devices/Storage/DrvHostBase.cpp

    r73097 r76404  
    2424#include <VBox/vmm/pdmdrv.h>
    2525#include <VBox/vmm/pdmstorageifs.h>
     26#include <VBox/err.h>
    2627#include <iprt/assert.h>
    2728#include <iprt/file.h>
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette