---

yaml --- r: 146602 b: refs/heads/master c: 36752c9 h: refs/heads/master v: v3
git-mirror · Jun 10, 2009 · ba4d235 · ba4d235
1 parent 0b0488e
commit ba4d235
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44c11430b52cbad0a467bc023a802d122dfd285c
+refs/heads/master: 36752c9b91f75aa3ff0f214a89f13d806cb2f61f
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
@@ -3579,7 +3579,7 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,
 
 	memset(sregs->interrupt_bitmap, 0, sizeof sregs->interrupt_bitmap);
 
-	if (vcpu->arch.interrupt.pending)
+	if (vcpu->arch.interrupt.pending && !vcpu->arch.interrupt.soft)
 		set_bit(vcpu->arch.interrupt.nr,
 			(unsigned long *)sregs->interrupt_bitmap);