diff options
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 | 24 |
1 files changed, 12 insertions, 12 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 index aeb572ebfb2b..55bc1d9b182b 100644 --- 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 @@ -1,44 +1,44 @@ ---- 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 @@ +--- src/VBox/Main/src-server/MachineImpl.cpp.orig 2015-04-01 12:15:13.000000000 -0400 ++++ src/VBox/Main/src-server/MachineImpl.cpp 2015-04-01 16:11:54.601620000 -0400 +@@ -2299,7 +2299,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); + i_setModified(IsModified_MachineData); mHWData.backup(); -@@ -2396,7 +2396,7 @@ +@@ -2321,7 +2321,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); + i_setModified(IsModified_MachineData); mHWData.backup(); -@@ -2436,7 +2436,7 @@ +@@ -2358,7 +2358,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); + i_setModified(IsModified_MachineData); mHWData.backup(); -@@ -2455,7 +2455,7 @@ +@@ -2377,7 +2377,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); + i_setModified(IsModified_MachineData); mHWData.backup(); -@@ -9322,7 +9322,7 @@ +@@ -8790,7 +8790,7 @@ mHWData->mVideoCaptureEnabled = data.fVideoCaptureEnabled; - for (unsigned i = 0; i < RT_ELEMENTS(mHWData->maVideoCaptureScreens); i++) + 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); |