Changeset 29224 in vbox for trunk/src/VBox/Main/include

Timestamp:

May 7, 2010 3:49:10 PM (15 years ago)

Author:

vboxsync

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

61305

Message:

Main: turn ISO not found error into warning to allow restoring VMs with inaccessible ISOs

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (1 diff)
• MediumImpl.h (modified) (1 diff)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -438 +438 @@
     static DECLCALLBACK(int) configConstructor(PVM pVM, void *pvConsole);
 
-    static int configMediumAttachment(PCFGMNODE pCtlInst,
-                                      const char *pcszDevice,
-                                      unsigned uInstance,
-                                      StorageBus_T enmBus,
-                                      IoBackendType_T enmIoBackend,
-                                      bool fSetupMerge, unsigned uMergeSource,
-                                      unsigned uMergeTarget,
-                                      IMediumAttachment *pMediumAtt,
-                                      MachineState_T aMachineState,
-                                      HRESULT *phrc, bool fAttachDetach,
-                                      bool fForceUnmount, PVM pVM,
-                                      DeviceType_T *paLedDevType);
-    static int configMedium(PCFGMNODE pLunL0, bool fPassthrough,
-                            DeviceType_T enmType, IoBackendType_T enmIoBackend,
-                            bool fSetupMerge, unsigned uMergeSource,
-                            unsigned uMergeTarget, IMedium *pMedium,
-                            MachineState_T aMachineState, HRESULT *phrc);
-    static DECLCALLBACK(int) reconfigureMediumAttachment(PVM pVM,
+    int configMediumAttachment(PCFGMNODE pCtlInst,
+                               const char *pcszDevice,
+                               unsigned uInstance,
+                               StorageBus_T enmBus,
+                               IoBackendType_T enmIoBackend,
+                               bool fSetupMerge,
+                               unsigned uMergeSource,
+                               unsigned uMergeTarget,
+                               IMediumAttachment *pMediumAtt,
+                               MachineState_T aMachineState,
+                               HRESULT *phrc,
+                               bool fAttachDetach,
+                               bool fForceUnmount,
+                               PVM pVM,
+                               DeviceType_T *paLedDevType);
+    int configMedium(PCFGMNODE pLunL0,
+                     bool fPassthrough,
+                     DeviceType_T enmType,
+                     IoBackendType_T enmIoBackend,
+                     bool fSetupMerge,
+                     unsigned uMergeSource,
+                     unsigned uMergeTarget,
+                     IMedium *pMedium,
+                     MachineState_T aMachineState,
+                     HRESULT *phrc);
+    static DECLCALLBACK(int) reconfigureMediumAttachment(Console *pConsole,
+                                                         PVM pVM,
                                                          const char *pcszDevice,
                                                          unsigned uInstance,

trunk/src/VBox/Main/include/MediumImpl.h

@@ -188 +188 @@
     HRESULT compareLocationTo(const char *aLocation, int &aResult);
 
-    HRESULT createMediumLockList(bool fMediumWritable, Medium *pToBeParent, MediumLockList &mediumLockList);
+    HRESULT createMediumLockList(bool fFailIfInaccessible,
+                                 bool fMediumWritable,
+                                 Medium *pToBeParent,
+                                 MediumLockList &mediumLockList);
 
     HRESULT createDiffStorage(ComObjPtr<Medium> &aTarget,