From patchwork Mon Oct 31 06:35:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jike Song X-Patchwork-Id: 9405071 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AF3146022E for ; Mon, 31 Oct 2016 06:40:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0F0C2912B for ; Mon, 31 Oct 2016 06:40:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 95C7329133; Mon, 31 Oct 2016 06:40:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C9D02912B for ; Mon, 31 Oct 2016 06:40:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761194AbcJaGkc (ORCPT ); Mon, 31 Oct 2016 02:40:32 -0400 Received: from mga09.intel.com ([134.134.136.24]:46459 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761103AbcJaGkb (ORCPT ); Mon, 31 Oct 2016 02:40:31 -0400 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP; 30 Oct 2016 23:40:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,573,1473145200"; d="scan'208";a="25931435" Received: from kvmgt1.bj.intel.com ([10.238.154.158]) by orsmga004.jf.intel.com with ESMTP; 30 Oct 2016 23:40:28 -0700 From: Jike Song To: pbonzini@redhat.com, alex.williamson@redhat.com, guangrong.xiao@linux.intel.com Cc: kwankhede@nvidia.com, cjia@nvidia.com, kevin.tian@intel.com, jike.song@intel.com, kvm@vger.kernel.org Subject: [v3 3/5] KVM: move kvm_get_kvm to kvm_host.h Date: Mon, 31 Oct 2016 14:35:04 +0800 Message-Id: <1477895706-22824-4-git-send-email-jike.song@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1477895706-22824-1-git-send-email-jike.song@intel.com> References: <1477895706-22824-1-git-send-email-jike.song@intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP So that external users like vfio can call it without introducing symbol-level dependency. Signed-off-by: Jike Song Acked-by: Paolo Bonzini --- include/linux/kvm_host.h | 5 ++++- virt/kvm/kvm_main.c | 6 ------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 01c0b9c..e1e877af 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -526,7 +526,10 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, struct module *module); void kvm_exit(void); -void kvm_get_kvm(struct kvm *kvm); +static inline void kvm_get_kvm(struct kvm *kvm) +{ + atomic_inc(&kvm->users_count); +} void kvm_put_kvm(struct kvm *kvm); static inline struct kvm_memslots *__kvm_memslots(struct kvm *kvm, int as_id) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 348d6fd..e25359b 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -740,12 +740,6 @@ static void kvm_destroy_vm(struct kvm *kvm) mmdrop(mm); } -void kvm_get_kvm(struct kvm *kvm) -{ - atomic_inc(&kvm->users_count); -} -EXPORT_SYMBOL_GPL(kvm_get_kvm); - void kvm_put_kvm(struct kvm *kvm) { if (atomic_dec_and_test(&kvm->users_count))