]> git.proxmox.com Git - qemu.git/commitdiff
Only build ivshmem when CONFIG_PCI && CONFIG_KVM
authorAlexander Graf <agraf@suse.de>
Tue, 29 Mar 2011 13:29:28 +0000 (15:29 +0200)
committerAurelien Jarno <aurelien@aurel32.net>
Sun, 3 Apr 2011 22:34:08 +0000 (00:34 +0200)
The ivshmem depends on PCI and KVM, not only KVM. Reflect this
in the Makefile, so we don't get build errors on s390x.

Signed-off-by: Alexander Graf <agraf@suse.de>
CC: Cam Macdonell <cam@cs.ualberta.ca>
CC: Juan Quintela <quintela@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Makefile.target

index ddb0931f68bf39f44410b91c976940391b11fd00..04e20dde9507276ca81a2b00fb3a171f23d9aa8d 100644 (file)
@@ -209,7 +209,13 @@ QEMU_CFLAGS += $(VNC_PNG_CFLAGS)
 obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o
 
 # Inter-VM PCI shared memory
-obj-$(CONFIG_KVM) += ivshmem.o
+CONFIG_IVSHMEM =
+ifeq ($(CONFIG_KVM), y)
+  ifeq ($(CONFIG_PCI), y)
+    CONFIG_IVSHMEM = y
+  endif
+endif
+obj-$(CONFIG_IVSHMEM) += ivshmem.o
 
 # Hardware support
 obj-i386-y += vga.o