Changeset 15050 in vbox for trunk/src/VBox/Main/MachineImpl.cpp

Timestamp:

Dec 5, 2008 3:38:31 PM (16 years ago)

Author:

vboxsync

Message:

#3285: Improve error handling API to include unique error numbers
Document

• IMachine::setBootOrder
• IMachine::getBootOrder
• IMachine::attachHardDisk2
• IMachine::getHardDisk2
• IMachine::detachHardDisk2

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (13 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -1808 +1808 @@
 
     if (aDevice == DeviceType_USB)
-        return setError (E_FAIL,
-            tr ("Booting from USB devices is not currently supported"));
+        return setError (E_NOTIMPL,
+            tr ("Booting from USB device is currently not supported"));
 
     AutoCaller autoCaller (this);
@@ -1865 +1865 @@
     {
         if (aChannel < 0 || aChannel > 1)
-            return setError (E_FAIL,
+            return setError (E_INVALIDARG,
                 tr ("Invalid IDE channel: %l (must be in range [0, 1])"),
                 aChannel);
@@ -1872 +1872 @@
         {
             if (aDevice < 0 || aDevice > 1)
-                return setError (E_FAIL,
+                return setError (E_INVALIDARG,
                     tr ("Invalid IDE device slot: %l (must be in range "
                         "[0, 1] for channel 0)"),
@@ -1882 +1882 @@
             /* Device slot 0 is reserved for the CD/DVD drive. */
             if (aDevice != 1)
-                return setError (E_FAIL,
+                return setError (E_INVALIDARG,
                     tr ("Invalid IDE device slot: %l (must be "
                         "1 for channel 1)"),
@@ -1904 +1904 @@
     /// @todo NEWMEDIA implicit machine registration
     if (!mData->mRegistered)
-        return setError (E_FAIL,
+        return setError (VBOX_E_INVALID_OBJECT_STATE,
             tr ("Cannot attach hard disks to an unregistered machine"));
 
@@ -1910 +1910 @@
 
     if (mData->mMachineState >= MachineState_Running)
-        return setError (E_FAIL,
+        return setError (VBOX_E_INVALID_VM_STATE,
             tr ("Invalid machine state: %d"), mData->mMachineState);
 
@@ -1923 +1923 @@
         ComObjPtr <HardDisk2> hd = (*it)->hardDisk();
         AutoReadLock hdLock (hd);
-        return setError (E_FAIL,
+        return setError (VBOX_E_OBJECT_IN_USE,
             tr ("Hard disk '%ls' is already attached to device slot %d on "
                 "channel %d of bus %d of this virtual machine"),
@@ -1946 +1946 @@
             mHDData->mAttachments.end())
     {
-        return setError (E_FAIL,
+        return setError (VBOX_E_OBJECT_IN_USE,
             tr ("Hard disk '%ls' is already attached to this virtual machine"),
             hd->locationFull().raw());
@@ -2189 +2189 @@
                                     LONG aDevice, IHardDisk2 **aHardDisk)
 {
-    if (aBus == StorageBus_Null)
-        return E_INVALIDARG;
+    CheckComArgExpr(aBus, aBus != StorageBus_Null);
+    CheckComArgOutPointerValid(aHardDisk);
 
     AutoCaller autoCaller (this);
@@ -2205 +2205 @@
 
     if (it == mHDData->mAttachments.end())
-        return setError (E_INVALIDARG,
+        return setError (VBOX_E_OBJECT_NOT_FOUND,
             tr ("No hard disk attached to device slot %d on channel %d of bus %d"),
             aDevice, aChannel, aBus);
@@ -2217 +2217 @@
                                        LONG aDevice)
 {
-    if (aBus == StorageBus_Null)
-        return E_INVALIDARG;
+    CheckComArgExpr(aBus, aBus != StorageBus_Null);
 
     AutoCaller autoCaller (this);
@@ -2231 +2230 @@
 
     if (mData->mMachineState >= MachineState_Running)
-        return setError (E_FAIL,
+        return setError (VBOX_E_INVALID_VM_STATE,
             tr ("Invalid machine state: %d"), mData->mMachineState);
 
@@ -2240 +2239 @@
 
     if (it == mHDData->mAttachments.end())
-        return setError (E_INVALIDARG,
+        return setError (VBOX_E_OBJECT_NOT_FOUND,
             tr ("No hard disk attached to device slot %d on channel %d of bus %d"),
             aDevice, aChannel, aBus);