From: "Michael S. Tsirkin" <mst@redhat.com>
To: avi@redhat.com, kvm@vger.kernel.org, gleb@redhat.com
Subject: [PATCH] qemu-kvm: move msi-x to Makefile.target
Date: Tue, 6 Oct 2009 14:21:50 +0200 [thread overview]
Message-ID: <20091006122150.GA9525@redhat.com> (raw)
KVM interrupt injection support depends on target,
so MSI-X needs to be in Makefile.target for interrupt
injection to work. We'll be able to clean it up once
interrupt injection is upstream.
This fixes virtio breakage with kvm caused by 263b7947327e13.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
Makefile.hw | 4 +++-
Makefile.target | 3 +++
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Makefile.hw b/Makefile.hw
index 830902b..dcb61aa 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -22,7 +22,9 @@ obj-y += m48t59.o escc.o
# PCI watchdog devices
obj-y += wdt_i6300esb.o
-obj-y += msix.o
+# MSI-X depends on kvm for interrupt injection,
+# so moved it from Makefile.hw to Makefile.target for now
+# obj-y += msix.o
# PCI network cards
obj-y += ne2000.o
diff --git a/Makefile.target b/Makefile.target
index e991fa3..acee285 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -162,6 +162,9 @@ obj-y = vl.o monitor.o pci.o isa_mmio.o machine.o \
# need to fix this properly
obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o virtio-pci.o
obj-$(CONFIG_KVM) += kvm.o kvm-all.o
+# MSI-X depends on kvm for interrupt injection,
+# so moved it from Makefile.hw to Makefile.target for now
+obj-y += msix.o
LIBS+=-lz
--
1.6.5.rc2
next reply other threads:[~2009-10-06 12:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-06 12:21 Michael S. Tsirkin [this message]
2009-10-08 12:43 ` [PATCH] qemu-kvm: move msi-x to Makefile.target Avi Kivity
2009-10-08 12:57 ` Avi Kivity
2009-10-08 13:21 ` Avi Kivity
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=20091006122150.GA9525@redhat.com \
--to=mst@redhat.com \
--cc=avi@redhat.com \
--cc=gleb@redhat.com \
--cc=kvm@vger.kernel.org \
/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).