Patchwork [25/35] hw: move VFIO and ivshmem to hw/misc/

login
register
mail settings
Submitter Paolo Bonzini
Date April 4, 2013, 7:23 p.m.
Message ID <1365103395-11547-26-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/233918/
State New
Headers show

Comments

Paolo Bonzini - April 4, 2013, 7:23 p.m.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 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/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

Patch

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
+