aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2012-03-05 07:23:29 -0500
committerAvi Kivity <avi@redhat.com>2012-03-08 07:10:30 -0500
commit3e515705a1f46beb1c942bb8043c16f8ac7b1e9e (patch)
treefd0e53e5f51e6e03dda80d7aec6073f5cb694fd1 /include
parent4cee4798a304ee1ea579423ca048f16ceaccdfb5 (diff)
KVM: Ensure all vcpus are consistent with in-kernel irqchip settings
If some vcpus are created before KVM_CREATE_IRQCHIP, then irqchip_in_kernel() and vcpu->arch.apic will be inconsistent, leading to potential NULL pointer dereferences. Fix by: - ensuring that no vcpus are installed when KVM_CREATE_IRQCHIP is called - ensuring that a vcpu has an apic if it is installed after KVM_CREATE_IRQCHIP This is somewhat long winded because vcpu->arch.apic is created without kvm->lock held. Based on earlier patch by Michael Ellerman. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/kvm_host.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 355e44555c39..e42d85ae8541 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -805,6 +805,13 @@ static inline bool kvm_vcpu_is_bsp(struct kvm_vcpu *vcpu)
805{ 805{
806 return vcpu->kvm->bsp_vcpu_id == vcpu->vcpu_id; 806 return vcpu->kvm->bsp_vcpu_id == vcpu->vcpu_id;
807} 807}
808
809bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu);
810
811#else
812
813static inline bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu) { return true; }
814
808#endif 815#endif
809 816
810#ifdef __KVM_HAVE_DEVICE_ASSIGNMENT 817#ifdef __KVM_HAVE_DEVICE_ASSIGNMENT