Changeset 56665 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jun 28, 2015 3:28:49 PM (9 years ago)

Author:

vboxsync

Message:

hmR0SvmExitIOInstr: Adjusted the u3SEG validity check to exclude pre-Bulldozer CPUs as it cause OS/2 failures on Opteron 2384. This should fix the #GP in QLISP.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (1 diff)

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

@@ -4807 +4807 @@
                 if (IoExitInfo.n.u1Type == SVM_IOIO_WRITE)
                 {
-                    if (pVM->hm.s.svm.u32Features & AMD_CPUID_SVM_FEATURE_EDX_NRIP_SAVE)
+                    /* Don't know exactly how to detect whether u3SEG is valid, currently
+                       only enabling it for Bulldozer and later with NRIP.  OS/2 broke on
+                       2384 Opterons when only checking NRIP. */
+                    if (   (pVM->hm.s.svm.u32Features & AMD_CPUID_SVM_FEATURE_EDX_NRIP_SAVE)
+                        && pVM->cpum.ro.GuestFeatures.enmMicroarch >= kCpumMicroarch_AMD_15h_First)
+                    {
+                        AssertMsg(IoExitInfo.n.u3SEG == X86_SREG_DS || cbInstr > 1 + IoExitInfo.n.u1REP,
+                                  ("u32Seg=%d cbInstr=%d u1REP=%d", IoExitInfo.n.u3SEG, cbInstr, IoExitInfo.n.u1REP));
                         rcStrict = IEMExecStringIoWrite(pVCpu, cbValue, enmAddrMode, IoExitInfo.n.u1REP, (uint8_t)cbInstr,
                                                         IoExitInfo.n.u3SEG);
+                    }
                     else
                         rcStrict = IEMExecOne(pVCpu);