From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHe9e-0003CW-1X for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:47:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UHdys-000277-LE for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:36:30 -0400 Received: from mail-bk0-x22a.google.com ([2a00:1450:4008:c01::22a]:57714) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHdys-00026n-E7 for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:36:18 -0400 Received: by mail-bk0-f42.google.com with SMTP id jk7so2648828bkc.15 for ; Mon, 18 Mar 2013 10:36:17 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 18 Mar 2013 18:35:17 +0100 Message-Id: <1363628125-5310-28-git-send-email-pbonzini@redhat.com> In-Reply-To: <1363628125-5310-1-git-send-email-pbonzini@redhat.com> References: <1363628125-5310-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 27/35] hw: move VFIO and ivshmem to hw/pci/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- hw/Makefile.objs | 10 ---------- hw/pci/Makefile.objs | 5 +++++ hw/{ => pci}/ivshmem.c | 0 hw/{vfio_pci.c => pci/vfio.c} | 0 4 files changed, 5 insertions(+), 10 deletions(-) rename hw/{ => pci}/ivshmem.c (100%) rename hw/{vfio_pci.c => pci/vfio.c} (100%) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index a57dd9a..7ba0d11 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -28,13 +28,3 @@ devices-dirs-$(CONFIG_SOFTMMU) += xen/ common-obj-y += core/ common-obj-y += $(devices-dirs-y) obj-y += $(devices-dirs-y) - -ifeq ($(CONFIG_SOFTMMU),y) - -# Inter-VM PCI shared memory & VFIO PCI device assignment -ifeq ($(CONFIG_PCI), y) -obj-$(CONFIG_KVM) += ivshmem.o -obj-$(CONFIG_LINUX) += vfio_pci.o -endif - -endif diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs index 8b20135..9086b3b 100644 --- a/hw/pci/Makefile.objs +++ b/hw/pci/Makefile.objs @@ -26,6 +26,11 @@ common-obj-$(CONFIG_PPCE500_PCI) += host-ppce500.o # ARM devices common-obj-$(CONFIG_VERSATILE_PCI) += host-versatile.o +ifeq ($(CONFIG_PCI), y) +obj-$(CONFIG_KVM) += ivshmem.o +obj-$(CONFIG_LINUX) += vfio.o +endif + obj-$(CONFIG_PCI_APB) += host-apb.o obj-$(CONFIG_FULONG) += host-bonito.o obj-$(CONFIG_PCI_PIIX) += host-piix.o diff --git a/hw/ivshmem.c b/hw/pci/ivshmem.c similarity index 100% rename from hw/ivshmem.c rename to hw/pci/ivshmem.c diff --git a/hw/vfio_pci.c b/hw/pci/vfio.c similarity index 100% rename from hw/vfio_pci.c rename to hw/pci/vfio.c -- 1.8.1.4