儲存庫 vbox 的更動 18224

時間撮記:

2009-3-24 下午07:46:12 (16 年 以前)

作者:

vboxsync

訊息:

VBoxHeadless: don't ignore the return code of RTR3InitAndSUPLib() (non-hardened builds)

檔案:

• trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (修改) (4 筆差異)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -44 +44 @@
 #include <iprt/getopt.h>
 #include <iprt/env.h>
+#include <VBox/err.h>
 
 #ifdef VBOX_FFMPEG
@@ -630 +631 @@
     if (FAILED(rc))
     {
-        RTPrintf("ERROR: failed to initialize COM!\n");
+        RTPrintf("VBoxHeadless: ERROR: failed to initialize COM!\n");
         return rc;
     }
@@ -641 +642 @@
         rc = virtualBox.createLocalObject(CLSID_VirtualBox);
         if (FAILED(rc))
-            RTPrintf("ERROR: failed to create the VirtualBox object!\n");
+            RTPrintf("VBoxHeadless: ERROR: failed to create the VirtualBox object!\n");
         else
         {
             rc = session.createInprocObject(CLSID_Session);
             if (FAILED(rc))
-                RTPrintf("ERROR: failed to create a session object!\n");
+                RTPrintf("VBoxHeadless: ERROR: failed to create a session object!\n");
         }
 
@@ -959 +960 @@
 {
     // initialize VBox Runtime
-    RTR3InitAndSUPLib();
+    int rc = RTR3InitAndSUPLib();
+    if (RT_FAILURE(rc))
+    {
+        RTPrintf("VBoxHeadless: Runtime Error!\n");
+        switch (rc)
+        {
+            case VERR_VM_DRIVER_NOT_INSTALLED:
+                RTPrintf("Cannot access the kernel driver. Make sure the kernel module has been \n"
+                        "loaded successfully. Aborting ...\n");
+                break;
+            default:
+                break;
+        }
+        return 1;
+    }
+
     return TrustedMain (argc, argv, envp);
 }