From patchwork Tue Aug 16 08:14:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jike Song X-Patchwork-Id: 9282875 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 8A1F160839 for ; Tue, 16 Aug 2016 08:16:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79F6328DE5 for ; Tue, 16 Aug 2016 08:16:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E8E928E01; Tue, 16 Aug 2016 08:16:55 +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 0954B28DE5 for ; Tue, 16 Aug 2016 08:16:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753216AbcHPIQo (ORCPT ); Tue, 16 Aug 2016 04:16:44 -0400 Received: from mga01.intel.com ([192.55.52.88]:61639 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753191AbcHPIQg (ORCPT ); Tue, 16 Aug 2016 04:16:36 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 16 Aug 2016 01:16:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,529,1464678000"; d="scan'208";a="1026170585" Received: from kvmgt1.bj.intel.com ([10.238.154.158]) by fmsmga001.fm.intel.com with ESMTP; 16 Aug 2016 01:16:29 -0700 From: Jike Song To: alex.williamson@redhat.com, kwankhede@nvidia.com, cjia@nvidia.com Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, bjsdjshi@linux.vnet.ibm.com, kevin.tian@intel.com, guangrong.xiao@linux.intel.com, zhenyuw@linux.intel.com, jike.song@intel.com, pbonzini@redhat.com, kraxel@redhat.com Subject: [RFC v6-based v1 5/5] rename 'vfio_mpci' to 'vfio_mdev' since it is now BUS-agnostic Date: Tue, 16 Aug 2016 16:14:17 +0800 Message-Id: <1471335257-6226-6-git-send-email-jike.song@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1471335257-6226-1-git-send-email-jike.song@intel.com> References: <1471335257-6226-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 Signed-off-by: Jike Song --- drivers/vfio/mdev/Kconfig | 10 +++++----- drivers/vfio/mdev/Makefile | 5 ++--- drivers/vfio/mdev/{vfio_mpci.c => vfio_mdev.c} | 0 3 files changed, 7 insertions(+), 8 deletions(-) rename drivers/vfio/mdev/{vfio_mpci.c => vfio_mdev.c} (100%) diff --git a/drivers/vfio/mdev/Kconfig b/drivers/vfio/mdev/Kconfig index 431ed59..b2fe0c6 100644 --- a/drivers/vfio/mdev/Kconfig +++ b/drivers/vfio/mdev/Kconfig @@ -1,5 +1,5 @@ -config VFIO_MDEV +config MDEV tristate "Mediated device driver framework" depends on VFIO default n @@ -9,10 +9,10 @@ config VFIO_MDEV If you don't know what do here, say N. -config VFIO_MPCI - tristate "VFIO support for Mediated PCI devices" - depends on VFIO && PCI && VFIO_MDEV +config VFIO_MDEV + tristate "VFIO Bus driver for Mediated devices" + depends on VFIO && MDEV default n help - VFIO based driver for mediated PCI devices. + VFIO Bus driver for mediated devices. diff --git a/drivers/vfio/mdev/Makefile b/drivers/vfio/mdev/Makefile index 264fb03..ee9f89f 100644 --- a/drivers/vfio/mdev/Makefile +++ b/drivers/vfio/mdev/Makefile @@ -1,6 +1,5 @@ mdev-y := mdev_core.o mdev_sysfs.o mdev_driver.o -obj-$(CONFIG_VFIO_MDEV) += mdev.o -obj-$(CONFIG_VFIO_MPCI) += vfio_mpci.o - +obj-$(CONFIG_MDEV) += mdev.o +obj-$(CONFIG_VFIO_MDEV) += vfio_mdev.o diff --git a/drivers/vfio/mdev/vfio_mpci.c b/drivers/vfio/mdev/vfio_mdev.c similarity index 100% rename from drivers/vfio/mdev/vfio_mpci.c rename to drivers/vfio/mdev/vfio_mdev.c