[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 25/35] hw: move VFIO and ivshmem to hw/misc/
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 25/35] hw: move VFIO and ivshmem to hw/misc/ |
Date: |
Thu, 4 Apr 2013 21:23:05 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- [Qemu-devel] [PATCH 11/35] hw: move MC146818RTC to hw/timer/, configure via default-configs/, (continued)
- [Qemu-devel] [PATCH 11/35] hw: move MC146818RTC to hw/timer/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 12/35] hw: move NICs to hw/net/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 14/35] hw: move audio devices to hw/audio/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 15/35] hw: move display devices to hw/display/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 17/35] hw: move SSI controllers to hw/ssi/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 16/35] hw: move I2C controllers to hw/i2c/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 18/35] hw: move SCSI controllers to hw/scsi/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 19/35] hw: move more files to hw/xen/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 21/35] hw: move ISA bridges and devices to hw/isa/, configure with default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 20/35] hw: move char devices to hw/char/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 25/35] hw: move VFIO and ivshmem to hw/misc/,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 23/35] hw: move SD/MMC devices to hw/sd/, configure with default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 26/35] hw: move DMA controllers to hw/dma/, configure with default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 24/35] hw: move PCI bridges to hw/pci-* or hw/ARCH, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 28/35] hw: move GPIO interfaces to hw/gpio/, configure with default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 22/35] hw: move timer devices to hw/timer/, configure with default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 29/35] hw: move NVRAM interfaces to hw/nvram/, configure with default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 02/35] hw: move headers to include/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 34/35] MAINTAINERS: update for source code movement, Paolo Bonzini, 2013/04/04