From: Alexander Graf <agraf@suse.de>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, Juan Quintela <quintela@redhat.com>,
Cam Macdonell <cam@cs.ualberta.ca>,
aurelien@aurel32.net, rth@twiddle.net
Subject: [Qemu-devel] [PATCH 01/19] Only build ivshmem when CONFIG_PCI && CONFIG_KVM
Date: Tue, 29 Mar 2011 15:29:28 +0200 [thread overview]
Message-ID: <1301405386-25738-2-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1301405386-25738-1-git-send-email-agraf@suse.de>
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(-)
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
next prev parent reply other threads:[~2011-03-29 13:29 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-29 13:29 [Qemu-devel] [PATCH 00/19] s390x emulation support Alexander Graf
2011-03-29 13:29 ` Alexander Graf [this message]
2011-03-29 13:29 ` [Qemu-devel] [PATCH 02/19] virtio: use generic name when possible Alexander Graf
2011-03-29 13:29 ` [Qemu-devel] [PATCH 03/19] s390x: fix KVM target Alexander Graf
2011-03-29 13:29 ` [Qemu-devel] [PATCH 04/19] s390x: fix s390-virtio-serial Alexander Graf
2011-03-29 14:17 ` [Qemu-devel] " Amit Shah
2011-03-29 13:29 ` [Qemu-devel] [PATCH 05/19] s390x: Enable disassembler for s390x Alexander Graf
2011-03-29 13:29 ` [Qemu-devel] [PATCH 06/19] s390x: Enable nptl " Alexander Graf
2011-03-29 13:29 ` [Qemu-devel] [PATCH 07/19] s390x: enable CPU_QuadU Alexander Graf
2011-03-29 13:29 ` [Qemu-devel] [PATCH 08/19] s390x: s390x-linux-user support Alexander Graf
2011-03-29 13:29 ` [Qemu-devel] [PATCH 09/19] linux-user: define a couple of syscalls for non-uid16 targets Alexander Graf
2011-03-29 13:29 ` [Qemu-devel] [PATCH 10/19] s390x: Enable s390x-softmmu target Alexander Graf
2011-03-29 13:29 ` [Qemu-devel] [PATCH 11/19] s390x: Dispatch interrupts to KVM or the real CPU Alexander Graf
2011-03-29 13:29 ` [Qemu-devel] [PATCH 12/19] s390x: Adjust GDB stub Alexander Graf
2011-03-29 13:29 ` [Qemu-devel] [PATCH 13/19] s390x: virtio machine storage keys Alexander Graf
2011-03-29 13:29 ` [Qemu-devel] [PATCH 14/19] s390x: Prepare cpu.h for emulation Alexander Graf
2011-03-29 13:29 ` [Qemu-devel] [PATCH 15/19] s390x: helper functions for system emulation Alexander Graf
2011-03-29 13:29 ` [Qemu-devel] [PATCH 16/19] s390x: Implement opcode helpers Alexander Graf
2011-03-29 16:13 ` [Qemu-devel] " Richard Henderson
2011-03-29 16:25 ` Alexander Graf
2011-03-29 13:29 ` [Qemu-devel] [PATCH 17/19] s390x: Adjust internal kvm code Alexander Graf
2011-03-29 13:29 ` [Qemu-devel] [PATCH 18/19] s390x: translate engine for s390x CPU Alexander Graf
2011-03-29 13:29 ` [Qemu-devel] [PATCH 19/19] s390x: build s390x by default Alexander Graf
2011-03-30 10:23 ` [Qemu-devel] Re: [PATCH 00/19] s390x emulation support Peter Maydell
2011-03-30 10:46 ` Alexander Graf
2011-03-30 15:14 ` Peter Maydell
2011-04-03 22:37 ` [Qemu-devel] " Aurelien Jarno
2011-04-03 22:43 ` Alexander Graf
2011-04-04 9:29 ` Alexander Graf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1301405386-25738-2-git-send-email-agraf@suse.de \
--to=agraf@suse.de \
--cc=aurelien@aurel32.net \
--cc=cam@cs.ualberta.ca \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).