Changeset 65049 in vbox for trunk

Timestamp:

Jan 2, 2017 9:01:46 AM (8 years ago)

Author:

vboxsync

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

112544

Message:

bugref:8527: some coding style fixes and introduced VBOX_WITH_UNATTENDED

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManage.h (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (2 diffs)
• src/VBox/Main/Makefile.kmk (modified) (2 diffs)
• src/VBox/Main/include/MachineImpl.h (modified) (3 diffs)
• src/VBox/Main/src-server/MachineImpl.cpp (modified) (6 diffs)

trunk/Config.kmk

@@ -522 +522 @@
  VBOX_WITH_DEVMAPPER = 1
 endif
+# Enable unattended installation API
+VBOX_WITH_UNATTENDED = 1
 # Enable BusLogic SCSI host adapter
 VBOX_WITH_BUSLOGIC = 1
@@ -1120 +1122 @@
  VBOX_WITH_PCI_PASSTHROUGH_IMPL=
  VBOX_WITH_OS2_ADDITIONS_BIN=
+ # not yet
+ VBOX_WITH_UNATTENDED=
  VBOX_WITH_SECURELABEL=
  VBOX_WITH_KCHMVIEWER=

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -330 +330 @@
 
 #endif /* !___H_VBOXMANAGE */
-

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -1327 +1327 @@
     Utf8Str installedOSStr(installedOSBSTR);
 
-    do{
+    do {
         RTPrintf("Start unattended installation OS %s on virtual machine '%ls'.\n"
                  "UUID: %s\n",
@@ -1338 +1338 @@
         CHECK_ERROR_BREAK(unAttended, COMSETTER(Group)(group.raw()));
 
-        if(installedOSStr.contains("Windows") && productKey.isEmpty())
+        if (installedOSStr.contains("Windows") && productKey.isEmpty())
         {
             return errorSyntax(USAGE_UNATTENDEDINSTALL, "Product key has been missed.");

trunk/src/VBox/Main/Makefile.kmk

@@ -295 +295 @@
         $(if $(VBOX_WITH_LINUX_COMPILER_H),VBOX_WITH_LINUX_COMPILER_H,) \
         $(if $(VBOX_WITH_RESOURCE_USAGE_API),VBOX_WITH_RESOURCE_USAGE_API,) \
+        $(if $(VBOX_WITH_UNATTENDED),VBOX_WITH_UNATTENDED,) \
         $(if $(VBOX_WITH_PDM_ASYNC_COMPLETION),VBOX_WITH_PDM_ASYNC_COMPLETION,) \
         $(if $(VBOX_WITH_DBUS),VBOX_WITH_DBUS,) \
@@ -414 +415 @@
         src-server/SystemPropertiesImpl.cpp \
         src-server/TokenImpl.cpp \
-        src-server/UnattendedImpl.cpp \
-        src-server/UnattendedInstaller.cpp \
-        src-server/UnattendedScript.cpp \
-        src-server/UnattendedHelper.cpp \
+        src-server/$(if $(VBOX_WITH_UNATTENDED),UnattendedImpl.cpp,) \
+        src-server/$(if $(VBOX_WITH_UNATTENDED),UnattendedInstaller.cpp,) \
+        src-server/$(if $(VBOX_WITH_UNATTENDED),UnattendedScript.cpp,) \
+        src-server/$(if $(VBOX_WITH_UNATTENDED),UnattendedHelper.cpp,) \
         src-server/USBControllerImpl.cpp \
         src-server/USBDeviceFiltersImpl.cpp \

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

@@ -37 +37 @@
 #include "BandwidthGroupImpl.h"
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
-#include "Performance.h"
-#include "PerformanceImpl.h"
-#include "ThreadTask.h"
-#include "UnattendedImpl.h"
-
-#endif /* VBOX_WITH_RESOURCE_USAGE_API */
+# include "Performance.h"
+# include "PerformanceImpl.h"
+# include "ThreadTask.h"
+#endif
+#ifdef VBOX_WITH_UNATTENDED
+# include "UnattendedImpl.h"
+#endif
 
 // generated header
@@ -774 +775 @@
     const ComObjPtr<BIOSSettings>      mBIOSSettings;
     const ComObjPtr<BandwidthControl>  mBandwidthControl;
-    const ComObjPtr<Unattended>       mUnattended;
+#ifdef VBOX_WITH_UNATTENDED
+    const ComObjPtr<Unattended>        mUnattended;
+#endif
 
     typedef std::vector<ComObjPtr<NetworkAdapter> > NetworkAdapterVector;
@@ -785 +788 @@
     Backupable<USBControllerList>      mUSBControllers;
 
-    uint64_t                        uRegistryNeedsSaving;
+    uint64_t                           uRegistryNeedsSaving;
 
     /**

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -7163 +7163 @@
 HRESULT Machine::getUnattended(ComPtr<IUnattended> &aUnattended)
 {
+#ifdef VBOX_WITH_UNATTENDED
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -7168 +7169 @@
 
     return S_OK;
+#else
+    NOREF(aUnattended);
+    return E_NOTIMPL;
+#endif
 }
 
@@ -8395 +8400 @@
     mBandwidthControl->init(this);
 
+#ifdef VBOX_WITH_UNATTENDED
     /* create the unattended object (always present) */
     unconst(mUnattended).createObject();
     mUnattended->init(this);
+#endif
 
     return S_OK;
@@ -8476 +8483 @@
     }
 
+#ifdef VBOX_WITH_UNATTENDED
     if (mUnattended)
     {
@@ -8481 +8489 @@
         unconst(mUnattended).setNull();
     }
+#endif
 
     /* Deassociate media (only when a real Machine or a SnapshotMachine
@@ -12529 +12538 @@
     mBandwidthControl->init(this, aMachine->mBandwidthControl);
 
+#ifdef VBOX_WITH_UNATTENDED
     /* create another unattended object that will be mutable */
     unconst(mUnattended).createObject();
     mUnattended->init(this, aMachine->mUnattended);
+#endif
 
     /* default is to delete saved state on Saved -> PoweredOff transition */