[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <502D77FB.1000502@windriver.com>
Date: Thu, 16 Aug 2012 18:45:15 -0400
From: Paul Gortmaker <paul.gortmaker@...driver.com>
To: Herton Ronaldo Krzesinski <herton.krzesinski@...onical.com>
CC: <stable@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
Avi Kivity <avi@...hat.com>,
Michael Ellerman <michael@...erman.id.au>
Subject: Re: [v2.6.34-stable 016/165] KVM: Ensure all vcpus are consistent
with in-kernel irqchip settings
On 12-08-16 03:30 PM, Herton Ronaldo Krzesinski wrote:
> On Wed, Aug 15, 2012 at 03:46:00PM -0400, Paul Gortmaker wrote:
>> From: Avi Kivity <avi@...hat.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.
Thanks Herton. I'm not sure how I missed that in my allyesconfig
builds -- I must have got distracted by the noise coming from
building (or failing to) from the stuff in Documentation / samples
Re-doing x86 & x86-64 allyesconfig testing and will push the fix
once they complete.
Thanks again,
Paul.
--
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists