---

yaml --- r: 68392 b: refs/heads/master c: 253abde h: refs/heads/master v: v3
git-mirror · Oct 13, 2007 · 95e68ce · 95e68ce
1 parent ca6e7ab
commit 95e68ce
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e66f350cfc853043bfa71b281581dd6f92fa347
+refs/heads/master: 253abdee5ec2edd0a7f6dc2358bef42e3fdf1f39
diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c
@@ -1831,7 +1831,8 @@ static int handle_cr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 			vcpu_load_rsp_rip(vcpu);
 			set_cr8(vcpu, vcpu->regs[reg]);
 			skip_emulated_instruction(vcpu);
-			return 1;
+			kvm_run->exit_reason = KVM_EXIT_SET_TPR;
+			return 0;
 		};
 		break;
 	case 2: /* clts */

diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h
@@ -46,6 +46,7 @@ enum kvm_exit_reason {
 	KVM_EXIT_SHUTDOWN         = 8,
 	KVM_EXIT_FAIL_ENTRY       = 9,
 	KVM_EXIT_INTR             = 10,
+	KVM_EXIT_SET_TPR          = 11
 };
 
 /* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */