From mboxrd@z Thu Jan 1 00:00:00 1970 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) From: Eric Auger Date: Wed, 9 Apr 2014 16:33:05 +0100 Message-Id: <1397057589-11779-3-git-send-email-eric.auger@linaro.org> In-Reply-To: <1397057589-11779-1-git-send-email-eric.auger@linaro.org> References: <1397057589-11779-1-git-send-email-eric.auger@linaro.org> Subject: [Qemu-devel] [RFC v2 2/6] vfio: move hw/misc/vfio.c to hw/vfio/pci.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org 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 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/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 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 -- 1.8.3.2