Changeset 6118 in vbox for trunk/src/VBox

Timestamp:

Dec 18, 2007 9:55:20 AM (17 years ago)

Author:

vboxsync

Message:

Solaris guest timesync. Daemonize to be fixed.

Added solaris to libxml2 build-it-ourselves platform list. This could change
when Sun ships an updated libxml2. 2.6.23 is utterly un-usable.

Location:

trunk/src/VBox/Additions/common

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxGuest/VBoxGuest-solaris.c (modified) (9 diffs)
• VBoxGuestLib/VBoxGuestR3Lib.cpp (modified) (2 diffs)
• VBoxService/Makefile.kmk (modified) (1 diff)
• VBoxService/VBoxService.cpp (modified) (2 diffs)
• VBoxService/VBoxServiceTimeSync.cpp (modified) (2 diffs)

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

@@ -23 +23 @@
 include $(PATH_SUB_CURRENT)/VBoxGuestLib/Makefile.kmk
 include $(PATH_SUB_CURRENT)/VBoxGuest/Makefile.kmk
+include $(PATH_SUB_CURRENT)/VBoxService/Makefile.kmk
 
 include $(PATH_KBUILD)/subfooter.kmk

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c

@@ -32 +32 @@
 #include "VBoxGuestInternal.h"
 #include <VBox/log.h>
-#include <VBox/VBoxGuest.h>
 #include <iprt/asm.h>
 #include <iprt/assert.h>
@@ -497 +496 @@
         RTSpinlockReleaseNoInts(g_Spinlock, &Tmp);
 
+        VBA_LOGCONT("VBoxAddSolarisOpen: pid=%d\n", (int)RTProcSelf());
         Log(("VBoxAddSolarisOpen: g_DevExt=%p pSession=%p rc=%d pid=%d\n", &g_DevExt, pSession, rc, (int)RTProcSelf()));
         return 0;
@@ -507 +507 @@
 static int VBoxAddSolarisClose(dev_t Dev, int flag, int fType, cred_t *pCred)
 {
-    VBA_LOGCONT("VBoxAddSolarisClose pid=%d=%d\n", (int)RTProcSelf());
+    VBA_LOGCONT("VBoxAddSolarisClose pid=%d\n", (int)RTProcSelf());
 
     /*
@@ -625 +625 @@
     if (    Cmd >= VBOXGUEST_IOCTL_VMMREQUEST(0)
         &&  Cmd <= VBOXGUEST_IOCTL_VMMREQUEST(0xfff))
+    {
         cbBuf = sizeof(VMMDevRequestHeader);
+        VBA_LOGCONT("VBOXGUEST_IOCTL_VMMREQUEST");
+    }
 #ifdef VBOX_HGCM
     else if (   Cmd >= VBOXGUEST_IOCTL_HGCM_CALL(0)
              && Cmd <= VBOXGUEST_IOCTL_HGCM_CALL(0xfff))
+    {
         cbBuf = sizeof(VBoxGuestHGCMCallInfo);
+        VBA_LOGCONT("VBOXGUEST_IOCTL_HGCM_CALL");
+    }
 #endif /* VBOX_HGCM */
     else
@@ -637 +643 @@
             case VBOXGUEST_IOCTL_GETVMMDEVPORT:
                 cbBuf = sizeof(VBoxGuestPortInfo);
+                VBA_LOGCONT("VBOXGUEST_IOCTL_GETVMMDEVPORT");
                 break;
 
             case VBOXGUEST_IOCTL_WAITEVENT:
                 cbBuf = sizeof(VBoxGuestWaitEventInfo);
+                VBA_LOGCONT("VBOXGUEST_IOCTL_WAITEVENT");
                 break;
 
             case VBOXGUEST_IOCTL_CTL_FILTER_MASK:
                 cbBuf = sizeof(VBoxGuestFilterMaskInfo);
+                VBA_LOGCONT("VBOXGUEST_IOCTL_CTL_FILTER_MASK");
                 break;
 
@@ -650 +659 @@
             case VBOXGUEST_IOCTL_HGCM_CONNECT:
                 cbBuf = sizeof(VBoxGuestHGCMConnectInfo);
+                VBA_LOGCONT("VBOXGUEST_IOCTL_HGCM_CONNECT");
                 break;
 
             case VBOXGUEST_IOCTL_HGCM_DISCONNECT:
                 cbBuf = sizeof(VBoxGuestHGCMDisconnectInfo);
+                VBA_LOGCONT("VBOXGUEST_IOCTL_HGCM_DISCONNECT");
                 break;
 
             case VBOXGUEST_IOCTL_CLIPBOARD_CONNECT:
                 cbBuf = sizeof(uint32_t);
+                VBA_LOGCONT("VBOXGUEST_IOCTL_CLIPBOARD_CONNECT");
                 break;
 #endif /* VBOX_HGCM */
@@ -668 +680 @@
         }
     }
-
+#if 0
+    /* cbBuf must actually get the size based on the VMM request type.
+     * Anyway, this obtaining cbBuf businesss will be removed eventually.
+     */
     if (RT_UNLIKELY(cbBuf != IOCPARM_LEN(Cmd)))
     {
@@ -674 +689 @@
         return EINVAL;
     }
-
+#endif
+
+    cbBuf = IOCPARM_LEN(Cmd);    
     void *pvBuf = RTMemTmpAlloc(cbBuf);
     if (RT_UNLIKELY(!pvBuf))
@@ -689 +706 @@
         return EFAULT;
     }
+    if (RT_UNLIKELY(cbBuf != 0 && !VALID_PTR(pvBuf)))
+    {
+        RTMemTmpFree(pvBuf);
+        VBA_LOGNOTE("VBoxAddSolarisIOCtl: pvBuf invalid pointer %p\n", pvBuf);
+    }
 
     size_t cbDataReturned;
     rc = VBoxGuestCommonIOCtl(Cmd, &g_DevExt, pSession, pvBuf, cbBuf, &cbDataReturned);
-    if (RT_LIKELY(!rc))
+    if (RT_SUCCESS(rc))
     {
         if (RT_UNLIKELY(cbDataReturned > cbBuf))

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp

@@ -33 +33 @@
 #include <iprt/mem.h>
 #include <VBox/VBoxGuest.h>
-
 
 /*******************************************************************************
@@ -98 +97 @@
     g_File = hf;
 
+#elif defined(RT_OS_SOLARIS)
+    RTFILE File;
+    int rc = RTFileOpen(&File, VBOXGUEST_DEVICE_NAME, RTFILE_O_READWRITE);
+    if (RT_FAILURE(rc))
+        return rc;
+    g_File = File;
+
 #else 
     /* the default implemenation. */

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

@@ -34 +34 @@
         VBoxService-os2.def \
         VBoxServiceClipboard-os2.cpp
+VBoxService_SOURCES.solaris = \
+    VBoxService-solaris.cpp
 VBoxService_LIBS          = \
         $(VBOX_LIB_VBGL_R3) \

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -47 +47 @@
 /** Shutdown the main thread. (later, for signals) */
 bool volatile g_fShutdown;
+#ifndef RT_OS_OS2
+extern int daemon(int nochdir, int noclose);
+#endif
 
 /**
@@ -273 +276 @@
                 if (cch > sizeof("enable-") && !memcmp(psz, "enable-", sizeof("enable-") - 1))
                     for (unsigned j = 0; !fFound && j < RT_ELEMENTS(g_aServices); j++)
+#if defined(RT_OS_OS2)
                         if ((fFound = !stricmp(psz + sizeof("enable-") - 1, g_aServices[j].pDesc->pszName)))
+#else
+                        if ((fFound = !strcasecmp(psz + sizeof("enable-") - 1, g_aServices[j].pDesc->pszName)))
+#endif
                             g_aServices[j].fEnabled = true;
 
                 if (cch > sizeof("disable-") && !memcmp(psz, "disable-", sizeof("disable-") - 1))
                     for (unsigned j = 0; !fFound && j < RT_ELEMENTS(g_aServices); j++)
+#if defined(RT_OS_OS2)
                         if ((fFound = !stricmp(psz + sizeof("disable-") - 1, g_aServices[j].pDesc->pszName)))
+#else
+                        if ((fFound = !strcasecmp(psz + sizeof("disable-") - 1, g_aServices[j].pDesc->pszName)))
+#endif
                             g_aServices[j].fEnabled = false;
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp

@@ -240 +240 @@
                     struct timeval tv;
 # if !defined(RT_OS_OS2) /* PORTME */
-                    RTTimeSpecGetTimeval(Drift, &tv);
+                    RTTimeSpecGetTimeval(&Drift, &tv);
                     if (adjtime(&tv, NULL) == 0)
                     {
@@ -343 +343 @@
     "                        with to calculate the dynamic minimum adjust time.\n"
     "                        The default is 8 times.\n"
-    "    --timesync-max-latency     The max host timer query latency to accpet.\n"
+    "    --timesync-max-latency     The max host timer query latency to accept.\n"
     "                        The default is 250 ms.\n"
     ,