Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 68439
b: refs/heads/master
c: 12fa272
h: refs/heads/master
i:
  68437: a5d77f6
  68435: ced393d
  68431: 0c303e1
v: v3
  • Loading branch information
Nitin A Kamble authored and Avi Kivity committed Oct 13, 2007
1 parent d336cf7 commit fb971fb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 26a3e983d154beca544afd36f293cfef10657f24
refs/heads/master: 12fa272e315af43d549ce22f9988392d0121350e
2 changes: 2 additions & 0 deletions trunk/drivers/kvm/x86_emulate.c
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,7 @@ x86_emulate_memop(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
srcmem_common:
src.type = OP_MEM;
src.ptr = (unsigned long *)cr2;
src.val = 0;
if ((rc = ops->read_emulated((unsigned long)src.ptr,
&src.val, src.bytes, ctxt->vcpu)) != 0)
goto done;
Expand Down Expand Up @@ -891,6 +892,7 @@ x86_emulate_memop(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
dst.type = OP_MEM;
dst.ptr = (unsigned long *)cr2;
dst.bytes = (d & ByteOp) ? 1 : op_bytes;
dst.val = 0;
if (d & BitOp) {
unsigned long mask = ~(dst.bytes * 8 - 1);

Expand Down

0 comments on commit fb971fb

Please sign in to comment.