From d4029028c8f3d3bf97c9a2d56e2829fe137bbca2 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Thu, 13 May 2010 12:30:43 +0300
Subject: [PATCH] --- yaml --- r: 202287 b: refs/heads/master c:
 19483d144023f7f4817dedafe26d5fe9ff2e7087 h: refs/heads/master i:   202285:
 09e7cadbea9d8eb0dd12be30c84866bf489b2ea6   202283:
 857a45b39d996373fb41d48adb24ff3966c2f441   202279:
 cc2c7c6c2e7e6ad2cee16bc6c8938fcec8e2f9ef   202271:
 e69e511bd1835159d8d635e935055feff14491a8 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/powerpc/kvm/powerpc.c | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4e85a8103b24..6535d598210c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc923cc93b7719576f20687e4cb07751601fbbb3
+refs/heads/master: 19483d144023f7f4817dedafe26d5fe9ff2e7087
diff --git a/trunk/arch/powerpc/kvm/powerpc.c b/trunk/arch/powerpc/kvm/powerpc.c
index e0fae7a618ca..caeed7b31bf9 100644
--- a/trunk/arch/powerpc/kvm/powerpc.c
+++ b/trunk/arch/powerpc/kvm/powerpc.c
@@ -512,15 +512,17 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
 	void __user *argp = (void __user *)arg;
 	long r;
 
-	switch (ioctl) {
-	case KVM_INTERRUPT: {
+	if (ioctl == KVM_INTERRUPT) {
 		struct kvm_interrupt irq;
 		r = -EFAULT;
 		if (copy_from_user(&irq, argp, sizeof(irq)))
-			goto out;
+			goto out_nolock;
 		r = kvm_vcpu_ioctl_interrupt(vcpu, &irq);
-		break;
+		goto out_nolock;
 	}
+
+	vcpu_load(vcpu);
+	switch (ioctl) {
 	case KVM_ENABLE_CAP:
 	{
 		struct kvm_enable_cap cap;
@@ -535,6 +537,8 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
 	}
 
 out:
+	vcpu_put(vcpu);
+out_nolock:
 	return r;
 }