diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-03-28 23:35:31 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-03-28 23:35:31 +0000 |
| commit | 5470a075ae2d397bc76901eac95732f987ef93a2 (patch) | |
| tree | 6dc3fbdd44cfda15522541dbca53afb4772b18d8 /emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-MachineImpl.cpp | |
| parent | - Stage support (diff) | |
- Update to 4.3.10.
- Build with base C/C++ compiler, i.e., clang on 10.0+, as much as we can
to remove GCC run-time dependency and to reduce possible C++ ABI conflicts.
Diffstat (limited to 'emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-MachineImpl.cpp')
| -rw-r--r-- | emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-MachineImpl.cpp | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-MachineImpl.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-MachineImpl.cpp new file mode 100644 index 000000000000..aeb572ebfb2b --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-MachineImpl.cpp @@ -0,0 +1,47 @@ +--- src/VBox/Main/src-server/MachineImpl.cpp.orig 2013-12-18 11:10:25.000000000 -0500 ++++ src/VBox/Main/src-server/MachineImpl.cpp 2014-02-20 19:17:10.000000000 -0500 +@@ -2374,7 +2374,7 @@ + case 0x8: + case 0x9: + case 0xA: +- AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xB); ++ // AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xB); + AssertRelease(aId < RT_ELEMENTS(mHWData->mCpuIdStdLeafs)); + setModified(IsModified_MachineData); + mHWData.backup(); +@@ -2396,7 +2396,7 @@ + case 0x80000008: + case 0x80000009: + case 0x8000000A: +- AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xB); ++ // AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xB); + AssertRelease(aId - 0x80000000 < RT_ELEMENTS(mHWData->mCpuIdExtLeafs)); + setModified(IsModified_MachineData); + mHWData.backup(); +@@ -2436,7 +2436,7 @@ + case 0x8: + case 0x9: + case 0xA: +- AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xB); ++ // AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xB); + AssertRelease(aId < RT_ELEMENTS(mHWData->mCpuIdStdLeafs)); + setModified(IsModified_MachineData); + mHWData.backup(); +@@ -2455,7 +2455,7 @@ + case 0x80000008: + case 0x80000009: + case 0x8000000A: +- AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xB); ++ // AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xB); + AssertRelease(aId - 0x80000000 < RT_ELEMENTS(mHWData->mCpuIdExtLeafs)); + setModified(IsModified_MachineData); + mHWData.backup(); +@@ -9322,7 +9322,7 @@ + mHWData->mVideoCaptureEnabled = data.fVideoCaptureEnabled; + for (unsigned i = 0; i < RT_ELEMENTS(mHWData->maVideoCaptureScreens); i++) + mHWData->maVideoCaptureScreens[i] = ASMBitTest(&data.u64VideoCaptureScreens, i); +- AssertCompile(RT_ELEMENTS(mHWData->maVideoCaptureScreens) == sizeof(data.u64VideoCaptureScreens) * 8); ++ // AssertCompile(RT_ELEMENTS(mHWData->maVideoCaptureScreens) == sizeof(data.u64VideoCaptureScreens) * 8); + mHWData->mVideoCaptureRate = data.ulVideoCaptureRate; + mHWData->mVideoCaptureFPS = data.ulVideoCaptureFPS; + if (!data.strVideoCaptureFile.isEmpty()) |