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

Timestamp:

Dec 19, 2008 6:28:27 PM (16 years ago)

Author:

vboxsync

Message:

Main: #3424: Bumped XML format version to 1.6 and so that the auto-converter will delete old <HostInterface> nodes containing TAPSetup/TAPTerminate attributes. Removed all (obsolete) sections of code in #ifdef VBOX_WITH_UNIXY_TAP_NETWORKING (that uses these attributes); removed the define itself.

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (2 diffs)
• NetworkAdapterImpl.h (modified) (4 diffs)
• VirtualBoxXMLUtil.h (modified) (1 diff)

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

@@ -71 +71 @@
             return setError (E_ACCESSDENIED, tr ("The console is not powered up")); \
     } while (0)
-
-/** @def VBOX_WITH_UNIXY_TAP_NETWORKING
- *  Unixy style TAP networking. This is defined in the Makefile since it's also
- *  used by NetworkAdapterImpl.h/cpp.
- */
-#ifdef __DOXYGEN__
-# define VBOX_WITH_UNIXY_TAP_NETWORKING
-#endif
 
 // Console
@@ -553 +545 @@
     PPDMLED     mapSharedFolderLed;
     PPDMLED     mapUSBLed[2];
-#ifdef VBOX_WITH_UNIXY_TAP_NETWORKING
-    Utf8Str     maTAPDeviceName[8];
-    RTFILE      maTapFD[8];
-#endif
 
     bool mVMStateChangeCallbackDisabled;

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

@@ -45 +45 @@
             , mAttachmentType (NetworkAttachmentType_Null)
             ,  mCableConnected (TRUE), mLineSpeed (0), mTraceEnabled (FALSE)
-#ifndef VBOX_WITH_UNIXY_TAP_NETWORKING
-            , mHostInterface ("") // cannot be null
-#else
-            , mTAPFD (NIL_RTFILE)
-#endif
+            , mHostInterface ("") /* cannot be null */
         {}
 
@@ -63 +59 @@
                     mTraceEnabled == that.mTraceEnabled &&
                     mHostInterface == that.mHostInterface &&
-#ifdef VBOX_WITH_UNIXY_TAP_NETWORKING
-                    mTAPSetupApplication == that.mTAPSetupApplication &&
-                    mTAPTerminateApplication == that.mTAPTerminateApplication &&
-                    mTAPFD == that.mTAPFD &&
-#endif
                     mInternalNetwork == that.mInternalNetwork &&
                     mNATNetwork == that.mNATNetwork);
@@ -82 +73 @@
         Bstr mTraceFile;
         Bstr mHostInterface;
-#ifdef VBOX_WITH_UNIXY_TAP_NETWORKING
-        Bstr mTAPSetupApplication;
-        Bstr mTAPTerminateApplication;
-        RTFILE mTAPFD;
-#endif
         Bstr mInternalNetwork;
         Bstr mNATNetwork;
@@ -126 +112 @@
     STDMETHOD(COMGETTER(HostInterface)) (BSTR *aHostInterface);
     STDMETHOD(COMSETTER(HostInterface)) (IN_BSTR aHostInterface);
-#ifdef VBOX_WITH_UNIXY_TAP_NETWORKING
-    STDMETHOD(COMGETTER(TAPFileDescriptor)) (LONG *aTAPFileDescriptor);
-    STDMETHOD(COMSETTER(TAPFileDescriptor)) (LONG aTAPFileDescriptor);
-    STDMETHOD(COMGETTER(TAPSetupApplication)) (BSTR *aTAPSetupApplication);
-    STDMETHOD(COMSETTER(TAPSetupApplication)) (IN_BSTR aTAPSetupApplication);
-    STDMETHOD(COMGETTER(TAPTerminateApplication)) (BSTR *aTAPTerminateApplication);
-    STDMETHOD(COMSETTER(TAPTerminateApplication)) (IN_BSTR aTAPTerminateApplication);
-#endif
     STDMETHOD(COMGETTER(InternalNetwork)) (BSTR *aInternalNetwork);
     STDMETHOD(COMSETTER(InternalNetwork)) (IN_BSTR aInternalNetwork);

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

@@ -29 +29 @@
 
 /** VirtualBox XML settings version number substring ("x.y")  */
-#define VBOX_XML_VERSION        "1.5"
+#define VBOX_XML_VERSION        "1.6"
 
 /** VirtualBox XML settings version platform substring */