Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 373133
b: refs/heads/master
c: 5a2892c
h: refs/heads/master
i:
  373131: 5843de5
v: v3
  • Loading branch information
Jan Kiszka authored and Gleb Natapov committed Apr 28, 2013
1 parent a960acc commit 9c83a82
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cbf64358588ae45dcf0207dbc97fba783577d64a
refs/heads/master: 5a2892ce72e010e3cb96b438d7cdddce0c88e0e6
2 changes: 1 addition & 1 deletion trunk/arch/x86/kvm/vmx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1917,7 +1917,7 @@ static void vmx_queue_exception(struct kvm_vcpu *vcpu, unsigned nr,
u32 intr_info = nr | INTR_INFO_VALID_MASK;

if (nr == PF_VECTOR && is_guest_mode(vcpu) &&
nested_pf_handled(vcpu))
!vmx->nested.nested_run_pending && nested_pf_handled(vcpu))
return;

if (has_error_code) {
Expand Down

0 comments on commit 9c83a82

Please sign in to comment.