From patchwork Fri Nov 20 01:47:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 7663771 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CD10F9F2E2 for ; Fri, 20 Nov 2015 01:47:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EDB31204A2 for ; Fri, 20 Nov 2015 01:47:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 146A3204A0 for ; Fri, 20 Nov 2015 01:47:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161831AbbKTBrW (ORCPT ); Thu, 19 Nov 2015 20:47:22 -0500 Received: from ozlabs.org ([103.22.144.67]:44919 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161146AbbKTBrU (ORCPT ); Thu, 19 Nov 2015 20:47:20 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 447A4140DB4; Fri, 20 Nov 2015 12:47:18 +1100 (AEDT) Date: Fri, 20 Nov 2015 12:47:17 +1100 From: Stephen Rothwell To: Christian Borntraeger , Cornelia Huck , Marcelo Tosatti , Gleb Natapov , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, David Hildenbrand Subject: linux-next: manual merge of the kvms390 tree with the kvm tree Message-ID: <20151120124717.4179e98b@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: include/linux/kvm_host.h arch/s390/kvm/interrupt.c arch/s390/kvm/sigp.c between commits: db27a7a37aa0 ("KVM: Provide function for VCPU lookup by id") b85de33a1a34 ("KVM: s390: avoid memory overwrites on emergency signal injection") 152e9f65d66f ("KVM: s390: fix wrong lookup of VCPUs by array index") from the kvm tree and commit: a8ab7a5fd13b ("KVM: Provide function for VCPU lookup by id") e896d1d08efc ("KVM: s390: avoid memory overwrites on emergency signal injection") 32d7bd98e799 ("KVM: s390: fix wrong lookup of VCPUs by array index") from the kvms390 tree. These patches used different names for the added function. I used the name from the kvm tree (kvm_get_vcpu_by_id). This also required the following merge patch: From: Stephen Rothwell Date: Fri, 20 Nov 2015 12:42:17 +1100 Subject: [PATCH] KVM: s390: update for kvm_lookup_vcpu name change Signed-off-by: Stephen Rothwell --- arch/powerpc/kvm/book3s_hv.c | 2 +- arch/s390/kvm/diag.c | 2 +- virt/kvm/kvm_main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 904b3b0afb48..a29da44cdc6c 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -311,7 +311,7 @@ static struct kvm_vcpu *kvmppc_find_vcpu(struct kvm *kvm, int id) struct kvm_vcpu *ret; mutex_lock(&kvm->lock); - ret = kvm_lookup_vcpu(kvm, id); + ret = kvm_get_vcpu_by_id(kvm, id); mutex_unlock(&kvm->lock); return ret; } diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c index aaa7cc041335..05f7de9869a9 100644 --- a/arch/s390/kvm/diag.c +++ b/arch/s390/kvm/diag.c @@ -165,7 +165,7 @@ static int __diag_time_slice_end_directed(struct kvm_vcpu *vcpu) if (tid == vcpu->vcpu_id) return 0; - tcpu = kvm_lookup_vcpu(vcpu->kvm, tid); + tcpu = kvm_get_vcpu_by_id(vcpu->kvm, tid); if (tcpu) kvm_vcpu_yield_to(tcpu); return 0; diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 1ee2f738bf61..1f0f8c4ca345 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2358,7 +2358,7 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) r = -EINVAL; goto unlock_vcpu_destroy; } - if (kvm_lookup_vcpu(kvm, id)) { + if (kvm_get_vcpu_by_id(kvm, id)) { r = -EEXIST; goto unlock_vcpu_destroy; }