Changeset 35810 in vbox for trunk/src/VBox/VMM

Timestamp:

Feb 1, 2011 1:00:24 PM (14 years ago)

Author:

vboxsync

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

69788

Message:

VMM: Replace most VERR_VERSION_MISMATCH by more specific error statuses. Translating the errors returned by device, driver and USB device constructors into specific ones for the benefit of old extension pack and misc use of the status.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/VMMR0.cpp (modified) (1 diff)
• VMMR3/PDMDevice.cpp (modified) (1 diff)
• VMMR3/PDMDriver.cpp (modified) (1 diff)
• VMMR3/PDMUsb.cpp (modified) (1 diff)
• VMMR3/VM.cpp (modified) (4 diffs)
• VMMRC/VMMRC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -210 +210 @@
         LogRel(("VMMR0InitVM: Revision mismatch, r3=%d r0=%d\n", uSvnRev, VMMGetSvnRev()));
         SUPR0Printf("VMMR0InitVM: Revision mismatch, r3=%d r0=%d\n", uSvnRev, VMMGetSvnRev());
-        return VERR_VERSION_MISMATCH;
+        return VERR_VMM_R0_VERSION_MISMATCH;
     }
     if (    !VALID_PTR(pVM)

trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp

@@ -404 +404 @@
             paDevs[i].pDev->cInstances--;
             /* because we're damn lazy right now, we'll say that the destructor will be called even if the constructor fails. */
-            return rc;
+            return rc == VERR_VERSION_MISMATCH ? VERR_PDM_DEVICE_VERSION_MISMATCH : rc;
         }
     } /* for device instances */

trunk/src/VBox/VMM/VMMR3/PDMDriver.cpp

@@ -508 +508 @@
                     }
                     else
+                    {
                         pdmR3DrvDestroyChain(pNew, PDM_TACH_FLAGS_NO_CALLBACKS);
+                        if (rc == VERR_VERSION_MISMATCH)
+                            rc = VERR_PDM_DRIVER_VERSION_MISMATCH;
+                    }
                 }
                 else

trunk/src/VBox/VMM/VMMR3/PDMUsb.cpp

@@ -637 +637 @@
     }
     else
+    {
         AssertMsgFailed(("Failed to construct '%s'/%d! %Rra\n", pUsbIns->pReg->szName, pUsbIns->iInstance, rc));
+        if (rc == VERR_VERSION_MISMATCH)
+            rc = VERR_PDM_DRIVER_VERSION_MISMATCH;
+    }
     if (fAtRuntime)
         pdmR3UsbDestroyDevice(pVM, pUsbIns);

trunk/src/VBox/VMM/VMMR3/VM.cpp

@@ -269 +269 @@
 
             /*
-             * An error occurred during VM creation. Set the error message directly
-             * using the initial callback, as the callback list doesn't exist yet.
+             * An error occurred during VM creation.  Set the error message directly
+             * using the initial callback, as the callback list might not exist yet.
              */
-            const char *pszError = NULL;
+            const char *pszError;
             switch (rc)
             {
@@ -298 +298 @@
                     pszError = N_("VirtualBox can't enable the AMD-V extension. Please close all other virtualization programs.");
 #endif
-                    break;
-
-                case VERR_VERSION_MISMATCH:
-                    pszError = N_("VMMR0 driver version mismatch:\n"
-                                  "Either there is an older extension package installed which does not "
-                                  "fit to this version of VirtualBox. In that case update the extension "
-                                  "pack. Make sure to terminate all VMs before.\n"
-                                  "Or VirtualBox was recently upgraded and there is still some process "
-                                  "of the older version active. Please terminate all VMs, make sure that "
-                                  "VBoxNetDHCP is not running and try again. If you still get this error, "
-                                  "re-install VirtualBox");
                     break;
 
@@ -350 +339 @@
 
                 default:
-                    pszError = N_("Unknown error creating VM");
+                    if (VMR3GetErrorCountU(pUVM) == 0)
+                        pszError = RTErrGetFull(rc);
+                    else
+                        pszError = NULL; /* already set. */
                     break;
             }
-            vmR3SetErrorU(pUVM, rc, RT_SRC_POS, pszError, rc);
+            if (pszError)
+                vmR3SetErrorU(pUVM, rc, RT_SRC_POS, pszError, rc);
         }
         else
@@ -3652 +3645 @@
 VMMR3DECL(uint32_t) VMR3GetErrorCount(PVM pVM)
 {
-    return pVM->pUVM->vm.s.cErrors;
+    AssertPtrReturn(pVM, 0);
+    return VMR3GetErrorCountU(pVM->pUVM);
+}
+
+
+/**
+ * Gets the number of errors raised via VMSetError.
+ *
+ * This can be used avoid double error messages.
+ *
+ * @returns The error count.
+ * @param   pVM             The VM handle.
+ */
+VMMR3DECL(uint32_t) VMR3GetErrorCountU(PUVM pUVM)
+{
+    AssertPtrReturn(pUVM, 0);
+    AssertReturn(pUVM->u32Magic == UVM_MAGIC, 0);
+    return pUVM->vm.s.cErrors;
 }
 

trunk/src/VBox/VMM/VMMRC/VMMRC.cpp

@@ -73 +73 @@
              */
             if (uArg != VMMGetSvnRev())
-                return VERR_VERSION_MISMATCH;
+                return VERR_VMM_RC_VERSION_MISMATCH;
 
             /*