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@xxxxxxxxxx> --- 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 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
