From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 5 Feb 2013 14:41:36 +0000 (+0100)
Subject: hw: move VFIO and ivshmem to hw/misc/
X-Git-Tag: v1.5.0-rc0~313^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba25df88cc004dffad908b54a71ad8510551e6d2;p=thirdparty%2Fqemu.git

hw: move VFIO and ivshmem to hw/misc/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 8d0cc1fa9cf..1cb86fa323b 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -29,13 +29,3 @@ devices-dirs-$(CONFIG_SOFTMMU) += xen/
 devices-dirs-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 009b1d9f019..9b1ab39fbe8 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