Changeset 76382 in vbox for trunk

Timestamp:

Dec 23, 2018 12:47:17 AM (6 years ago)

Author:

vboxsync

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

127680

Message:

include/VBox/vmm/pdmifs.h: Don't include hgcmsvc.h just for VBOXHGCMSVCPARM as it drags in all kinds of stuff. bugref:9344

Location:

trunk

Files:

• include/VBox/vmm/pdmifs.h (modified) (3 diffs)
• src/VBox/Devices/Audio/DevHDA.cpp (modified) (1 diff)
• src/VBox/Devices/Network/DevVirtioNet.cpp (modified) (1 diff)
• src/VBox/Devices/Storage/DrvHostBase-linux.cpp (modified) (3 diffs)
• src/VBox/Main/include/VMMDev.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/GIMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/IOMAll.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pdmifs.h

@@ -29 +29 @@
 #include <iprt/sg.h>
 #include <VBox/types.h>
-#include <VBox/hgcmsvc.h>
 
 
@@ -2115 +2114 @@
 # define PDMIHGCMPORT_IID                       "28c0a201-68cd-4752-9404-bb42a0c09eb7"
 
-
+/* forward decl to hgvmsvc.h. */
+struct VBOXHGCMSVCPARM;
 /** Pointer to a HGCM service location structure. */
 typedef struct HGCMSERVICELOCATION *PHGCMSERVICELOCATION;
-
 /** Pointer to a HGCM connector interface. */
 typedef struct PDMIHGCMCONNECTOR *PPDMIHGCMCONNECTOR;
@@ -2165 +2164 @@
      */
     DECLR3CALLBACKMEMBER(int, pfnCall,(PPDMIHGCMCONNECTOR pInterface, PVBOXHGCMCMD pCmd, uint32_t u32ClientID, uint32_t u32Function,
-                                       uint32_t cParms, PVBOXHGCMSVCPARM paParms, uint64_t tsArrival));
+                                       uint32_t cParms, struct VBOXHGCMSVCPARM *paParms, uint64_t tsArrival));
 
     /**

trunk/src/VBox/Devices/Audio/DevHDA.cpp

@@ -40 +40 @@
 #include <iprt/file.h>
 #include <iprt/list.h>
+# include <iprt/string.h>
 #ifdef IN_RING3
 # include <iprt/mem.h>
 # include <iprt/semaphore.h>
-# include <iprt/string.h>
 # include <iprt/uuid.h>
 #endif

trunk/src/VBox/Devices/Network/DevVirtioNet.cpp

@@ -30 +30 @@
 #include <iprt/net.h>
 #include <iprt/semaphore.h>
+#include <iprt/string.h>
 #ifdef IN_RING3
 # include <iprt/mem.h>
 # include <iprt/uuid.h>
-#endif /* IN_RING3 */
+#endif
 #include <VBox/VBoxPktDmp.h>
 #include "VBoxDD.h"

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

@@ -15 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #define LOG_GROUP LOG_GROUP_DRV_HOST_BASE
 #include <sys/ioctl.h>
@@ -37 +41 @@
 #include <iprt/mem.h>
 #include <iprt/file.h>
+#include <iprt/string.h>
 #include <VBox/scsi.h>
 
-/** Maximum buffer size supported by the kernel interface. */
-#define LNX_SCSI_MAX_BUFFER_SIZE (100 * _1K)
 
 /**
- * Host backend specific data.
+ * Host backend specific data (needed by DrvHostBase.h).
  */
 typedef struct DRVHOSTBASEOS
@@ -61 +64 @@
 #define DRVHOSTBASE_OS_INT_DECLARED
 #include "DrvHostBase.h"
+
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
+/** Maximum buffer size supported by the kernel interface. */
+#define LNX_SCSI_MAX_BUFFER_SIZE (100 * _1K)
+
+
+
+
 
 DECLHIDDEN(int) drvHostBaseScsiCmdOs(PDRVHOSTBASE pThis, const uint8_t *pbCmd, size_t cbCmd, PDMMEDIATXDIR enmTxDir,

trunk/src/VBox/Main/include/VMMDev.h

@@ -21 +21 @@
 #include "VirtualBoxBase.h"
 #include <VBox/vmm/pdmdrv.h>
+#include <VBox/hgcmsvc.h>
 #include <iprt/asm.h>
 

trunk/src/VBox/VMM/VMMAll/GIMAll.cpp

@@ -28 +28 @@
 #include <VBox/dis.h>       /* For DISCPUSTATE */
 #include <VBox/err.h>
+#include <iprt/string.h>
 
 /* Include all the providers. */

trunk/src/VBox/VMM/VMMAll/IOMAll.cpp

@@ -35 +35 @@
 #include <VBox/log.h>
 #include <iprt/assert.h>
+#include <iprt/string.h>
 #include "IOMInline.h"