lkml.org 
[lkml]   [2012]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [v2.6.34-stable 016/165] KVM: Ensure all vcpus are consistent with in-kernel irqchip settings
    On Wed, Aug 15, 2012 at 03:46:00PM -0400, Paul Gortmaker wrote:
    > From: Avi Kivity <avi@redhat.com>
    >
    > -------------------
    > This is a commit scheduled for the next v2.6.34 longterm release.
    > http://git.kernel.org/?p=linux/kernel/git/paulg/longterm-queue-2.6.34.git
    > If you see a problem with using this for longterm, please comment.
    > -------------------
    >
    [...]
    > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
    > index c82ae24..559af38 100644
    > --- a/virt/kvm/kvm_main.c
    > +++ b/virt/kvm/kvm_main.c
    > @@ -1322,6 +1322,10 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id)
    > return r;
    >
    > mutex_lock(&kvm->lock);
    > + if (!kvm_vcpu_compatible(vcpu)) {
    > + r = -EINVAL;
    > + goto unlock_vcpu_destroy;
    > + }
    > if (atomic_read(&kvm->online_vcpus) == KVM_MAX_VCPUS) {
    > r = -EINVAL;
    > goto vcpu_destroy;

    Fails to build:

    linux-stable/arch/x86/kvm/../../../virt/kvm/kvm_main.c: In function 'kvm_vm_ioctl_create_vcpu':
    linux-stable/arch/x86/kvm/../../../virt/kvm/kvm_main.c:1327: error: label 'unlock_vcpu_destroy' used but not defined

    Looking at it, vcpu_destroy would be label name to be used instead.

    --
    []'s
    Herton


    \
     
     \ /
      Last update: 2012-08-16 22:21    [W:5.278 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site