Changeset 3486 in vbox

Timestamp:

Jul 6, 2007 10:13:52 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

22700

Message:

got rid of incorrect assertion

File:

• trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -608 +608 @@
 
     Assert(sizeof(pVM->hwaccm.s.svm.pVMCBPhys) == 8);
-    Assert(pVMCB->ctrl.u32InterceptCtrl1 == (  SVM_CTRL1_INTERCEPT_INTR
-                                             | SVM_CTRL1_INTERCEPT_VINTR
-                                             | SVM_CTRL1_INTERCEPT_NMI
-                                             | SVM_CTRL1_INTERCEPT_SMI
-                                             | SVM_CTRL1_INTERCEPT_INIT
-                                             | SVM_CTRL1_INTERCEPT_CR0           /** @todo redundant?  */
-                                             | SVM_CTRL1_INTERCEPT_RDPMC
-                                             | SVM_CTRL1_INTERCEPT_CPUID
-                                             | SVM_CTRL1_INTERCEPT_RSM
-                                             | SVM_CTRL1_INTERCEPT_HLT
-                                             | SVM_CTRL1_INTERCEPT_INOUT_BITMAP
-                                             | SVM_CTRL1_INTERCEPT_MSR_SHADOW
-                                             | SVM_CTRL1_INTERCEPT_INVLPG
-                                             | SVM_CTRL1_INTERCEPT_INVLPGA       /* AMD only */
-                                             | SVM_CTRL1_INTERCEPT_SHUTDOWN      /* fatal */
-                                             | SVM_CTRL1_INTERCEPT_FERR_FREEZE   /* Legacy FPU FERR handling. */
-                                             ));
     Assert(pVMCB->ctrl.u32InterceptCtrl2 == ( SVM_CTRL2_INTERCEPT_VMRUN         /* required */
                                              | SVM_CTRL2_INTERCEPT_VMMCALL
@@ -1252 +1235 @@
             if (IoExitInfo.n.u1Type == 0)
             {
-                Log2(("IOMInterpretOUTSEx %VGv %x size=%d\n", pCtx->eip, IoExitInfo.n.u16Port, uIOSize));
+                Log(("IOMInterpretOUTSEx %VGv %x size=%d\n", pCtx->eip, IoExitInfo.n.u16Port, uIOSize));
                 STAM_COUNTER_INC(&pVM->hwaccm.s.StatExitIOStringWrite);
                 rc = IOMInterpretOUTSEx(pVM, CPUMCTX2CORE(pCtx), IoExitInfo.n.u16Port, prefix, uIOSize);
@@ -1258 +1241 @@
             else
             {
-                Log2(("IOMInterpretINSEx  %VGv %x size=%d\n", pCtx->eip, IoExitInfo.n.u16Port, uIOSize));
+                Log(("IOMInterpretINSEx  %VGv %x size=%d\n", pCtx->eip, IoExitInfo.n.u16Port, uIOSize));
                 STAM_COUNTER_INC(&pVM->hwaccm.s.StatExitIOStringRead);
                 rc = IOMInterpretINSEx(pVM, CPUMCTX2CORE(pCtx), IoExitInfo.n.u16Port, prefix, uIOSize);
@@ -1301 +1284 @@
                 goto ResumeExecution;
             }
-            Log2(("EM status from IO at %VGv %x size %d: %Vrc\n", pCtx->eip, IoExitInfo.n.u16Port, uIOSize, rc));
+            Log(("EM status from IO at %VGv %x size %d: %Vrc\n", pCtx->eip, IoExitInfo.n.u16Port, uIOSize, rc));
             break;
         }
@@ -1313 +1296 @@
             AssertMsg(VBOX_FAILURE(rc) || rc == VINF_EM_RAW_EMULATE_INSTR || rc == VINF_EM_RAW_GUEST_TRAP || rc == VINF_TRPM_XCPT_DISPATCHED, ("%Vrc\n", rc));
 #endif
-        Log2(("Failed IO at %VGv %x size %d\n", pCtx->eip, IoExitInfo.n.u16Port, uIOSize));
+        Log(("Failed IO at %VGv %x size %d\n", pCtx->eip, IoExitInfo.n.u16Port, uIOSize));
         break;
     }