Changeset 20928 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

Jun 25, 2009 11:53:37 AM (15 years ago)

Author:

vboxsync

Message:

API/others: Renamed IConsole::discardSavedState to IConsole::forgetSavedState, added parameter. Deleted old IConsole::powerDown, renamed IConsole::powerDownAsync to IConsole::powerDown (as promised for 2.1). Implemented perl sample code for registering a hard disk. Cleaned up constant formatting in the API docs. Updated SDK changelog. Renamed com/errorprint2.h to com/errorprint.h, added a few assertion variants. Eliminated com/errorprint_legacy.h. Adjusted all files using the affected headers and APIs. Renamed tstHeadless2 to tstHeadless.

Location:

trunk/src/VBox/Frontends/VBoxHeadless

Files:

• VBoxHeadless.cpp (modified) (2 diffs)
• testcase/Makefile.kmk (modified) (2 diffs)
• testcase/tstHeadless.cpp (modified) (6 diffs)

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
 #include <VBox/com/Guid.h>
 #include <VBox/com/ErrorInfo.h>
-#include <VBox/com/errorprint2.h>
+#include <VBox/com/errorprint.h>
 #include <VBox/com/EventQueue.h>
 

trunk/src/VBox/Frontends/VBoxHeadless/testcase/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2007 Sun Microsystems, Inc.
+# Copyright (C) 2006-2009 Sun Microsystems, Inc.
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -24 +24 @@
 
 ifdef VBOX_WITH_TESTCASES
- PROGRAMS += tstHeadless2
- tstHeadless2_TEMPLATE = VBOXMAINCLIENTEXE
- tstHeadless2_SOURCES  = tstHeadless.cpp
+ PROGRAMS += tstHeadless
+ tstHeadless_TEMPLATE = VBOXMAINCLIENTEXE
+ tstHeadless_SOURCES  = tstHeadless.cpp
 endif
 

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
 #include <VBox/com/Guid.h>
 #include <VBox/com/ErrorInfo.h>
-#include <VBox/com/errorprint_legacy.h>
+#include <VBox/com/errorprint.h>
 #include <VBox/com/EventQueue.h>
 
@@ -75 +75 @@
     HRESULT rc;
 
-    CHECK_RC_RET (com::Initialize());
+    rc = com::Initialize();
+    if (FAILED(rc))
+    {
+        RTPrintf("ERROR: failed to initialize COM!\n");
+        return rc;
+    }
 
     do
@@ -83 +88 @@
 
         RTPrintf ("Creating VirtualBox object...\n");
-        CHECK_ERROR_NI_BREAK (virtualBox.createLocalObject (CLSID_VirtualBox));
-
-        RTPrintf ("Creating Session object...\n");
-        CHECK_ERROR_NI_BREAK (session.createInprocObject (CLSID_Session));
+        rc = virtualBox.createLocalObject (CLSID_VirtualBox);
+        if (FAILED(rc))
+            RTPrintf("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");
+        }
+
+        if (FAILED (rc))
+        {
+            com::ErrorInfo info;
+            if (!info.isFullAvailable() && !info.isBasicAvailable())
+            {
+                com::GluePrintRCMessage(rc);
+                RTPrintf("Most likely, the VirtualBox COM server is not running or failed to start.\n");
+            }
+            else
+                com::GluePrintErrorInfo(info);
+            break;
+        }
 
         // create the event queue
@@ -124 +147 @@
                                    COMGETTER(ErrorInfo) (errorInfo.asOutParam()));
                 ErrorInfo info (errorInfo);
-                PRINT_ERROR_INFO (info);
+                com::GluePrintErrorInfo(info);
             }
             else
@@ -141 +164 @@
             if (!strcmp (operation, "off"))
             {
+                ComPtr <IProgress> progress;
                 RTPrintf ("Powering the VM off...\n");
-                CHECK_ERROR_BREAK (console, PowerDown());
+                CHECK_ERROR_BREAK (console, PowerDown(progress.asOutParam()));
+
+                RTPrintf ("Waiting for the VM to power down...\n");
+                CHECK_ERROR_BREAK (progress, WaitForCompletion (-1));
+
+                BOOL completed;
+                CHECK_ERROR_BREAK (progress, COMGETTER(Completed) (&completed));
+                ASSERT (completed);
+
+                LONG resultCode;
+                CHECK_ERROR_BREAK (progress, COMGETTER(ResultCode) (&resultCode));
+                if (FAILED (resultCode))
+                {
+                    ComPtr <IVirtualBoxErrorInfo> errorInfo;
+                    CHECK_ERROR_BREAK (progress,
+                                       COMGETTER(ErrorInfo) (errorInfo.asOutParam()));
+                    ErrorInfo info (errorInfo);
+                    com::GluePrintErrorInfo(info);
+                }
+                else
+                {
+                    RTPrintf ("VM is powered down.\n");
+                }
             }
             else