Changeset 6147 in vbox for trunk/src/VBox

Timestamp:

Dec 19, 2007 9:17:49 AM (17 years ago)

Author:

vboxsync

Message:

Solaris RTLogWriteDebugger and guest r0 logging changes.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuest/VBoxGuest-solaris.c (modified) (49 diffs)
• Runtime/Makefile.kmk (modified) (2 diffs)
• Runtime/VBox/log-vbox.cpp (modified) (1 diff)
• Runtime/r0drv/solaris/RTLogWriteDebugger-r0drv-solaris.c (added)
• Runtime/r0drv/solaris/the-solaris-kernel.h (modified) (1 diff)

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

@@ -30 +30 @@
 #undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */
 
+#if defined(DEBUG_ramshankar) && !defined(LOG_ENABLED)
+#define LOG_ENABLED
+#endif
 #include "VBoxGuestInternal.h"
 #include <VBox/log.h>
@@ -46 +49 @@
 /** The module description as seen in 'modinfo'. */
 #define DEVICE_DESC              "VirtualBox Guest Additions Driver"
-/** @name R0 Log helpers.
- * @{ */
-#define VBA_LOGCONT(...)         cmn_err(CE_CONT, "vboxadd: " __VA_ARGS__);
-#define VBA_LOGNOTE(...)         cmn_err(CE_NOTE, "vboxadd: " __VA_ARGS__);
-/** @} */
 
 
@@ -193 +191 @@
 int _init(void)
 {
-    VBA_LOGCONT("_init\n");
-
+    LogFlow((DEVICE_NAME ":_init\n"));
     int rc = ddi_soft_state_init(&g_pVBoxAddSolarisState, sizeof(VBoxAddDevState), 1);
     if (!rc)
@@ -208 +205 @@
 int _fini(void)
 {
-    VBA_LOGCONT("_fini\n");
-
+    LogFlow((DEVICE_NAME ":_fini\n"));
     int rc = mod_remove(&g_VBoxAddSolarisModLinkage);
     if (!rc)
@@ -219 +215 @@
 int _info(struct modinfo *pModInfo)
 {
-    VBA_LOGCONT("_info\n");
+    LogFlow((DEVICE_NAME ":_info\n"));
     return mod_info(&g_VBoxAddSolarisModLinkage, pModInfo);
 }
@@ -234 +230 @@
 static int VBoxAddSolarisAttach(dev_info_t *pDip, ddi_attach_cmd_t enmCmd)
 {
-    VBA_LOGCONT("VBoxAddSolarisAttach\n");
+    LogFlow((DEVICE_NAME ":VBoxAddSolarisAttach\n"));
     switch (enmCmd)
     {
@@ -248 +244 @@
             if (rc != DDI_SUCCESS)
             {
-                VBA_LOGNOTE("ddi_soft_state_zalloc failed.\n");
+                Log((DEVICE_NAME ":ddi_soft_state_zalloc failed.\n"));
                 return DDI_FAILURE;
             }
@@ -256 +252 @@
             {
                 ddi_soft_state_free(g_pVBoxAddSolarisState, instance);
-                VBA_LOGNOTE("ddi_get_soft_state for instance %d failed\n", instance);
+                Log((DEVICE_NAME ":ddi_get_soft_state for instance %d failed\n", instance));
                 return DDI_FAILURE;
             }
@@ -263 +259 @@
             if (!pState)
             {
-                VBA_LOGNOTE("RTMemAllocZ failed to allocate %d bytes\n", sizeof(VBoxAddDevState));
+                Log((DEVICE_NAME ":RTMemAllocZ failed to allocate %d bytes\n", sizeof(VBoxAddDevState)));
                 return DDI_FAILURE;
             }
@@ -274 +270 @@
             if (RT_FAILURE(rc))
             {
-                VBA_LOGNOTE("RTR0Init failed.\n");
+                Log((DEVICE_NAME ":RTR0Init failed.\n"));
                 return DDI_FAILURE;
             }
@@ -352 +348 @@
                                                 }
 
-                                                VBA_LOGNOTE("ddi_create_minor_node failed.\n");
+                                                LogRel((DEVICE_NAME ":ddi_create_minor_node failed.\n"));
                                             }
                                             else
-                                                VBA_LOGNOTE("VBoxGuestInitDevExt failed.\n");
+                                                Log((DEVICE_NAME ":VBoxGuestInitDevExt failed.\n"));
                                             VBoxGuestSolarisRemoveIRQ(pDip, pState);
                                         }
                                         else
-                                            VBA_LOGNOTE("VBoxGuestSolarisAddIRQ failed.\n");
+                                            LogRel((DEVICE_NAME ":VBoxGuestSolarisAddIRQ failed.\n"));
                                         ddi_regs_map_free(&pState->PciMMIOHandle);
                                     }
                                     else
-                                        VBA_LOGNOTE("ddi_regs_map_setup for MMIO region failed.\n");
+                                        Log((DEVICE_NAME ":ddi_regs_map_setup for MMIO region failed.\n"));
                                 }
                                 else
-                                    VBA_LOGNOTE("ddi_dev_regsize for MMIO region failed.\n");
-                                    ddi_regs_map_free(&pState->PciIOHandle);
+                                    Log((DEVICE_NAME ":ddi_dev_regsize for MMIO region failed.\n"));
+                                ddi_regs_map_free(&pState->PciIOHandle);
                             }
                             else
-                                VBA_LOGNOTE("ddi_regs_map_setup for IOport failed.\n");
+                                Log((DEVICE_NAME ":ddi_regs_map_setup for IOport failed.\n"));
                         }
                         else
-                            VBA_LOGNOTE("PCI class/sub-class does not match.\n");
+                            Log((DEVICE_NAME ":PCI class/sub-class does not match.\n"));
                     }
                     else
-                        VBA_LOGNOTE("PCI vendorID, deviceID does not match.\n");
+                        Log((DEVICE_NAME ":PCI vendorID, deviceID does not match.\n"));
                     pci_config_teardown(&pState->PciHandle);
                 }
                 else
-                    VBA_LOGNOTE("pci_config_setup failed rc=%d.\n", rc);
+                    LogRel((DEVICE_NAME ":pci_config_setup failed rc=%d.\n", rc));
                 RTSpinlockDestroy(g_Spinlock);
                 g_Spinlock = NIL_RTSPINLOCK;
             }
             else
-                VBA_LOGNOTE("RTSpinlockCreate failed.\n");
+                Log((DEVICE_NAME ":RTSpinlockCreate failed.\n"));
 
             RTR0Term();
@@ -413 +409 @@
 static int VBoxAddSolarisDetach(dev_info_t *pDip, ddi_detach_cmd_t enmCmd)
 {
-    VBA_LOGCONT("VBoxAddSolarisDetach\n");
+    LogFlow((DEVICE_NAME ":VBoxAddSolarisDetach\n"));
     switch (enmCmd)
     {
@@ -444 +440 @@
                 return DDI_SUCCESS;
             }
-            VBA_LOGNOTE("ddi_get_soft_state failed. Cannot detach instance %d\n", instance);
+            Log((DEVICE_NAME ":ddi_get_soft_state failed. Cannot detach instance %d\n", instance));
             return DDI_FAILURE;
         }
@@ -472 +468 @@
 static int VBoxAddSolarisGetInfo(dev_info_t *pDip, ddi_info_cmd_t enmCmd, void *pArg, void **ppResult)
 {
-    VBA_LOGCONT("VBoxAddSolarisGetInfo\n");
+    LogFlow((DEVICE_NAME ":VBoxAddSolarisGetInfo\n"));
 
     int rc = DDI_SUCCESS;
@@ -501 +497 @@
     PVBOXGUESTSESSION   pSession;
 
-    VBA_LOGCONT("VBoxAddSolarisOpen\n");
+    LogFlow((DEVICE_NAME ":VBoxAddSolarisOpen\n"));
 
 #ifndef USE_SESSION_HASH
@@ -517 +513 @@
     if (!pState)
     {
-        VBA_LOGNOTE("VBoxAddSolarisOpen: too many open instances.");
+        Log((DEVICE_NAME ":VBoxAddSolarisOpen: too many open instances."));
         return ENXIO;
     }
@@ -528 +524 @@
     {
         pState->pSession = pSession;
-        VBA_LOGCONT("VBoxAddSolarisOpen: pSession=%p pState=%p\n", pSession, pState);
+        Log((DEVICE_NAME "VBoxAddSolarisOpen: pSession=%p pState=%p\n", pSession, pState));
         return 0;
     }
@@ -551 +547 @@
         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()));
+        Log((DEVICE_NAME "VBoxAddSolarisOpen: g_DevExt=%p pSession=%p rc=%d pid=%d\n", &g_DevExt, pSession, rc, (int)RTProcSelf()));
         return 0;
     }
 #endif
-    LogRel(("VBoxAddSolarisOpen: VBoxGuestCreateUserSession failed. rc=%d\n", rc));
+    LogRel((DEVICE_NAME "VBoxAddSolarisOpen: VBoxGuestCreateUserSession failed. rc=%d\n", rc));
     return rc;
 }
@@ -563 +558 @@
 static int VBoxAddSolarisClose(dev_t Dev, int flag, int fType, cred_t *pCred)
 {
-    VBA_LOGCONT("VBoxAddSolarisClose pid=%d\n", (int)RTProcSelf());
+    LogFlow((DEVICE_NAME ":VBoxAddSolarisClose pid=%d\n", (int)RTProcSelf()));
 
 #ifdef USE_SESSION_HASH
@@ -605 +600 @@
     if (!pSession)
     {
-        Log(("VBoxGuestIoctl: WHUT?!? pSession == NULL! This must be a mistake... pid=%d", (int)Process));
+        Log((DEVICE_NAME ":VBoxGuestIoctl: WHUT?!? pSession == NULL! This must be a mistake... pid=%d", (int)Process));
         return VERR_INVALID_PARAMETER;
     }
@@ -613 +608 @@
     if (!pState)
     {
-        VBA_LOGNOTE("VBoxAddSolarisClose: failed to get pState.\n");
+        Log((DEVICE_NAME ":VBoxAddSolarisClose: failed to get pState.\n"));
         return DDI_FAILURE;
     }
@@ -622 +617 @@
     if (!pSession)
     {
-        VBA_LOGNOTE("VBoxAddSolarisClose: failed to get pSession.\n");
+        Log((DEVICE_NAME ":VBoxAddSolarisClose: failed to get pSession.\n"));
         return DDI_FAILURE;
     }
@@ -637 +632 @@
 static int VBoxAddSolarisRead(dev_t Dev, struct uio *pUio, cred_t *pCred)
 {
-    VBA_LOGCONT("VBoxAddSolarisRead\n");
+    LogFlow((DEVICE_NAME ":VBoxAddSolarisRead\n"));
     return DDI_SUCCESS;
 }
@@ -644 +639 @@
 static int VBoxAddSolarisWrite(dev_t Dev, struct uio *pUio, cred_t *pCred)
 {
-    VBA_LOGCONT("VBoxAddSolarisWrite\n");
+    LogFlow((DEVICE_NAME ":VBoxAddSolarisWrite\n"));
     return DDI_SUCCESS;
 }
@@ -670 +665 @@
 static int VBoxAddSolarisIOCtl(dev_t Dev, int Cmd, intptr_t pArg, int Mode, cred_t *pCred, int *pVal)
 {
-    VBA_LOGCONT("VBoxAddSolarisIOCtl\n");
+    LogFlow((DEVICE_NAME ":VBoxAddSolarisIOCtl\n"));
 
     /** @todo use the faster way to find pSession (using the soft state) */
@@ -692 +687 @@
     if (!pSession)
     {
-        VBA_LOGNOTE("VBoxAddSolarisIOCtl: WHAT?!? pSession == NULL! This must be a mistake... pid=%d iCmd=%#x\n",
-                    (int)Process, Cmd);
+        Log((DEVICE_NAME ":VBoxAddSolarisIOCtl: WHAT?!? pSession == NULL! This must be a mistake... pid=%d iCmd=%#x\n", (int)Process, Cmd));
         return EINVAL;
     }
@@ -703 +697 @@
     if (!pState)
     {
-        VBA_LOGNOTE("VBoxAddSolarisIOCtl: no state data for %d\n", getminor(Dev));
+        Log((DEVICE_NAME ":VBoxAddSolarisIOCtl: no state data for %d\n", getminor(Dev)));
         return EINVAL;
     }
@@ -710 +704 @@
     if (!pSession)
     {
-        VBA_LOGNOTE("VBoxAddSolarisIOCtl: no session data for %d\n", getminor(Dev));
+        Log((DEVICE_NAME ":VBoxAddSolarisIOCtl: no session data for %d\n", getminor(Dev)));
         return DDI_SUCCESS;
     }
@@ -721 +715 @@
     {
         cbBuf = sizeof(VMMDevRequestHeader);
-        VBA_LOGCONT("VBOXGUEST_IOCTL_VMMREQUEST");
+        LogFlow((DEVICE_NAME ":VBOXGUEST_IOCTL_VMMREQUEST"));
     }
 #ifdef VBOX_HGCM
@@ -728 +722 @@
     {
         cbBuf = sizeof(VBoxGuestHGCMCallInfo);
-        VBA_LOGCONT("VBOXGUEST_IOCTL_HGCM_CALL");
+        LogFlow((DEVICE_NAME ":VBOXGUEST_IOCTL_HGCM_CALL"));
     }
 #endif /* VBOX_HGCM */
@@ -737 +731 @@
             case VBOXGUEST_IOCTL_GETVMMDEVPORT:
                 cbBuf = sizeof(VBoxGuestPortInfo);
-                VBA_LOGCONT("VBOXGUEST_IOCTL_GETVMMDEVPORT");
+                LogFlow((DEVICE_NAME ":VBOXGUEST_IOCTL_GETVMMDEVPORT"));
                 break;
 
             case VBOXGUEST_IOCTL_WAITEVENT:
                 cbBuf = sizeof(VBoxGuestWaitEventInfo);
-                VBA_LOGCONT("VBOXGUEST_IOCTL_WAITEVENT");
+                LogFlow((DEVICE_NAME ":VBOXGUEST_IOCTL_WAITEVENT"));
                 break;
 
             case VBOXGUEST_IOCTL_CTL_FILTER_MASK:
                 cbBuf = sizeof(VBoxGuestFilterMaskInfo);
-                VBA_LOGCONT("VBOXGUEST_IOCTL_CTL_FILTER_MASK");
+                LogFlow((DEVICE_NAME ":VBOXGUEST_IOCTL_CTL_FILTER_MASK"));
                 break;
 
@@ -753 +747 @@
             case VBOXGUEST_IOCTL_HGCM_CONNECT:
                 cbBuf = sizeof(VBoxGuestHGCMConnectInfo);
-                VBA_LOGCONT("VBOXGUEST_IOCTL_HGCM_CONNECT");
+                LogFlow((DEVICE_NAME ":VBOXGUEST_IOCTL_HGCM_CONNECT"));
                 break;
 
             case VBOXGUEST_IOCTL_HGCM_DISCONNECT:
                 cbBuf = sizeof(VBoxGuestHGCMDisconnectInfo);
-                VBA_LOGCONT("VBOXGUEST_IOCTL_HGCM_DISCONNECT");
+                LogFlow((DEVICE_NAME ":VBOXGUEST_IOCTL_HGCM_DISCONNECT"));
                 break;
 
             case VBOXGUEST_IOCTL_CLIPBOARD_CONNECT:
                 cbBuf = sizeof(uint32_t);
-                VBA_LOGCONT("VBOXGUEST_IOCTL_CLIPBOARD_CONNECT");
+                LogFlow((DEVICE_NAME ":VBOXGUEST_IOCTL_CLIPBOARD_CONNECT"));
                 break;
 #endif /* VBOX_HGCM */
@@ -769 +763 @@
             default:
             {
-                VBA_LOGNOTE("VBoxAddSolarisIOCtl: Unkown request %d\n", Cmd);
+                LogRel((DEVICE_NAME ":VBoxAddSolarisIOCtl: Unkown request %d\n", Cmd));
                 return VERR_NOT_SUPPORTED;
             }
@@ -780 +774 @@
     if (RT_UNLIKELY(cbBuf != IOCPARM_LEN(Cmd)))
     {
-        VBA_LOGNOTE("VBoxAddSolarisIOCtl: buffer size mismatch. size=%d expected=%d.\n", IOCPARM_LEN(Cmd), cbBuf);
+        LogRel((DEVICE_NAME ":VBoxAddSolarisIOCtl: buffer size mismatch. size=%d expected=%d.\n", IOCPARM_LEN(Cmd), cbBuf));
         return EINVAL;
     }
@@ -789 +783 @@
     if (RT_UNLIKELY(!pvBuf))
     {
-        VBA_LOGNOTE("VBoxAddSolarisIOCtl: RTMemTmpAlloc failed to alloc %d bytes.\n", cbBuf);
+        Log((DEVICE_NAME ":VBoxAddSolarisIOCtl: RTMemTmpAlloc failed to alloc %d bytes.\n", cbBuf));
         return ENOMEM;
     }
@@ -797 +791 @@
     {
         RTMemTmpFree(pvBuf);
-        VBA_LOGNOTE("VBoxAddSolarisIOCtl: ddi_copyin failed; pvBuf=%p pArg=%p Cmd=%d. rc=%d\n", pvBuf, pArg, Cmd, rc);
+        Log((DEVICE_NAME ":VBoxAddSolarisIOCtl: ddi_copyin failed; pvBuf=%p pArg=%p Cmd=%d. rc=%d\n", pvBuf, pArg, Cmd, rc));
         return EFAULT;
     }
@@ -803 +797 @@
     {
         RTMemTmpFree(pvBuf);
-        VBA_LOGNOTE("VBoxAddSolarisIOCtl: pvBuf invalid pointer %p\n", pvBuf);
+        Log((DEVICE_NAME ":VBoxAddSolarisIOCtl: pvBuf invalid pointer %p\n", pvBuf));
     }
 
@@ -812 +806 @@
         if (RT_UNLIKELY(cbDataReturned > cbBuf))
         {
-            VBA_LOGNOTE("VBoxAddSolarisIOCtl: too much output data %d expected %d\n", cbDataReturned, cbBuf);
+            Log((DEVICE_NAME ":VBoxAddSolarisIOCtl: too much output data %d expected %d\n", cbDataReturned, cbBuf));
             cbDataReturned = cbBuf;
         }
@@ -818 +812 @@
         if (RT_UNLIKELY(rc))
         {
-            VBA_LOGNOTE("VBoxAddSolarisIOCtl: ddi_copyout failed; pvBuf=%p pArg=%p Cmd=%d. rc=%d\n", pvBuf, pArg, Cmd, rc);
+            Log((DEVICE_NAME ":VBoxAddSolarisIOCtl: ddi_copyout failed; pvBuf=%p pArg=%p Cmd=%d. rc=%d\n", pvBuf, pArg, Cmd, rc));
             rc = EFAULT;
         }
@@ -824 +818 @@
     else
     {
-        VBA_LOGNOTE("VBoxAddSolarisIOCtl: VBoxGuestCommonIOCtl failed. rc=%d\n", rc);
+        LogRel((DEVICE_NAME ":VBoxAddSolarisIOCtl: VBoxGuestCommonIOCtl failed. rc=%d\n", rc));
         rc = EFAULT;
     }
@@ -844 +838 @@
     int rc;
     VBoxAddDevState *pState = (VBoxAddDevState *)pvState;
-    VBA_LOGCONT("VBoxGuestSolarisAddIRQ\n");
+    LogFlow((DEVICE_NAME "VBoxGuestSolarisAddIRQ\n"));
 
     /*
@@ -857 +851 @@
         rc = ddi_add_intr(pDip, 0, &pState->BlockCookie, NULL, VBoxGuestSolarisISR, (caddr_t)pState);
         if (rc != DDI_SUCCESS)
-            VBA_LOGNOTE("ddi_add_intr failed. Cannot set IRQ for VMMDev.\n");
+            Log((DEVICE_NAME ":ddi_add_intr failed. Cannot set IRQ for VMMDev.\n"));
     }
     else
-        VBA_LOGNOTE("ddi_get_iblock_cookie failed. Cannot set IRQ for VMMDev.\n");
+        Log((DEVICE_NAME ":ddi_get_iblock_cookie failed. Cannot set IRQ for VMMDev.\n"));
     return rc;
 }
@@ -873 +867 @@
 static void VBoxGuestSolarisRemoveIRQ(dev_info_t *pDip, void *pvState)
 {
-    VBA_LOGCONT("VBoxGuestSolarisRemoveIRQ\n");
+    LogFlow((DEVICE_NAME ":VBoxGuestSolarisRemoveIRQ\n"));
 
     VBoxAddDevState *pState = (VBoxAddDevState *)pvState;
@@ -888 +882 @@
 static uint_t VBoxGuestSolarisISR(caddr_t Arg)
 {
-    VBA_LOGCONT("VBoxGuestSolarisISR\n");
+    LogFlow((DEVICE_NAME ":VBoxGuestSolarisISR\n"));
 
     VBoxAddDevState *pState = (VBoxAddDevState *)Arg;
@@ -911 +905 @@
 DECLVBGL(int) VBoxGuestSolarisServiceCall(void *pvSession, unsigned iCmd, void *pvData, size_t cbData, size_t *pcbDataReturned)
 {
-    VBA_LOGCONT("VBoxGuestSolarisServiceCall\n");
+    LogFlow((DEVICE_NAME ":VBoxGuestSolarisServiceCall\n"));
 
     PVBOXGUESTSESSION pSession = (PVBOXGUESTSESSION)pvSession;
@@ -930 +924 @@
 DECLVBGL(void *) VBoxGuestSolarisServiceOpen(uint32_t *pu32Version)
 {
-    VBA_LOGCONT("VBoxGuestSolarisServiceOpen\n");
+    LogFlow((DEVICE_NAME ":VBoxGuestSolarisServiceOpen\n"));
 
     AssertPtrReturn(pu32Version, NULL);
@@ -940 +934 @@
         return pSession;
     }
-    VBA_LOGNOTE("VBoxGuestCreateKernelSession failed. rc=%d\n", rc);
+    LogRel((DEVICE_NAME ":VBoxGuestCreateKernelSession failed. rc=%d\n", rc));
     return NULL;
 }
@@ -953 +947 @@
 DECLVBGL(int) VBoxGuestSolarisServiceClose(void *pvSession)
 {
-    VBA_LOGCONT("VBoxGuestSolarisServiceClose\n");
+    LogFlow((DEVICE_NAME ":VBoxGuestSolarisServiceClose\n"));
 
     PVBOXGUESTSESSION pSession = (PVBOXGUESTSESSION)pvSession;
@@ -962 +956 @@
         return VINF_SUCCESS;
     }
-    VBA_LOGNOTE("Invalid pSession.\n");
+    LogRel((DEVICE_NAME ":Invalid pSession.\n"));
     return VERR_INVALID_HANDLE;
 }

trunk/src/VBox/Runtime/Makefile.kmk

@@ -938 +938 @@
         common/string/memchr.asm \
         generic/RTAssertDoBreakpoint-generic.cpp \
-        generic/RTLogWriteDebugger-generic.cpp \
         generic/RTTimerCreate-generic.cpp \
         r0drv/memobj-r0drv.cpp \
@@ -946 +945 @@
         r0drv/solaris/memobj-r0drv-solaris.c \
         r0drv/solaris/process-r0drv-solaris.c \
+        r0drv/solaris/RTLogWriteDebugger-r0drv-solaris.c \
         r0drv/solaris/semevent-r0drv-solaris.c \
         r0drv/solaris/semeventmulti-r0drv-solaris.c \

trunk/src/VBox/Runtime/VBox/log-vbox.cpp

@@ -389 +389 @@
         pLogger->fDestFlags |= RTLOGDEST_DEBUGGER;
 # endif
+# if defined(DEBUG_ramshankar)  /* Guest ring-0 as well */
+        RTLogGroupSettings(pLogger, "+all.e.l.f");
+        RTLogFlags(pLogger, "enabled unbuffered");
+        pLogger->fDestFlags |= RTLOGDEST_DEBUGGER;
+# endif
 
     }

trunk/src/VBox/Runtime/r0drv/solaris/the-solaris-kernel.h

@@ -38 +38 @@
 #include <sys/time.h>
 #include <sys/sysmacros.h>
+#include <sys/cmn_err.h>
 #include <sys/vmsystm.h>
 #include <sys/cyclic.h>