Changeset 35284 in vbox for trunk/src/VBox

Timestamp:

Dec 21, 2010 8:49:53 PM (14 years ago)

Author:

vboxsync

Message:

introduced VBOX_WITH_S3

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (3 diffs)
• ApplianceImplExport.cpp (modified) (2 diffs)
• ApplianceImplImport.cpp (modified) (4 diffs)
• Makefile.kmk (modified) (1 diff)
• VFSExplorerImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -932 +932 @@
                 taskrc = pAppliance->readFS(task.get());
             else if (task->locInfo.storageType == VFSType_S3)
+#ifdef VBOX_WITH_S3
                 taskrc = pAppliance->readS3(task.get());
+#else
+                taskrc = VERR_NOT_IMPLEMENTED;
+#endif
         break;
 
@@ -939 +943 @@
                 taskrc = pAppliance->importFS(task.get());
             else if (task->locInfo.storageType == VFSType_S3)
+#ifdef VBOX_WITH_S3
                 taskrc = pAppliance->importS3(task.get());
+#else
+                taskrc = VERR_NOT_IMPLEMENTED;
+#endif
         break;
 
@@ -946 +954 @@
                 taskrc = pAppliance->writeFS(task.get());
             else if (task->locInfo.storageType == VFSType_S3)
+#ifdef VBOX_WITH_S3
                 taskrc = pAppliance->writeS3(task.get());
+#else
+                taskrc = VERR_NOT_IMPLEMENTED;
+#endif
         break;
     }

trunk/src/VBox/Main/ApplianceImplExport.cpp

@@ -1906 +1906 @@
 }
 
+#ifdef VBOX_WITH_S3
 /**
  * Worker code for writing out OVF to the cloud. This is called from Appliance::taskThreadWriteOVF()
@@ -2076 +2077 @@
     return rc;
 }
-
+#endif /* VBOX_WITH_S3 */

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -952 +952 @@
 }
 
+#ifdef VBOX_WITH_S3
 /**
  * Worker code for reading OVF from the cloud. This is called from Appliance::taskThreadImportOrExport()
@@ -1078 +1079 @@
     return rc;
 }
+#endif /* VBOX_WITH_S3 */
 
 /*******************************************************************************
@@ -1385 +1387 @@
 }
 
+#ifdef VBOX_WITH_S3
 /**
  * Worker code for importing OVF from the cloud. This is called from Appliance::taskThreadImportOrExport()
@@ -1575 +1578 @@
     return rc;
 }
+#endif /* VBOX_WITH_S3 */
 
 HRESULT Appliance::readManifestFile(const Utf8Str &strFile, void **ppvBuf, size_t *pcbSize, PVDINTERFACEIO pCallbacks, PSHA1STORAGE pStorage)

trunk/src/VBox/Main/Makefile.kmk

@@ -228 +228 @@
         $(if $(VBOX_WITH_LIVE_MIGRATION),VBOX_WITH_LIVE_MIGRATION,) \
         $(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
-        $(if $(VBOX_WITH_VUSB),VBOX_WITH_VUSB,)
+        $(if $(VBOX_WITH_VUSB),VBOX_WITH_VUSB,) \
+        $(if $(VBOX_WITH_S3),VBOX_WITH_S3,)
 ifdef VBOX_WITH_USB
  VBoxSVC_DEFS += \

trunk/src/VBox/Main/VFSExplorerImpl.cpp

@@ -226 +226 @@
                 rc = pVFSExplorer->updateFS(task.get());
             else if (pVFSExplorer->m->storageType == VFSType_S3)
+#ifdef VBOX_WITH_S3
                 rc = pVFSExplorer->updateS3(task.get());
+#else
+                rc = VERR_NOT_IMPLEMENTED;
+#endif
             break;
         }
@@ -234 +238 @@
                 rc = pVFSExplorer->deleteFS(task.get());
             else if (pVFSExplorer->m->storageType == VFSType_S3)
+#ifdef VBOX_WITH_S3
                 rc = pVFSExplorer->deleteS3(task.get());
+#else
+                rc = VERR_NOT_IMPLEMENTED;
+#endif
             break;
         }
@@ -402 +410 @@
 }
 
+#ifdef VBOX_WITH_S3
 HRESULT VFSExplorer::updateS3(TaskVFSExplorer *aTask)
 {
@@ -532 +541 @@
     return VINF_SUCCESS;
 }
+#endif /* VBOX_WITH_S3 */
 
 STDMETHODIMP VFSExplorer::Update(IProgress **aProgress)