Changeset 39892 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Jan 26, 2012 8:22:33 PM (13 years ago)

Author:

vboxsync

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

75942

Message:

VMMDev: Allow some more function pointers to be NULL in PDMIVMMDEVCONNECTOR.

File:

• trunk/src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (7 diffs)

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

@@ -533 +533 @@
     strcpy(pThis->guestInfo2.szName, pszName);
 
-    pThis->pDrv->pfnUpdateGuestInfo2(pThis->pDrv, uFullVersion, pszName, pInfo2->additionsRevision, pInfo2->additionsFeatures);
+    if (pThis->pDrv && pThis->pDrv->pfnUpdateGuestInfo2)
+        pThis->pDrv->pfnUpdateGuestInfo2(pThis->pDrv, uFullVersion, pszName, pInfo2->additionsRevision, pInfo2->additionsFeatures);
 
     return VINF_SUCCESS;
@@ -680 +681 @@
     }
 
-    if (pThis->pDrv)
+    if (pThis->pDrv && pThis->pDrv->pfnUpdateGuestStatus)
         pThis->pDrv->pfnUpdateGuestStatus(pThis->pDrv, pStatus->facility, pStatus->status, pStatus->flags, &Now);
 
@@ -808 +809 @@
                         pThis->guestInfo.interfaceVersion,
                         pThis->guestInfo.osType));
-                pThis->pDrv->pfnUpdateGuestInfo(pThis->pDrv, &pThis->guestInfo);
+                if (pThis->pDrv && pThis->pDrv->pfnUpdateGuestInfo)
+                    pThis->pDrv->pfnUpdateGuestInfo(pThis->pDrv, &pThis->guestInfo);
             }
 
@@ -910 +912 @@
                             guestCaps->caps & VMMDEV_GUEST_SUPPORTS_GRAPHICS ? "yes" : "no"));
 
-                    pThis->pDrv->pfnUpdateGuestCapabilities(pThis->pDrv, guestCaps->caps);
+                    if (pThis->pDrv && pThis->pDrv->pfnUpdateGuestCapabilities)
+                        pThis->pDrv->pfnUpdateGuestCapabilities(pThis->pDrv, guestCaps->caps);
                 }
                 pRequestHeader->rc = VINF_SUCCESS;
@@ -941 +944 @@
                         pThis->guestCaps & VMMDEV_GUEST_SUPPORTS_GRAPHICS ? "yes" : "no"));
 
-                pThis->pDrv->pfnUpdateGuestCapabilities(pThis->pDrv, pThis->guestCaps);
+                if (pThis->pDrv && pThis->pDrv->pfnUpdateGuestCapabilities)
+                    pThis->pDrv->pfnUpdateGuestCapabilities(pThis->pDrv, pThis->guestCaps);
                 pRequestHeader->rc = VINF_SUCCESS;
             }
@@ -3015 +3019 @@
         if (pThis->pDrv)
         {
-            if (pThis->guestInfo2.uFullVersion)
+            if (pThis->guestInfo2.uFullVersion && pThis->pDrv->pfnUpdateGuestInfo2)
                 pThis->pDrv->pfnUpdateGuestInfo2(pThis->pDrv, pThis->guestInfo2.uFullVersion, pThis->guestInfo2.szName,
                                                  pThis->guestInfo2.uRevision, pThis->guestInfo2.fFeatures);
-            pThis->pDrv->pfnUpdateGuestInfo(pThis->pDrv, &pThis->guestInfo);
-        }
-
-        for (uint32_t i = 0; i < pThis->cFacilityStatuses; i++) /* ascending order! */
-            if (   pThis->aFacilityStatuses[i].uStatus != VBoxGuestFacilityStatus_Inactive
-                || !pThis->aFacilityStatuses[i].fFixed)
-                pThis->pDrv->pfnUpdateGuestStatus(pThis->pDrv,
-                                                  pThis->aFacilityStatuses[i].uFacility,
-                                                  pThis->aFacilityStatuses[i].uStatus,
-                                                  pThis->aFacilityStatuses[i].fFlags,
-                                                  &pThis->aFacilityStatuses[i].TimeSpecTS);
-    }
-    if (pThis->pDrv)
+            if (pThis->pDrv->pfnUpdateGuestInfo)
+                pThis->pDrv->pfnUpdateGuestInfo(pThis->pDrv, &pThis->guestInfo);
+
+            if (pThis->pDrv->pfnUpdateGuestStatus)
+            {
+                for (uint32_t i = 0; i < pThis->cFacilityStatuses; i++) /* ascending order! */
+                    if (   pThis->aFacilityStatuses[i].uStatus != VBoxGuestFacilityStatus_Inactive
+                        || !pThis->aFacilityStatuses[i].fFixed)
+                        pThis->pDrv->pfnUpdateGuestStatus(pThis->pDrv,
+                                                          pThis->aFacilityStatuses[i].uFacility,
+                                                          pThis->aFacilityStatuses[i].uStatus,
+                                                          pThis->aFacilityStatuses[i].fFlags,
+                                                          &pThis->aFacilityStatuses[i].TimeSpecTS);
+            }
+        }
+    }
+    if (pThis->pDrv && pThis->pDrv->pfnUpdateGuestCapabilities)
         pThis->pDrv->pfnUpdateGuestCapabilities(pThis->pDrv, pThis->guestCaps);
 
@@ -3176 +3184 @@
      * Call the update functions as required.
      */
-    if (fVersionChanged)
+    if (fVersionChanged && pThis->pDrv && pThis->pDrv->pfnUpdateGuestInfo)
         pThis->pDrv->pfnUpdateGuestInfo(pThis->pDrv, &pThis->guestInfo);
-    if (fCapsChanged)
+    if (fCapsChanged    && pThis->pDrv && pThis->pDrv->pfnUpdateGuestCapabilities)
         pThis->pDrv->pfnUpdateGuestCapabilities(pThis->pDrv, pThis->guestCaps);