Changeset 15485 in vbox for trunk/src

Timestamp:

Dec 15, 2008 9:42:39 AM (16 years ago)

Author:

vboxsync

Message:

Storage/iSCSI: back out unwanted checkin, check in the actually relevant file.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (2 diffs)
• HardDisk2Impl.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -875 +875 @@
 #endif
             /* Pass all custom parameters. */
+            bool fHostIP = true;
             SafeArray <BSTR> names;
             SafeArray <BSTR> values;
@@ -890 +891 @@
                         rc = CFGMR3InsertString (pVDC, Utf8Str (names [i]),
                                                  Utf8Str (values [i]));             RC_CHECK();
+                    if (    names [i] == L"HostIPStack"
+                        &&  values [i] == L"0")
+                        fHostIP = false;
+                }
+                /* Custom code: put marker to not use host IP stack to driver
+                 * configuration node. Simplifies life of DrvVD a bit. */
+                if (!fHostIP)
+                {
+                    rc = CFGMR3InsertString (pCfg, "HostIPStack", "0");             RC_CHECK();
                 }
             }

trunk/src/VBox/Main/HardDisk2Impl.cpp

@@ -1313 +1313 @@
 
 STDMETHODIMP HardDisk2::FlattenTo (IHardDisk2 *aTarget, IProgress **aProgress)
-{
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    ReturnComNotImplemented();
-}
-
-STDMETHODIMP HardDisk2::Compact (IProgress **aProgress)
 {
     AutoCaller autoCaller (this);