From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58472 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q4YzW-0000x2-Ao for qemu-devel@nongnu.org; Tue, 29 Mar 2011 09:29:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q4YzV-0006U0-5c for qemu-devel@nongnu.org; Tue, 29 Mar 2011 09:29:50 -0400 Received: from cantor.suse.de ([195.135.220.2]:48620 helo=mx1.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q4YzU-0006To-US for qemu-devel@nongnu.org; Tue, 29 Mar 2011 09:29:49 -0400 From: Alexander Graf Date: Tue, 29 Mar 2011 15:29:28 +0200 Message-Id: <1301405386-25738-2-git-send-email-agraf@suse.de> In-Reply-To: <1301405386-25738-1-git-send-email-agraf@suse.de> References: <1301405386-25738-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 01/19] Only build ivshmem when CONFIG_PCI && CONFIG_KVM List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Juan Quintela , Cam Macdonell , aurelien@aurel32.net, rth@twiddle.net 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 CC: Cam Macdonell CC: Juan Quintela --- Makefile.target | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) 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 -- 1.6.0.2