[v4,0/8] In-kernel XICS interrupt controller emulation

Commit Message

Paul Mackerras April 12, 2013, 3:42 a.m. UTC

I wrote:
> The series is based on Alex Graf's kvm-ppc-next branch with Scott
> Wood's recent patch series applied on top, together with the patch
> below to allow it to compile with CONFIG_KVM_MPIC=n.

And of course I forgot to include the patch.  Here it is.

Paul.

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 290a905..5306ca5 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -466,9 +466,13 @@  void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)
 	kvmppc_remove_vcpu_debugfs(vcpu);
 
 	switch (vcpu->arch.irq_type) {
+#ifdef CONFIG_KVM_MPIC
 	case KVMPPC_IRQ_MPIC:
 		kvmppc_mpic_put(vcpu->arch.mpic);
 		break;
+#endif
+	default:
+		break;
 	}
 
 	kvmppc_core_vcpu_free(vcpu);
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index e325f5d..ca3adf9 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2161,13 +2161,11 @@  out:
 static int kvm_ioctl_create_device(struct kvm *kvm,
 				   struct kvm_create_device *cd)
 {
-	bool test = cd->flags & KVM_CREATE_DEVICE_TEST;
-
 	switch (cd->type) {
 #ifdef CONFIG_KVM_MPIC
 	case KVM_DEV_TYPE_FSL_MPIC_20:
 	case KVM_DEV_TYPE_FSL_MPIC_42: {
-		if (test)
+		if (cd->flags & KVM_CREATE_DEVICE_TEST)
 			return 0;
 
 		return kvm_create_mpic(kvm, cd->type);