diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-08-16 18:49:25 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-08-16 18:52:09 -0400 |
| commit | 6011f4b98a588eb2a19e24a1db98e5ddfb03b86d (patch) | |
| tree | 2df65d673299af919c971626bf290701e00ae50d | |
| parent | 60ad92d2ff7601d8dbdd9262d113d379f20d31f0 (diff) | |
| download | longterm-queue-2.6.34-6011f4b98a588eb2a19e24a1db98e5ddfb03b86d.tar.gz | |
KVM: fix build fail in kvm_main.c
The label name changed since 2.6.34, causing this fail:
virt/kvm/kvm_main.c: In function ‘kvm_vm_ioctl_create_vcpu’:
virt/kvm/kvm_main.c:1327:3: error: label ‘unlock_vcpu_destroy’ used but not defined
Reported-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/KVM-Ensure-all-vcpus-are-consistent-with-in-kernel-i.patch | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/queue/KVM-Ensure-all-vcpus-are-consistent-with-in-kernel-i.patch b/queue/KVM-Ensure-all-vcpus-are-consistent-with-in-kernel-i.patch index 46e3825..9835b77 100644 --- a/queue/KVM-Ensure-all-vcpus-are-consistent-with-in-kernel-i.patch +++ b/queue/KVM-Ensure-all-vcpus-are-consistent-with-in-kernel-i.patch @@ -21,6 +21,7 @@ Based on earlier patch by Michael Ellerman. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Avi Kivity <avi@redhat.com> +[PG: in .34 label "unlock_vcpu_destroy" is just "vcpu_destroy"] Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c @@ -93,7 +94,7 @@ index c82ae24..559af38 100644 mutex_lock(&kvm->lock); + if (!kvm_vcpu_compatible(vcpu)) { + r = -EINVAL; -+ goto unlock_vcpu_destroy; ++ goto vcpu_destroy; + } if (atomic_read(&kvm->online_vcpus) == KVM_MAX_VCPUS) { r = -EINVAL; |