Changeset 77450 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Feb 25, 2019 6:01:34 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 Fix passing operand size for string-IO instruction VM-exits.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplStrInstr.cpp.h (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplStrInstr.cpp.h

@@ -1217 +1217 @@
         ExitInstrInfo.StrIo.u3AddrSize = ADDR_VMXSTRIO;
         ExitInstrInfo.StrIo.iSegReg    = X86_SREG_ES;
-        rcStrict = iemVmxVmexitInstrStrIo(pVCpu, VMXINSTRID_IO_INS, pVCpu->cpum.GstCtx.dx, (OP_SIZE / 8) - 1, false /* fRep */,
+        rcStrict = iemVmxVmexitInstrStrIo(pVCpu, VMXINSTRID_IO_INS, pVCpu->cpum.GstCtx.dx, OP_SIZE / 8, false /* fRep */,
                                           ExitInstrInfo, cbInstr);
         if (rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE)
@@ -1302 +1302 @@
         ExitInstrInfo.StrIo.u3AddrSize = ADDR_VMXSTRIO;
         ExitInstrInfo.StrIo.iSegReg    = X86_SREG_ES;
-        rcStrict = iemVmxVmexitInstrStrIo(pVCpu, VMXINSTRID_IO_INS, pVCpu->cpum.GstCtx.dx, (OP_SIZE / 8) - 1, true /* fRep */,
+        rcStrict = iemVmxVmexitInstrStrIo(pVCpu, VMXINSTRID_IO_INS, pVCpu->cpum.GstCtx.dx, OP_SIZE / 8, true /* fRep */,
                                           ExitInstrInfo, cbInstr);
         if (rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE)
@@ -1517 +1517 @@
         ExitInstrInfo.StrIo.u3AddrSize = ADDR_VMXSTRIO;
         ExitInstrInfo.StrIo.iSegReg    = iEffSeg;
-        rcStrict = iemVmxVmexitInstrStrIo(pVCpu, VMXINSTRID_IO_OUTS, pVCpu->cpum.GstCtx.dx, (OP_SIZE / 8) - 1, false /* fRep */,
+        rcStrict = iemVmxVmexitInstrStrIo(pVCpu, VMXINSTRID_IO_OUTS, pVCpu->cpum.GstCtx.dx, OP_SIZE / 8, false /* fRep */,
                                           ExitInstrInfo, cbInstr);
         if (rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE)
@@ -1590 +1590 @@
         ExitInstrInfo.StrIo.u3AddrSize = ADDR_VMXSTRIO;
         ExitInstrInfo.StrIo.iSegReg    = iEffSeg;
-        rcStrict = iemVmxVmexitInstrStrIo(pVCpu, VMXINSTRID_IO_OUTS, pVCpu->cpum.GstCtx.dx, (OP_SIZE / 8) - 1, true /* fRep */,
+        rcStrict = iemVmxVmexitInstrStrIo(pVCpu, VMXINSTRID_IO_OUTS, pVCpu->cpum.GstCtx.dx, OP_SIZE / 8, true /* fRep */,
                                           ExitInstrInfo, cbInstr);
         if (rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE)