[PATCH 9/9] Move msix.o build back to Makefile.objs

Avi Kivity
2010-09-20T15:06:53Z

Now that hw/msix.c does not depend on CONFIG_KVM, remove it from
Makefile.target and put it back in Makefile.objs.

Signed-off-by: Avi Kivity <avi@redhat.com>
---
Makefile.objs | 4 +---
Makefile.target | 4 ----
2 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/Makefile.objs b/Makefile.objs
index dbee210..44b2399 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -196,9 +196,7 @@ hw-obj-$(CONFIG_PIIX4) += piix4.o
# PCI watchdog devices
hw-obj-y += wdt_i6300esb.o

-# MSI-X depends on kvm for interrupt injection,
-# so moved it from Makefile.objs to Makefile.target for now
-# hw-obj-y += msix.o
+hw-obj-y += msix.o

# PCI network cards
hw-obj-y += ne2000.o
diff --git a/Makefile.target b/Makefile.target
index 5c1eec4..7c8f19c 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -183,10 +183,6 @@ obj-y += rwhandler.o
obj-$(CONFIG_KVM) += kvm.o kvm-all.o
obj-$(CONFIG_NO_KVM) += kvm-stub.o

-# MSI-X depends on kvm for interrupt injection,
-# so moved it from Makefile.objs to Makefile.target for now
-obj-y += msix.o
-
LIBS+=-lz

QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
--
1.7.2.3