From patchwork Tue Sep 9 07:31:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 37026 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f69.google.com (mail-qg0-f69.google.com [209.85.192.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4B41320491 for ; Tue, 9 Sep 2014 07:31:38 +0000 (UTC) Received: by mail-qg0-f69.google.com with SMTP id q107sf3265063qgd.4 for ; Tue, 09 Sep 2014 00:31:38 -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=zzkeLsucJx18N3pkZeIIvX0yZ7Qw3pIxHf600o0nJMs=; b=SA+FVAC/4Aej5uAfTzOjiDPONQFCo8vvZaQKs6LIewuzc4t1sOsa49VDufU4WUTYSx fYl/4Vuev31YK6zurnOMNFrWFa8gFcrYsSNFfaJmfMfcQnk50UulIPaB85rcnFbDgQMa gMWsCaPpqLv2WDxRvyiKOCqK8qlB9DIIroi9ZJTyXA6ITqwqGIy834tLEs5PyTFzShd5 UFnaqNEJOKgD56AhdR/OCxDfCmV/9u8bZjIW7suMFQVrv0II7Tai5Q2iRrfFVWcuUNqu KzUrc6d4GD/pJ2L0+RHezzCCAHGoqa6oUlfAfyWk/dahbPHa9cdXVN9lHmVZBvwSUGIR d3Tg== X-Gm-Message-State: ALoCoQk+HEcAA6wPPr+mtDXJA17DLesLgb4rksqZPw1us4rWG+9IgO6pkgAh61xcvItLHoVWJF+L X-Received: by 10.236.201.99 with SMTP id a63mr3500592yho.19.1410247898135; Tue, 09 Sep 2014 00:31:38 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.91.34 with SMTP id y31ls813041qgd.2.gmail; Tue, 09 Sep 2014 00:31:38 -0700 (PDT) X-Received: by 10.52.128.104 with SMTP id nn8mr3718564vdb.50.1410247898038; Tue, 09 Sep 2014 00:31:38 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id ub6si4921978vcb.35.2014.09.09.00.31.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:31:38 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id ik5so62406vcb.14 for ; Tue, 09 Sep 2014 00:31:38 -0700 (PDT) X-Received: by 10.52.35.105 with SMTP id g9mr591489vdj.61.1410247897971; Tue, 09 Sep 2014 00:31:37 -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.221.45.67 with SMTP id uj3csp244008vcb; Tue, 9 Sep 2014 00:31:37 -0700 (PDT) X-Received: by 10.195.11.234 with SMTP id el10mr41035297wjd.95.1410247897035; Tue, 09 Sep 2014 00:31:37 -0700 (PDT) Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by mx.google.com with ESMTPS id ch6si16124178wjb.106.2014.09.09.00.31.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:31:37 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.45 as permitted sender) client-ip=74.125.82.45; Received: by mail-wg0-f45.google.com with SMTP id z12so2188044wgg.4 for ; Tue, 09 Sep 2014 00:31:36 -0700 (PDT) X-Received: by 10.180.36.165 with SMTP id r5mr28560791wij.73.1410247896645; Tue, 09 Sep 2014 00:31:36 -0700 (PDT) Received: from midway01-04-00.lavalab ([88.98.47.97]) by mx.google.com with ESMTPSA id s1sm14513743wiw.6.2014.09.09.00.31.35 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 00:31:35 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, a.rigo@virtualopensystems.com, kim.phillips@freescale.com, marc.zyngier@arm.com, manish.jaggi@caviumnetworks.com, joel.schopp@amd.com, agraf@suse.de, peter.maydell@linaro.org, pbonzini@redhat.com, afaerber@suse.de Cc: eric.auger@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, will.deacon@arm.com, Bharat.Bhushan@freescale.com, stuart.yoder@freescale.com, a.motakis@virtualopensystems.com, alex.williamson@redhat.com, Kim Phillips Subject: [PATCH v6 01/16] vfio: move hw/misc/vfio.c to hw/vfio/pci.c Move vfio.h into include/hw/vfio Date: Tue, 9 Sep 2014 08:31:01 +0100 Message-Id: <1410247876-4967-2-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1410247876-4967-1-git-send-email-eric.auger@linaro.org> References: <1410247876-4967-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.220.169 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/ppc/spapr_pci_vfio.c | 2 +- hw/vfio/Makefile.objs | 3 +++ hw/{misc/vfio.c => vfio/pci.c} | 2 +- include/hw/{misc => vfio}/vfio.h | 0 8 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 hw/vfio/Makefile.objs rename hw/{misc/vfio.c => vfio/pci.c} (99%) rename include/hw/{misc => vfio}/vfio.h (100%) diff --git a/include/hw/misc/vfio.h b/include/hw/vfio/vfio.h similarity index 100% rename from include/hw/misc/vfio.h rename to include/hw/vfio/vfio.h 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 206bf7e..8683f62 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -625,7 +625,7 @@ F: tests/usb-*-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 52a1464..73afa41 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 86f6243..9b77554 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/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c index d3bddf2..144912b 100644 --- a/hw/ppc/spapr_pci_vfio.c +++ b/hw/ppc/spapr_pci_vfio.c @@ -20,7 +20,7 @@ #include "hw/ppc/spapr.h" #include "hw/pci-host/spapr.h" #include "linux/vfio.h" -#include "hw/misc/vfio.h" +#include "hw/vfio/vfio.h" static Property spapr_phb_vfio_properties[] = { DEFINE_PROP_INT32("iommu", sPAPRPHBVFIOState, iommugroupid, -1), 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 diff --git a/hw/misc/vfio.c b/hw/vfio/pci.c similarity index 99% rename from hw/misc/vfio.c rename to hw/vfio/pci.c index 3d32657..7e6a1bc 100644 --- a/hw/misc/vfio.c +++ b/hw/vfio/pci.c @@ -39,8 +39,8 @@ #include "qemu/range.h" #include "sysemu/kvm.h" #include "sysemu/sysemu.h" -#include "hw/misc/vfio.h" #include "trace.h" +#include "hw/vfio/vfio.h" /* Extra debugging, trap acceleration paths for more logging */ #define VFIO_ALLOW_MMAP 1