From: Alex Williamson <alex.williamson@redhat.com>
To: mst@redhat.com
Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org, alex.williamson@redhat.com
Subject: [PATCH 2/2] msix: Pull in config.h for CONFIG_KVM
Date: Fri, 22 Oct 2010 14:40:39 -0600 [thread overview]
Message-ID: <20101022204037.10161.83407.stgit@s20.home> (raw)
In-Reply-To: <20101022193845.10161.52907.stgit@s20.home>
We need to pull in config.h or else kvm.h doesn't pull in
linux/config.h, which we need if we ever want KVM_CAP_IRQCHIP
defined. This requires moving the object over to Makefile.target
or else we can't find config-target.h
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
Makefile.objs | 2 --
Makefile.target | 1 +
hw/msix.c | 1 +
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index ca2d2d0..c097d25 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -201,8 +201,6 @@ hw-obj-$(CONFIG_PIIX4) += piix4.o
# PCI watchdog devices
hw-obj-y += wdt_i6300esb.o
-hw-obj-y += msix.o
-
# PCI network cards
hw-obj-y += ne2000.o
hw-obj-y += eepro100.o
diff --git a/Makefile.target b/Makefile.target
index 347ad6b..63da13b 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -185,6 +185,7 @@ obj-y += rwhandler.o
obj-$(CONFIG_KVM) += kvm.o kvm-all.o
obj-$(CONFIG_NO_KVM) += kvm-stub.o
obj-y += memory.o
+obj-y += msix.o
LIBS+=-lz
diff --git a/hw/msix.c b/hw/msix.c
index 4122395..23256c9 100644
--- a/hw/msix.c
+++ b/hw/msix.c
@@ -11,6 +11,7 @@
* the COPYING file in the top-level directory.
*/
+#include "config.h"
#include "hw.h"
#include "msix.h"
#include "pci.h"
next prev parent reply other threads:[~2010-10-22 20:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-22 20:31 [PATCH 0/2] msix: couple fixes Alex Williamson
2010-10-22 20:40 ` [PATCH 1/2] msix: Allow msix_init on a device with existing MSI-X capability Alex Williamson
2010-10-23 16:18 ` Michael S. Tsirkin
2010-10-23 16:55 ` Alex Williamson
2010-10-28 15:00 ` Avi Kivity
2010-11-01 15:56 ` Alex Williamson
2010-10-22 20:40 ` Alex Williamson [this message]
2010-10-23 1:50 ` [PATCH 2/2] msix: Pull in config.h for CONFIG_KVM Alex Williamson
2010-10-23 7:41 ` Paolo Bonzini
2010-10-23 16:16 ` Michael S. Tsirkin
2010-10-23 16:52 ` Alex Williamson
2010-10-23 17:29 ` Michael S. Tsirkin
2010-10-23 18:42 ` Alex Williamson
2010-10-23 20:38 ` Michael S. Tsirkin
2010-10-23 21:01 ` Alex Williamson
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=20101022204037.10161.83407.stgit@s20.home \
--to=alex.williamson@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.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