[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/2] msix: Pull in config.h for CONFIG_KVM
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PATCH 2/2] msix: Pull in config.h for CONFIG_KVM |
Date: |
Fri, 22 Oct 2010 14:40:39 -0600 |
User-agent: |
StGIT/0.14.3 |
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 <address@hidden>
---
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"
- [Qemu-devel] [PATCH 0/2] msix: couple fixes, Alex Williamson, 2010/10/22
- [Qemu-devel] [PATCH 2/2] msix: Pull in config.h for CONFIG_KVM,
Alex Williamson <=
- [Qemu-devel] Re: [PATCH 2/2] msix: Pull in config.h for CONFIG_KVM, Alex Williamson, 2010/10/22
- [Qemu-devel] Re: [PATCH 2/2] msix: Pull in config.h for CONFIG_KVM, Michael S. Tsirkin, 2010/10/23
- [Qemu-devel] Re: [PATCH 2/2] msix: Pull in config.h for CONFIG_KVM, Alex Williamson, 2010/10/23
- [Qemu-devel] Re: [PATCH 2/2] msix: Pull in config.h for CONFIG_KVM, Michael S. Tsirkin, 2010/10/23
- [Qemu-devel] Re: [PATCH 2/2] msix: Pull in config.h for CONFIG_KVM, Alex Williamson, 2010/10/23
- [Qemu-devel] Re: [PATCH 2/2] msix: Pull in config.h for CONFIG_KVM, Michael S. Tsirkin, 2010/10/23
- [Qemu-devel] Re: [PATCH 2/2] msix: Pull in config.h for CONFIG_KVM, Alex Williamson, 2010/10/23