Changeset 31430 in vbox

Timestamp:

Aug 6, 2010 8:47:51 AM (15 years ago)

Author:

vboxsync

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

64495

Message:

Guest Additions version lookup/status: Fixed loading of guest drivers, moved VbglR0MiscReportGuestInfo code to common/VBoxGuest/VBoxHelper.

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• src/VBox/Additions/WINNT/VBoxGuest/Makefile.kmk (modified) (3 diffs)
• src/VBox/Additions/WINNT/VBoxGuest/NTLegacy.cpp (modified) (3 diffs)
• src/VBox/Additions/WINNT/VBoxGuest/VBoxGuestPnP.cpp (modified) (3 diffs)
• src/VBox/Additions/common/VBoxGuest/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuest/VBoxHelper.cpp (moved) (moved from trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibMisc.c ) (6 diffs)
• src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk (modified) (2 diffs)
• src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (1 diff)

trunk/include/VBox/VBoxGuestLib.h

@@ -380 +380 @@
 DECLVBGL(int) VbglQueryVMMDevMemory (VMMDevMemory **ppVMMDevMemory);
 DECLR0VBGL(bool) VbglR0CanUsePhysPageList(void);
-
-DECLR0VBGL(int) VbglR0MiscReportGuestInfo(VBOXOSTYPE enmOSType);
 
 #endif /* IN_RING0 && !IN_RING0_AGNOSTIC */

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

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2007 Oracle Corporation
+# Copyright (C) 2006-2010 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -43 +43 @@
         HelperBugCheck.cpp \
         VBoxGuest.rc
-VBoxGuest_LIBS        = \
+VBoxGuest_SOURCES      += \
+        ../../common/VBoxGuest/VBoxHelper.cpp
+VBoxGuest_LIBS          = \
         $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \
         $(PATH_SDK_W2K3DDK_LIB)/hal.lib \
@@ -71 +73 @@
         NTLegacy.cpp \
         VBoxGuest.rc
+VBoxGuestNT_SOURCES  += \
+        ../../common/VBoxGuest/VBoxHelper.cpp
+
 VBoxGuestNT_LIBS      = \
         $(PATH_SDK_W2K3DDK_LIB)/exsup.lib \

trunk/src/VBox/Additions/WINNT/VBoxGuest/NTLegacy.cpp

@@ -3 +3 @@
  * VBoxGuest -- VirtualBox Win32 guest support driver
  *
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -24 +24 @@
 
 #include <VBox/VBoxGuestLib.h>
+#include "../../common/VBoxGuest/VBoxHelper.h"
 
 /*******************************************************************************
@@ -276 +277 @@
     /** @todo Don't mix up IPRT rc and NTSTATUS rc above! */
 
-    vrc = VBoxInitMemBalloon(pDevExt);
-    if (RT_SUCCESS(vrc))
-    {
-        vrc = VbglR0MiscReportGuestInfo(hlpVBoxWinVersionToOSType(winVersion));
+    if (NT_SUCCESS(rc))
+    {
+        vrc = VBoxReportGuestInfo(hlpVBoxWinVersionToOSType(winVersion));
+        if (RT_SUCCESS(vrc))
+        {
+            vrc = VBoxInitMemBalloon(pDevExt);
+            if (RT_SUCCESS(vrc))
+            {
+                vrc = VBoxReportGuestDriverStatus(true /* Driver is active */);
+                if (RT_FAILURE(vrc))
+                    dprintf(("VBoxGuest::VBoxGuestPnp::IRP_MN_START_DEVICE: could not report guest driver status, vrc = %d\n", vrc));
+            }
+            else
+                dprintf(("VBoxGuest::VBoxGuestPnp::IRP_MN_START_DEVICE: could not init mem balloon, vrc = %d\n", vrc));
+        }
+        else
+            dprintf(("VBoxGuest::VBoxGuestPnp::IRP_MN_START_DEVICE: could not report guest information to host, vrc = %d\n", vrc));
+
         if (RT_FAILURE(vrc))
-            dprintf(("VBoxGuest::ntCreateDevice: could not report information to host, rc = %d, exiting!\n", rc));
-    }
-
-    if (   NT_ERROR(rc)
-        || RT_FAILURE(vrc))
+            rc = STATUS_UNSUCCESSFUL;
+    }
+
+    if (NT_SUCCESS(rc))
+    {
+        // ready to rumble!
+        pDevExt->devState = WORKING;
+    }
+    else
     {
         freeDeviceResources(pDrvObj, pDevObj);
-        return STATUS_UNSUCCESSFUL;
-    }
-
-    // ready to rumble!
-    pDevExt->devState = WORKING;
+    }
+
     dprintf(("returning from ntCreateDevice with rc = 0x%x\n, vrc = %Rrc", rc, vrc));
     return rc;

trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuestPnP.cpp

@@ -25 +25 @@
 
 #include <VBox/VBoxGuestLib.h>
+#include "../../common/VBoxGuest/VBoxHelper.h"
 
 /*******************************************************************************
@@ -230 +231 @@
                 }
             }
+
+            /** @todo Don't mix up IPRT rc and NTSTATUS rc above! */
+
+            if (NT_SUCCESS(rc))
+            {
+                int vrc = VBoxReportGuestInfo(hlpVBoxWinVersionToOSType(winVersion));
+                if (RT_SUCCESS(vrc))
+                {
+                    vrc = VBoxInitMemBalloon(pDevExt);
+                    if (RT_SUCCESS(vrc))
+                    {
+                        vrc = VBoxReportGuestDriverStatus(true /* Driver is active */);
+                        if (RT_FAILURE(vrc))
+                            dprintf(("VBoxGuest::VBoxGuestPnp::IRP_MN_START_DEVICE: could not report guest driver status, vrc = %d\n", vrc));
+                    }
+                    else
+                        dprintf(("VBoxGuest::VBoxGuestPnp::IRP_MN_START_DEVICE: could not init mem balloon, vrc = %d\n", vrc));
+                }
+                else
+                    dprintf(("VBoxGuest::VBoxGuestPnp::IRP_MN_START_DEVICE: could not report guest information to host, vrc = %d\n", vrc));
+
+                if (RT_FAILURE(vrc))
+                    rc = STATUS_UNSUCCESSFUL;
+            }
+
             if (NT_SUCCESS(rc))
             {
@@ -241 +267 @@
                 pDevExt->HGCMWaitTimeout.QuadPart *= -10000;     /* relative in 100ns units */
 
-                int vrc = VBoxInitMemBalloon(pDevExt);
-                if (RT_SUCCESS(vrc))
-                {
-                    vrc = VbglR0MiscReportGuestInfo(hlpVBoxWinVersionToOSType(winVersion));
-                    if (RT_FAILURE(vrc))
-                        dprintf(("VBoxGuest::VBoxGuestPnp::IRP_MN_START_DEVICE: could not report information to host, rc = %d\n", rc));
-                }
-
                 // ready to rumble!
                 dprintf(("VBoxGuest::VBoxGuestPnp: device is ready!\n"));
                 pDevExt->devState = WORKING;
-            } else
+            }
+            else
             {
                 dprintf(("VBoxGuest::VBoxGuestPnp: error: rc = 0x%x\n", rc));

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

@@ -45 +45 @@
    VBoxGuest_SOURCES     = VBoxGuest-$(KBUILD_TARGET).c
   endif
-  VBoxGuest_SOURCES     += VBoxGuest.cpp
+  VBoxGuest_SOURCES     += \
+        VBoxGuest.cpp \
+        VBoxHelper.cpp
   VBoxGuest_LIBS         = \
         $(VBOX_LIB_VBGL_R0BASE) \

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

@@ -36 +36 @@
 # include <iprt/thread.h>
 #endif
+#include "VBoxHelper.h"
 #include "version-generated.h"
 #if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
@@ -733 +734 @@
             Assert(pDevExt->PhysIrqAckEvents != 0);
 
-            rc = vboxGuestSetFilterMask(pDevExt, fFixedEvents);
+            rc = VBoxReportGuestInfo(enmOSType);
             if (RT_SUCCESS(rc))
             {
-                /*
-                 * Disable guest graphics capability by default. The guest specific
-                 * graphics driver will re-enable this when it is necessary.
-                 */
-                rc = VBoxGuestSetGuestCapabilities(0, VMMDEV_GUEST_SUPPORTS_GRAPHICS);
+                rc = vboxGuestSetFilterMask(pDevExt, fFixedEvents);
                 if (RT_SUCCESS(rc))
                 {
-                    vboxGuestInitFixateGuestMappings(pDevExt);
-
-                    rc = VbglR0MiscReportGuestInfo(enmOSType);
-                    if (RT_FAILURE(rc))
-                        LogRel(("VBoxGuestInitDevExt: VbglR0MiscReportGuestInfo failed, rc=%Rrc\n", rc));
-
-                    Log(("VBoxGuestInitDevExt: returns success\n"));
-                    return VINF_SUCCESS;
+                    /*
+                     * Disable guest graphics capability by default. The guest specific
+                     * graphics driver will re-enable this when it is necessary.
+                     */
+                    rc = VBoxGuestSetGuestCapabilities(0, VMMDEV_GUEST_SUPPORTS_GRAPHICS);
+                    if (RT_SUCCESS(rc))
+                    {
+                        vboxGuestInitFixateGuestMappings(pDevExt);
+
+                        rc = VBoxReportGuestDriverStatus(true /* Driver is active */);
+                        if (RT_FAILURE(rc))
+                            LogRel(("VBoxGuestInitDevExt: VBoxReportGuestDriverStatus failed, rc=%Rrc\n", rc));
+
+                        Log(("VBoxGuestInitDevExt: returns success\n"));
+                        return VINF_SUCCESS;
+                    }
+
+                    LogRel(("VBoxGuestInitDevExt: VBoxGuestSetGuestCapabilities failed, rc=%Rrc\n", rc));
                 }
-
-                LogRel(("VBoxGuestInitDevExt: VBoxGuestSetGuestCapabilities failed, rc=%Rrc\n", rc));
+                else
+                    LogRel(("VBoxGuestInitDevExt: vboxGuestSetFilterMask failed, rc=%Rrc\n", rc));
             }
             else
-                LogRel(("VBoxGuestInitDevExt: vboxGuestSetFilterMask failed, rc=%Rrc\n", rc));
+                LogRel(("VBoxGuestInitDevExt: VBoxReportGuestInfo failed, rc=%Rrc\n", rc));
             VbglGRFree((VMMDevRequestHeader *)pDevExt->pIrqAckEvents);
         }

trunk/src/VBox/Additions/common/VBoxGuest/VBoxHelper.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBoxGuestR0LibMisc - Miscellaneous functions.
+ * VBoxHelper - Miscellaneous functions.
  */
 
@@ -32 +32 @@
 
 
-DECLR0VBGL(int) VbglR0MiscReportGuestInfo(VBOXOSTYPE enmOSType)
+int VBoxReportGuestInfo(VBOXOSTYPE enmOSType)
 {
+    /*
+     * Important: VMMDev *awaits* a VMMDevReportGuestInfo or VMMDevReportGuestInfo2 message
+     *            first in order to accept all other VMMDev messages! Otherwise you'd get
+     *            a VERR_NOT_SUPPORTED error.
+     */
     VMMDevReportGuestInfo2 *pReq = NULL;
     int rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof (VMMDevReportGuestInfo2), VMMDevReq_ReportGuestInfo2);
+    Log(("VBoxReportGuestInfo: VbglGRAlloc VMMDevReportGuestInfo2 completed with rc=%Rrc\n", rc));
     if (RT_SUCCESS(rc))
     {
@@ -46 +52 @@
 
         rc = VbglGRPerform(&pReq->header);
+        Log(("VBoxReportGuestInfo: VbglGRPerform VMMDevReportGuestInfo2 completed with rc=%Rrc\n", rc));
         if (rc == VERR_NOT_IMPLEMENTED) /* Compatibility with older hosts. */
             rc = VINF_SUCCESS;
         VbglGRFree(&pReq->header);
-    }
-
-    /*
-     * Report guest status of the VBox driver to the host.
-     */
-    if (RT_SUCCESS(rc))
-    {
-        VMMDevReportGuestStatus *pReq2;
-        rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq2, sizeof(*pReq2), VMMDevReq_ReportGuestStatus);
-        if (RT_SUCCESS(rc))
-        {
-            pReq2->guestStatus.facility = VBoxGuestStatusFacility_VBoxGuestDriver;
-            pReq2->guestStatus.status = VBoxGuestStatusCurrent_Active; /** @todo Are we actually *really* active at this point? */
-            pReq2->guestStatus.flags = 0;
-            rc = VbglGRPerform(&pReq2->header);
-            if (rc == VERR_NOT_IMPLEMENTED) /* Compatibility with older hosts. */
-                rc = VINF_SUCCESS;
-            VbglGRFree(&pReq2->header);
-        }
     }
 
@@ -78 +66 @@
         VMMDevReportGuestInfo *pReq3 = NULL;
         rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq3, sizeof (VMMDevReportGuestInfo), VMMDevReq_ReportGuestInfo);
+        Log(("VBoxReportGuestInfo: VbglGRAlloc VMMDevReportGuestInfo completed with rc=%Rrc\n", rc));
         if (RT_SUCCESS(rc))
         {
@@ -84 +73 @@
 
             rc = VbglGRPerform(&pReq3->header);
+            Log(("VBoxReportGuestInfo: VbglGRPerform VMMDevReportGuestInfo completed with rc=%Rrc\n", rc));
             VbglGRFree(&pReq3->header);
         }
@@ -91 +81 @@
 }
 
+int VBoxReportGuestDriverStatus(bool fActive)
+{
+    /*
+     * Report guest status of the VBox driver to the host.
+     */
+    VMMDevReportGuestStatus *pReq2 = NULL;
+    int rc = VbglGRAlloc((VMMDevRequestHeader **)&pReq2, sizeof(*pReq2), VMMDevReq_ReportGuestStatus);
+    Log(("VBoxReportGuestDriverStatus: VbglGRAlloc VMMDevReportGuestStatus completed with rc=%Rrc\n", rc));
+    if (RT_SUCCESS(rc))
+    {
+        pReq2->guestStatus.facility = VBoxGuestStatusFacility_VBoxGuestDriver;
+        pReq2->guestStatus.status = fActive ?
+                                    VBoxGuestStatusCurrent_Active
+                                  : VBoxGuestStatusCurrent_Inactive;
+        pReq2->guestStatus.flags = 0;
+        rc = VbglGRPerform(&pReq2->header);
+        Log(("VBoxReportGuestDriverStatus: VbglGRPerform VMMDevReportGuestStatus completed with fActive=%d, rc=%Rrc\n",
+             rc, fActive ? 1 : 0));
+        if (rc == VERR_NOT_IMPLEMENTED) /* Compatibility with older hosts. */
+            rc = VINF_SUCCESS;
+        VbglGRFree(&pReq2->header);
+    }
+
+    return rc;
+}
+

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

@@ -61 +61 @@
         VMMDev.cpp \
         HGCM.cpp \
-        VBoxGuestR0LibMisc.c \
         VBoxGuestR0LibSharedFolders.c \
         VbglR0CanUsePhysPageList.cpp
-
-VBoxGuestR0LibMisc.c_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
-
 
 #
@@ -82 +78 @@
         VMMDev.cpp \
         HGCMInternal.cpp \
-        VbglR0CanUsePhysPageList.cpp \
-        VBoxGuestR0LibMisc.c
+        VbglR0CanUsePhysPageList.cpp
 
 #

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -425 +425 @@
     Log2(("VMMDev request issued: %d\n", requestHeader.requestType));
 
-    if (    requestHeader.requestType != VMMDevReq_ReportGuestInfo
-        && !pThis->fu32AdditionsOk)
+    /* Because VMMDevReq_ReportGuestInfo is sent last in the first information chain
+     * from the guest also check for VMMDevReq_ReportGuestInfo2. */
+    if (    requestHeader.requestType != VMMDevReq_ReportGuestInfo2
+        && (   requestHeader.requestType != VMMDevReq_ReportGuestInfo
+            && !pThis->fu32AdditionsOk))
     {
         Log(("VMMDev: guest has not yet reported to us. Refusing operation.\n"));