diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 15:41:36 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:14 +0200 |
| commit | ba25df88cc004dffad908b54a71ad8510551e6d2 (patch) | |
| tree | 900c53772b3ee8a42a5be1118d0a320be64bc3a2 /hw | |
| parent | c0907c9e6417cb959dfd9ef6873221536ec91351 (diff) | |
hw: move VFIO and ivshmem to hw/misc/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/Makefile.objs | 10 | ||||
| -rw-r--r-- | hw/misc/Makefile.objs | 6 | ||||
| -rw-r--r-- | hw/misc/ivshmem.c (renamed from hw/ivshmem.c) | 0 | ||||
| -rw-r--r-- | hw/misc/vfio.c (renamed from hw/vfio_pci.c) | 0 |
4 files changed, 6 insertions, 10 deletions
diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 8d0cc1fa9c..1cb86fa323 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 009b1d9f01..9b1ab39fbe 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 index f92ce19dde..f92ce19dde 100644 --- a/hw/ivshmem.c +++ b/hw/misc/ivshmem.c diff --git a/hw/vfio_pci.c b/hw/misc/vfio.c index 693a9ffdda..693a9ffdda 100644 --- a/hw/vfio_pci.c +++ b/hw/misc/vfio.c |