summaryrefslogtreecommitdiffstats
path: root/Makefile.target
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2011-03-29 15:29:28 +0200
committerAurelien Jarno <aurelien@aurel32.net>2011-04-04 00:34:08 +0200
commit1b01b4e717ada625575c207105b0b270c0b8467d (patch)
tree5d23b138bf45b73d39e77539be6ee95c25acb96d /Makefile.target
parent6d65516f774c62a1abde3e52b689ac743b9ccc71 (diff)
downloadhqemu-1b01b4e717ada625575c207105b0b270c0b8467d.zip
hqemu-1b01b4e717ada625575c207105b0b270c0b8467d.tar.gz
Only build ivshmem when CONFIG_PCI && CONFIG_KVM
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>
Diffstat (limited to 'Makefile.target')
-rw-r--r--Makefile.target8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target
index ddb0931..04e20dd 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -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
OpenPOWER on IntegriCloud