Changeset 40560 in vbox for trunk

Timestamp:

Mar 21, 2012 11:18:15 AM (13 years ago)

Author:

vboxsync

Message:

Additions/Common/VBoxGuest: put Solaris helper functions into their own file.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• Makefile.kmk (modified) (1 diff)
• testcase/solaris.h (modified) (2 diffs)
• testcase/tstVBoxGuest-solaris.c (added)

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -213 +213 @@
   PROGRAMS += tstVBoxGuest-solaris
   tstVBoxGuest-solaris_TEMPLATE = VBOXR3TSTEXE
-  tstVBoxGuest-solaris_SOURCES  = VBoxGuest-solaris-streams.c
+  tstVBoxGuest-solaris_SOURCES  = \
+        VBoxGuest-solaris-streams.c \
+        testcase/tstVBoxGuest-solaris.c
   tstVBoxGuest-solaris_DEFS     = TESTCASE
   tstVBoxGuest-solaris_LIBS     = $(LIB_RUNTIME)

trunk/src/VBox/Additions/common/VBoxGuest/testcase/solaris.h

@@ -352 +352 @@
 #define putbq(...) do {} while(0)
 
+/* Externally defined helpers. */
+
+extern void miocack(queue_t *pWriteQueue, mblk_t *pMBlk, int cbData, int rc);
+extern void miocnak(queue_t *pWriteQueue, mblk_t *pMBlk, int cbData, int iErr);
+extern int miocpullup(mblk_t *pMBlk, size_t cbMsg);
+
 /* API stubs with simple logic */
 
@@ -385 +391 @@
 }
 
-static inline void miocack(queue_t *pWriteQueue, mblk_t *pMBlk, int cbData,
-                           int rc)
-{
-    struct iocblk *pIOCBlk = (struct iocblk *)pMBlk->b_rptr;
-
-    pMBlk->b_datap->db_type = M_IOCACK;
-    pIOCBlk->ioc_count = cbData;
-    pIOCBlk->ioc_error = 0;
-    pIOCBlk->ioc_rval = rc;
-    qreply(pWriteQueue, pMBlk);
-}
-
-static inline void miocnak(queue_t *pWriteQueue, mblk_t *pMBlk, int cbData,
-                           int iErr)
-{
-    struct iocblk *pIOCBlk = (struct iocblk *)pMBlk->b_rptr;
-
-    pMBlk->b_datap->db_type = M_IOCNAK;
-    pIOCBlk->ioc_count = cbData;
-    pIOCBlk->ioc_error = iErr;
-    qreply(pWriteQueue, pMBlk);
-}
-
-/* This does not work like the real version, but does some sanity testing
- * and sets a flag. */
-static inline int miocpullup(mblk_t *pMBlk, size_t cbMsg)
-{
-    struct iocblk *pIOCBlk = (struct iocblk *)pMBlk->b_rptr;
-
-    if (pIOCBlk->ioc_count == TRANSPARENT)
-        return EINVAL;
-    if (   !pMBlk->b_cont
-        || pMBlk->b_cont->b_wptr < pMBlk->b_cont->b_rptr + cbMsg)
-        return EINVAL;
-    pMBlk->b_flag = 1;  /* Test for this to be sure miocpullup was called. */
-    return 0;
-}
-
 /* API stubs with controllable logic */