From: Alexander Graf <agraf@suse.de>
Date: Tue, 29 Mar 2011 13:29:28 +0000 (+0200)
Subject: Only build ivshmem when CONFIG_PCI && CONFIG_KVM
X-Git-Tag: qemu-xen-4.3.0-rc1~3081
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1b01b4e717ada625575c207105b0b270c0b8467d;p=qemu-upstream-4.4-testing.git

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>
---

diff --git a/Makefile.target b/Makefile.target
index ddb0931f6..04e20dde9 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