diff options
author | Beat Gaetzi <beat@FreeBSD.org> | 2010-06-07 16:31:58 +0000 |
---|---|---|
committer | Beat Gaetzi <beat@FreeBSD.org> | 2010-06-07 16:31:58 +0000 |
commit | 804cd7e3936996911180e902baea92df713587c7 (patch) | |
tree | 7f516d4d0c16046bad2d5edaa61399f4a63dfeb9 /emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp | |
parent | - Update to 3.2.2 (diff) |
- Update to 3.2.2
- Update guest additions to 3.2.2.
- Add option to build with VNC support (Disabled by default)
- Add option to build with VDE support (Disabled by default) [1]
- Add option to build webservice (Disabled by default) [2]
- Fix build with QT4 support disabled and X11 support enabled. [3]
- Fix build with X11 support disabled. [4]
- Replace custom pkg-install.in script with GROUPS framework.
- Do not build Guest Additions in virtualbox-ose port.
- Implement locking/unlocking of host DVD drive. [5]
- Add LICENSE and LICENSE_FILE.
PR: ports/146752 [5]
Submitted by: mtm@ [5]
Requested by: Mario Lobo <lobo AT bsd.com.br> [1],
Hubert Tournier <hubert AT frbsd.org> [2]
Reported by: Emil Mikulic <emil AT dmr.ath.cx> [3], mm@ [4]
Many thanks to the VirtualBox developers (especially Alexander Eichner
for all his work and help), all tester and patch submitter and the whole
vbox@ team especially decke@.
Notes
Notes:
svn path=/head/; revision=256033
Diffstat (limited to 'emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp')
-rw-r--r-- | emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp deleted file mode 100644 index 0a1f735fb79a..000000000000 --- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Frontends-VBoxManage-VBoxInternalManage.cpp +++ /dev/null @@ -1,50 +0,0 @@ -Index: src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp -@@ -54,7 +54,8 @@ - #ifdef RT_OS_WINDOWS - # include <windows.h> - # include <winioctl.h> --#elif defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) -+#elif defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) \ -+ || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) - # include <errno.h> - # include <sys/ioctl.h> - # include <sys/types.h> -@@ -76,6 +77,9 @@ - # include <sys/dkio.h> - # include <sys/vtoc.h> - #endif /* RT_OS_SOLARIS */ -+#ifdef RT_OS_FREEBSD -+# include <sys/disk.h> -+#endif /* RT_OS_FREEBSD */ - - using namespace com; - -@@ -1013,6 +1017,28 @@ - vrc = VERR_INVALID_PARAMETER; - goto out; - } -+#elif defined(RT_OS_FREEBSD) -+ struct stat DevStat; -+ if (!fstat(RawFile, &DevStat) && S_ISCHR(DevStat.st_mode)) -+ { -+ off_t cMediasize = 0; -+ if (!ioctl(RawFile, DIOCGMEDIASIZE, &cMediasize)) -+ { -+ cbSize = cMediasize; -+ } -+ else -+ { -+ vrc = RTErrConvertFromErrno(errno); -+ RTPrintf("Cannot get the block count for file '%s': %Rrc", rawdisk.raw(), vrc); -+ goto out; -+ } -+ } -+ else -+ { -+ RTPrintf("File '%s' is no character device\n", rawdisk.raw()); -+ vrc = VERR_INVALID_PARAMETER; -+ goto out; -+ } - #else /* all unrecognized OSes */ - /* Hopefully this works on all other hosts. If it doesn't, it'll just fail - * creating the VMDK, so no real harm done. */ |