Message ID | 20161216151006.11776-2-rkrcmar@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Am 16.12.2016 um 16:10 schrieb Radim Krčmář: > Split irqchip cannot be created after creating the kernel irqchip, but > we forgot to restrict the other way. This is an API change. > > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> > Signed-off-by: Radim Krčmář <rkrcmar@redhat.com> > --- > v2: r-b Paolo > --- > arch/x86/kvm/x86.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 1f0d2383f5ee..e670591337af 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -3939,7 +3939,7 @@ long kvm_arch_vm_ioctl(struct file *filp, > > mutex_lock(&kvm->lock); > r = -EEXIST; > - if (kvm->arch.vpic) > + if (irqchip_in_kernel(kvm)) > goto create_irqchip_unlock; > r = -EINVAL; > if (kvm->created_vcpus) > Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 1f0d2383f5ee..e670591337af 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3939,7 +3939,7 @@ long kvm_arch_vm_ioctl(struct file *filp, mutex_lock(&kvm->lock); r = -EEXIST; - if (kvm->arch.vpic) + if (irqchip_in_kernel(kvm)) goto create_irqchip_unlock; r = -EINVAL; if (kvm->created_vcpus)