[Pkg-virtualbox-commits] r363 - in tags: . 1.6.6-dfsg-2 1.6.6-dfsg-2/debian/patches

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-10-03 16:39:47 +0000 (Fri, 03 Oct 2008)
New Revision: 363

Added:
   tags/1.6.6-dfsg-2/
   tags/1.6.6-dfsg-2/debian/patches/15-rate-limit-PATM-messages.dpatch
Removed:
   tags/1.6.6-dfsg-2/debian/patches/15-rate-limit-PATM-messages.dpatch
Log:
Released 1.6.6-dfsg-2



Copied: tags/1.6.6-dfsg-2 (from rev 360, trunk)


Property changes on: tags/1.6.6-dfsg-2
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: tags/1.6.6-dfsg-2/debian/patches/15-rate-limit-PATM-messages.dpatch
===================================================================
--- trunk/debian/patches/15-rate-limit-PATM-messages.dpatch	2008-10-03 15:22:19 UTC (rev 360)
+++ tags/1.6.6-dfsg-2/debian/patches/15-rate-limit-PATM-messages.dpatch	2008-10-03 16:39:47 UTC (rev 363)
@@ -1,36 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 15-rate-limit-PATM-messages.dpatch by Stefan Lippers-Hollmann <s.l-h at gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: http://www.virtualbox.de/ticket/1775
-## DP: rediff the following upstream commits against virtualbox-ose 1.6.6-dfsg-1:
-## DP: - r12524
-## DP: - r12525
-## DP: - r12527
-## DP: - r12532
-## DP: - r12534
-
- at DPATCH@
-diff -urNad virtualbox-ose-1.6.6-dfsg~/src/VBox/VMM/PATM/PATM.cpp virtualbox-ose-1.6.6-dfsg/src/VBox/VMM/PATM/PATM.cpp
---- virtualbox-ose-1.6.6-dfsg~/src/VBox/VMM/PATM/PATM.cpp	2008-06-25 17:47:15.000000000 +0200
-+++ virtualbox-ose-1.6.6-dfsg/src/VBox/VMM/PATM/PATM.cpp	2008-09-28 18:19:19.000000000 +0200
-@@ -97,6 +97,9 @@
- };
- #endif
- 
-+/* Don't want to break saved states, so put it here as a global variable. */
-+static unsigned int cIDTHandlersDisabled = 0;
-+
- /**
-  * Initializes the PATM.
-  *
-@@ -4962,7 +4965,8 @@
-             if (iGate != (uint32_t)~0)
-             {
-                 TRPMR3SetGuestTrapHandler(pVM, iGate, TRPM_INVALID_HANDLER);
--                LogRel(("PATM: Disabling IDT %x patch handler %VGv ", iGate, pInstrGC));
-+                if (++cIDTHandlersDisabled < 256)
-+                    LogRel(("PATM: Disabling IDT %x patch handler %VGv ", iGate, pInstrGC));
-             }
-         }
- 

Copied: tags/1.6.6-dfsg-2/debian/patches/15-rate-limit-PATM-messages.dpatch (from rev 361, trunk/debian/patches/15-rate-limit-PATM-messages.dpatch)
===================================================================
--- tags/1.6.6-dfsg-2/debian/patches/15-rate-limit-PATM-messages.dpatch	                        (rev 0)
+++ tags/1.6.6-dfsg-2/debian/patches/15-rate-limit-PATM-messages.dpatch	2008-10-03 16:39:47 UTC (rev 363)
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15-rate-limit-PATM-messages.dpatch by Stefan Lippers-Hollmann <s.l-h at gmx.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: http://www.virtualbox.de/ticket/1775
+## DP: rediff the following upstream commits against virtualbox-ose 1.6.6-dfsg-1:
+## DP: - r12524
+## DP: - r12525
+## DP: - r12527
+## DP: - r12532
+## DP: - r12534
+
+ at DPATCH@
+diff -urNad virtualbox-ose-1.6.6-dfsg~/src/VBox/VMM/PATM/PATM.cpp virtualbox-ose-1.6.6-dfsg/src/VBox/VMM/PATM/PATM.cpp
+--- virtualbox-ose-1.6.6-dfsg~/src/VBox/VMM/PATM/PATM.cpp	2008-06-25 17:47:15.000000000 +0200
++++ virtualbox-ose-1.6.6-dfsg/src/VBox/VMM/PATM/PATM.cpp	2008-09-28 18:19:19.000000000 +0200
+@@ -97,6 +97,9 @@
+ };
+ #endif
+ 
++/* Don't want to break saved states, so put it here as a global variable. */
++static unsigned int cIDTHandlersDisabled = 0;
++
+ /**
+  * Initializes the PATM.
+  *
+@@ -4962,7 +4965,8 @@
+             if (iGate != (uint32_t)~0)
+             {
+                 TRPMR3SetGuestTrapHandler(pVM, iGate, TRPM_INVALID_HANDLER);
+-                LogRel(("PATM: Disabling IDT %x patch handler %VGv\n", iGate, pInstrGC));
++		if (++cIDTHandlersDisabled < 256)
++	                LogRel(("PATM: Disabling IDT %x patch handler %VGv\n", iGate, pInstrGC));
+             }
+         }
+