Changeset 15533 in vbox for trunk/src/VBox

Timestamp:

Dec 15, 2008 7:02:36 PM (16 years ago)

Author:

vboxsync

Message:

Main: rip out obsolete TAPFileDescriptor, TAPSetupApplication, TAPTerminateApplication attributes; plus subsequent VBoxSDL changes

Location:

trunk/src/VBox

Files:

• Frontends/VBoxSDL/VBoxSDL.cpp (modified) (4 diffs)
• Main/idl/VirtualBox.xidl (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -671 +671 @@
              "  -termacpi                Send an ACPI power button event when closing the window\n"
 #if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) /** @todo UNIXISH_TAP stuff out of main and up to Config.kmk! */
-             "  -tapdev<1-N> <dev>       Use existing persistent TAP device with the given name\n"
-             "  -tapfd<1-N> <fd>         Use existing TAP device, don't allocate\n"
              "  -evdevkeymap             Use evdev keycode map\n"
 #endif
@@ -1197 +1195 @@
     sysInfo->COMGETTER (NetworkAdapterCount) (&NetworkAdapterCount);
 
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
-    std::vector <Bstr> tapdev (NetworkAdapterCount);
-    std::vector <int> tapfd (NetworkAdapterCount, 0);
-#endif
-
     ConvertSettings fConvertSettings = ConvertSettings_No;
 
@@ -1426 +1419 @@
         }
 #endif /* RT_OS_LINUX  */
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
-        else if (strncmp(argv[curArg], "-tapdev", 7) == 0)
-        {
-            ULONG n = 0;
-            if (!argv[curArg][7] || ((n = strtoul(&argv[curArg][7], NULL, 10)) < 1) ||
-                (n > NetworkAdapterCount) || (argc <= (curArg + 1)))
-            {
-                RTPrintf("Error: invalid TAP device option!\n");
-                rc = E_FAIL;
-                break;
-            }
-            tapdev[n - 1] = argv[curArg + 1];
-            curArg++;
-        }
-        else if (strncmp(argv[curArg], "-tapfd", 6) == 0)
-        {
-            ULONG n = 0;
-            if (!argv[curArg][6] || ((n = strtoul(&argv[curArg][6], NULL, 10)) < 1) ||
-                (n > NetworkAdapterCount) || (argc <= (curArg + 1)))
-            {
-                RTPrintf("Error: invalid TAP file descriptor option!\n");
-                rc = E_FAIL;
-                break;
-            }
-            tapfd[n - 1] = atoi(argv[curArg + 1]);
-            curArg++;
-        }
-#endif /* RT_OS_LINUX || RT_OS_DARWIN */
 #ifdef VBOX_WITH_VRDP
         else if (strcmp(argv[curArg], "-vrdp") == 0)
@@ -2020 +1985 @@
     // until we've tried to to start the VM, ignore power off events
     consoleCallback->ignorePowerOffEvents(true);
-
-#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
-    /*
-     * Do we have a TAP device name or file descriptor? If so, communicate
-     * it to the network adapter so that it doesn't allocate a new one
-     * in case TAP is already configured.
-     */
-    {
-        ComPtr<INetworkAdapter> networkAdapter;
-        for (ULONG i = 0; i < NetworkAdapterCount; i++)
-        {
-            if (tapdev[i] || tapfd[i])
-            {
-                gMachine->GetNetworkAdapter(i, networkAdapter.asOutParam());
-                if (networkAdapter)
-                {
-                    NetworkAttachmentType_T attachmentType;
-                    networkAdapter->COMGETTER(AttachmentType)(&attachmentType);
-                    if (attachmentType == NetworkAttachmentType_HostInterface)
-                    {
-                        if (tapdev[i])
-                            networkAdapter->COMSETTER(HostInterface)(tapdev[i]);
-                        else
-                            networkAdapter->COMSETTER(TAPFileDescriptor)(tapfd[i]);
-                    }
-                    else
-                    {
-                        RTPrintf("Warning: network adapter %d is not configured for TAP. Command ignored!\n", i + 1);
-                    }
-                }
-                else
-                {
-                    /* warning */
-                    RTPrintf("Warning: network adapter %d not defined. Command ignored!\n", i + 1);
-                }
-            }
-        }
-    }
-#endif /* RT_OS_LINUX || RT_OS_DARWIN */
 
 #ifdef VBOX_WITH_VRDP

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -9733 +9733 @@
     </attribute>
 
-<if target="xpidl">
-    <attribute name="TAPFileDescriptor" type="long">
-      <desc>
-        File descriptor of the TAP device. It can either be setup by the caller
-        which has to supply an existing valid file handle allocated in the parent
-        process of the VM process or allocated by VirtualBox. The value is -1 if it
-        has not been defined. This property is non persistent, i.e. it will not be
-        stored in the VM's configuration data and thus has to be set at each startup.
-      </desc>
-    </attribute>
-    <attribute name="TAPSetupApplication" type="wstring">
-      <desc>
-        Application to start to configure the TAP device.
-        It is being passed two parameters, 1) the file handle (as ASCII),
-        2) the TAP device name if it is available.
-      </desc>
-    </attribute>
-    <attribute name="TAPTerminateApplication" type="wstring">
-      <desc>
-        Application to start before closing a TAP device.
-        It is being passed two parameters, 1) the file handle (as ASCII),
-        2) the TAP device name if it is available.
-      </desc>
-    </attribute>
-</if>
-
     <attribute name="internalNetwork" type="wstring">
       <desc>