Patchwork [01/19] Only build ivshmem when CONFIG_PCI && CONFIG_KVM

login
register
mail settings
Submitter Alexander Graf
Date March 29, 2011, 1:29 p.m.
Message ID <1301405386-25738-2-git-send-email-agraf@suse.de>
Download mbox | patch
Permalink /patch/88769/
State New
Headers show

Comments

Alexander Graf - March 29, 2011, 1:29 p.m.
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>
---
 Makefile.target |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

Patch

diff --git a/Makefile.target b/Makefile.target
index 62b102a..663a101 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