From: Carsten Otte <cotte@de.ibm.com>
Date: Wed, 4 Jan 2012 09:25:25 +0000 (+0100)
Subject: KVM: s390: ucontrol: disable in-kernel irq stack
X-Git-Tag: v3.4-rc1~59^2~121
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d6b6d166864fa97ca3b1ed1a5c62fd3b53d4606f;p=~emulex%2Finfiniband.git

KVM: s390: ucontrol: disable in-kernel irq stack

This patch disables the in-kernel interrupt stack for KVM virtual
machines that are controlled by user. Userspace has to take care
of handling interrupts on its own.

Signed-off-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 02510946864..5b5c28e471d 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -505,7 +505,8 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)
 	if (test_thread_flag(TIF_MCCK_PENDING))
 		s390_handle_mcck();
 
-	kvm_s390_deliver_pending_interrupts(vcpu);
+	if (!kvm_is_ucontrol(vcpu->kvm))
+		kvm_s390_deliver_pending_interrupts(vcpu);
 
 	vcpu->arch.sie_block->icptcode = 0;
 	local_irq_disable();