From patchwork Mon Jun 2 07:49:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 31252 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f200.google.com (mail-pd0-f200.google.com [209.85.192.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0FABD20AE6 for ; Mon, 2 Jun 2014 07:50:28 +0000 (UTC) Received: by mail-pd0-f200.google.com with SMTP id g10sf14732732pdj.7 for ; Mon, 02 Jun 2014 00:50:28 -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:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=k1bm0OJ8pCoicQvxEeO9jRV6yoojsnLBhv36p+EpUFE=; b=gPJrnl/VRqfsmfnCDio89HwoVZ5oFY2R/1BPL06NJpg8Dy2UlhMVPO5NOZ1T02ZoXg pBivVOlt8ch3GS3wsqY41G4W4l/3gcKzsDqgl5MEIiLyMo+73oOZYIPTr2xOLTe4y2yD UCtwwLWU+Hj3lW4WXfEH97Y/tqCkQl5DR9z2smjwwp8dR8KHMUGkD3IlE3xD8qkUoXRF 5zdYN1+qTllTncUUghECxoDCsif3I825Y3Ad4+U+3/QPC5oOEyGWe/BF77OYFg5omCZB bv72q+ILKOVnob5RzdFYev2KSUFM1LdyTJ7YIDC8VkvrAedpGmeJOOXn2QD4rjG8c+jK ST9w== X-Gm-Message-State: ALoCoQk6gdXwf0eTqApVnrkgEUvnv1J6nr6idcyhKg8Zfwt+HTTJ+cFWLsRklY+dzOjsXxjGpk4Y X-Received: by 10.66.232.229 with SMTP id tr5mr15034045pac.16.1401695428083; Mon, 02 Jun 2014 00:50:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.84.72 with SMTP id k66ls1917793qgd.96.gmail; Mon, 02 Jun 2014 00:50:27 -0700 (PDT) X-Received: by 10.220.161.8 with SMTP id p8mr28992292vcx.4.1401695427949; Mon, 02 Jun 2014 00:50:27 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id v2si7528385vcn.15.2014.06.02.00.50.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Jun 2014 00:50:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.177 as permitted sender) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id db11so4719873veb.22 for ; Mon, 02 Jun 2014 00:50:27 -0700 (PDT) X-Received: by 10.58.135.136 with SMTP id ps8mr28735170veb.18.1401695427880; Mon, 02 Jun 2014 00:50:27 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp78768vcb; Mon, 2 Jun 2014 00:50:27 -0700 (PDT) X-Received: by 10.180.83.131 with SMTP id q3mr19497660wiy.31.1401695427030; Mon, 02 Jun 2014 00:50:27 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id qq3si23967672wjc.3.2014.06.02.00.50.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Jun 2014 00:50:27 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.50 as permitted sender) client-ip=74.125.82.50; Received: by mail-wg0-f50.google.com with SMTP id x12so4601131wgg.33 for ; Mon, 02 Jun 2014 00:50:26 -0700 (PDT) X-Received: by 10.194.19.161 with SMTP id g1mr45666516wje.20.1401695426621; Mon, 02 Jun 2014 00:50:26 -0700 (PDT) Received: from midway01-04-00.lavalab ([88.98.47.97]) by mx.google.com with ESMTPSA id je7sm30286772wic.14.2014.06.02.00.50.25 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Jun 2014 00:50:26 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, kim.phillips@freescale.com, a.rigo@virtualopensystems.com Cc: eric.auger@linaro.org, christophe.barnichon@st.com, kvmarm@lists.cs.columbia.edu, alex.williamson@redhat.com, agraf@suse.de, peter.maydell@linaro.org, stuart.yoder@freescale.com, a.motakis@virtualopensystems.com, patches@linaro.org, Kim Phillips Subject: [RFC v3 02/10] vfio: move hw/misc/vfio.c to hw/vfio/pci.c Date: Mon, 2 Jun 2014 08:49:26 +0100 Message-Id: <1401695374-4287-3-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1401695374-4287-1-git-send-email-eric.auger@linaro.org> References: <1401695374-4287-1-git-send-email-eric.auger@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 97c9fa1..0b58184 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -613,7 +613,7 @@ F: tests/usb-hcd-ehci-test.c 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