From patchwork Wed Apr 9 15:33:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 28100 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3F9C22145A for ; Wed, 9 Apr 2014 15:37:27 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id pa12sf7902326veb.0 for ; Wed, 09 Apr 2014 08:37:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=20zbPL/QNttNbxE8UgHK7UqQhdPWU9l6BUwntpjEZzs=; b=hRyqEel/rpwB3bGSjx+PDBpW0rA7gAs2twHI7G3kCyUAvVZ3jhSmV9aIUHNvpcZKFI qUeN1KfZRnbxANQrw9t4ag5xmfkdO30ZJWm8lfe6qa+YHMr2XO3+nRYntP41SheXkmue mIL5XYo+clvRess5NclqZa2jhrOxhycd76wklUmTaXcYheF8FUvhnUATb9Q9DUQkOcKf 0WWnB7f09WivYKpm69Msscdez1og2ZEwK/KMnalO8xB0s5v1ea383tn2GgLc+/rCFpag ulbEXJwkPt7LglC9ZWi00mgbbrDxUscM3rrD3IFb+iFzrOpvSIzIe6MHgijdwi+4YRys nt3Q== X-Gm-Message-State: ALoCoQl9YqUv68eftL7rr44WWe5FIKG8rzhDGX8ayY23L2J2AP6QEvvBKVuUWBUUa7vFUu3LbyXg X-Received: by 10.58.88.136 with SMTP id bg8mr5434696veb.21.1397057846947; Wed, 09 Apr 2014 08:37:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.30.163 with SMTP id d32ls671898qgd.44.gmail; Wed, 09 Apr 2014 08:37:26 -0700 (PDT) X-Received: by 10.58.179.115 with SMTP id df19mr1111481vec.41.1397057846632; Wed, 09 Apr 2014 08:37:26 -0700 (PDT) Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by mx.google.com with ESMTPS id z14si195847vcf.100.2014.04.09.08.37.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Apr 2014 08:37:26 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.176; Received: by mail-ve0-f176.google.com with SMTP id db11so2191313veb.21 for ; Wed, 09 Apr 2014 08:37:26 -0700 (PDT) X-Received: by 10.220.163.3 with SMTP id y3mr9479572vcx.7.1397057846515; Wed, 09 Apr 2014 08:37:26 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.12.8 with SMTP id v8csp339940vcv; Wed, 9 Apr 2014 08:37:26 -0700 (PDT) X-Received: by 10.140.107.229 with SMTP id h92mr12752236qgf.30.1397057846071; Wed, 09 Apr 2014 08:37:26 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id lu1si570807qcb.42.2014.04.09.08.37.25 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 09 Apr 2014 08:37:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:46767 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WXuZ3-0004Yf-N5 for patch@linaro.org; Wed, 09 Apr 2014 11:37:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WXuVu-00008R-OH for qemu-devel@nongnu.org; Wed, 09 Apr 2014 11:34:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WXuVo-0000FH-Dj for qemu-devel@nongnu.org; Wed, 09 Apr 2014 11:34:10 -0400 Received: from mail-wg0-f51.google.com ([74.125.82.51]:61108) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WXuVo-0000Ep-7K for qemu-devel@nongnu.org; Wed, 09 Apr 2014 11:34:04 -0400 Received: by mail-wg0-f51.google.com with SMTP id k14so2676055wgh.10 for ; Wed, 09 Apr 2014 08:34:03 -0700 (PDT) X-Received: by 10.180.74.242 with SMTP id x18mr10657481wiv.20.1397057643430; Wed, 09 Apr 2014 08:34:03 -0700 (PDT) Received: from midway01-04-00.lavalab ([88.98.47.97]) by mx.google.com with ESMTPSA id ga10sm2170061wjb.23.2014.04.09.08.34.02 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Apr 2014 08:34:03 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org Date: Wed, 9 Apr 2014 16:33:05 +0100 Message-Id: <1397057589-11779-3-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1397057589-11779-1-git-send-email-eric.auger@linaro.org> References: <1397057589-11779-1-git-send-email-eric.auger@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.51 Cc: peter.maydell@linaro.org, kim.phillips@freescale.com, Kim Phillips , agraf@suse.de, stuart.yoder@freescale.com, alex.williamson@redhat.com, christophe.barnichon@st.com, a.motakis@virtualopensystems.com, kvmarm@lists.cs.columbia.edu Subject: [Qemu-devel] [RFC v2 2/6] vfio: move hw/misc/vfio.c to hw/vfio/pci.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Kim Phillips This is done in preparation for the addition of VFIO platform device support. Signed-off-by: Kim Phillips --- LICENSE | 2 +- MAINTAINERS | 2 +- hw/Makefile.objs | 1 + hw/misc/Makefile.objs | 1 - hw/vfio/Makefile.objs | 3 +++ hw/{misc/vfio.c => vfio/pci.c} | 0 6 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 hw/vfio/Makefile.objs rename hw/{misc/vfio.c => vfio/pci.c} (100%) diff --git a/hw/misc/vfio.c b/hw/vfio/pci.c similarity index 100% rename from hw/misc/vfio.c rename to hw/vfio/pci.c diff --git a/LICENSE b/LICENSE index da70e94..0e0b4b9 100644 --- a/LICENSE +++ b/LICENSE @@ -11,7 +11,7 @@ option) any later version. As of July 2013, contributions under version 2 of the GNU General Public License (and no later version) are only accepted for the following files -or directories: bsd-user/, linux-user/, hw/misc/vfio.c, hw/xen/xen_pt*. +or directories: bsd-user/, linux-user/, hw/vfio/, hw/xen/xen_pt*. 3) The Tiny Code Generator (TCG) is released under the BSD license (see license headers in files). diff --git a/MAINTAINERS b/MAINTAINERS index 7d17f83..9b5d569 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -605,7 +605,7 @@ F: hw/usb/* VFIO M: Alex Williamson S: Supported -F: hw/misc/vfio.c +F: hw/vfio/* vhost M: Michael S. Tsirkin diff --git a/hw/Makefile.objs b/hw/Makefile.objs index d178b65..b16dada 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -26,6 +26,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += ssi/ devices-dirs-$(CONFIG_SOFTMMU) += timer/ devices-dirs-$(CONFIG_TPM) += tpm/ devices-dirs-$(CONFIG_SOFTMMU) += usb/ +devices-dirs-$(CONFIG_SOFTMMU) += vfio/ devices-dirs-$(CONFIG_VIRTIO) += virtio/ devices-dirs-$(CONFIG_SOFTMMU) += watchdog/ devices-dirs-$(CONFIG_SOFTMMU) += xen/ diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index f674365..656570c 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -21,7 +21,6 @@ common-obj-$(CONFIG_MACIO) += macio/ ifeq ($(CONFIG_PCI), y) obj-$(CONFIG_KVM) += ivshmem.o -obj-$(CONFIG_LINUX) += vfio.o endif obj-$(CONFIG_REALVIEW) += arm_sysctl.o diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs new file mode 100644 index 0000000..31c7dab --- /dev/null +++ b/hw/vfio/Makefile.objs @@ -0,0 +1,3 @@ +ifeq ($(CONFIG_LINUX), y) +obj-$(CONFIG_PCI) += pci.o +endif