From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNplg-00025S-GJ for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:24:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNple-00020z-V4 for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:24:16 -0400 Received: from mail-wi0-x22b.google.com ([2a00:1450:400c:c05::22b]:47006) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNple-00020n-Mi for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:24:14 -0400 Received: by mail-wi0-f171.google.com with SMTP id hn17so5066024wib.16 for ; Thu, 04 Apr 2013 12:24:14 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 4 Apr 2013 21:23:05 +0200 Message-Id: <1365103395-11547-26-git-send-email-pbonzini@redhat.com> In-Reply-To: <1365103395-11547-1-git-send-email-pbonzini@redhat.com> References: <1365103395-11547-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 25/35] hw: move VFIO and ivshmem to hw/misc/ 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/misc/Makefile.objs | 6 ++++++ hw/{ => misc}/ivshmem.c | 0 hw/{vfio_pci.c => misc/vfio.c} | 0 4 files changed, 6 insertions(+), 10 deletions(-) rename hw/{ => misc}/ivshmem.c (100%) rename hw/{vfio_pci.c => misc/vfio.c} (100%) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 297efce..c25e228 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -29,13 +29,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/misc/Makefile.objs b/hw/misc/Makefile.objs index 009b1d9..9b1ab39 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -9,3 +9,9 @@ common-obj-$(CONFIG_PL310) += arm_l2x0.o common-obj-$(CONFIG_PUV3) += puv3_pm.o common-obj-$(CONFIG_MACIO) += macio/ + +ifeq ($(CONFIG_PCI), y) +obj-$(CONFIG_KVM) += ivshmem.o +obj-$(CONFIG_LINUX) += vfio.o +endif + diff --git a/hw/ivshmem.c b/hw/misc/ivshmem.c similarity index 100% rename from hw/ivshmem.c rename to hw/misc/ivshmem.c diff --git a/hw/vfio_pci.c b/hw/misc/vfio.c similarity index 100% rename from hw/vfio_pci.c rename to hw/misc/vfio.c -- 1.8.1.4