Skip to contentSkip to conversation

qemu-kvm: move msi-x to Makefile.target

PATCH Applied Michael S. Tsirkin 2 participants 4 messages Oct 6, 2009 – Oct 8, 2009

Subsystems (2)
KVM Kbuild
lore
Share & tools
lore

Michael S. Tsirkin

author
#0 lore raw

PATCH 1/1 qemu-kvm: move msi-x to Makefile.target

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 <[email protected]>
---
 Makefile.hw     |    4 +++-
 Makefile.target |    3 +++
 2 files changed, 6 insertions(+), 1 deletions(-)
Makefile.hw +3 -1
index 830902b..dcb61aa 100644
@@ -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
Makefile.target +3 -0
index e991fa3..acee285 100644
@@ -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
Signature · 1 line
1.6.5.rc2
Applied
#1 lore raw
Quoted 8 lines · Michael S. Tsirkin

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.

Applied, thanks.

Signature · 1 line
error compiling committee.c: too many arguments to function
#2 lore raw
Quoted 11 lines · Avi Kivity
Quoted 7 lines · Michael S. Tsirkin

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.

Applied, thanks.

Er, this doesn't build:

In file included from /home/avi/qemu-kvm/hw/msix.c:18:
/home/avi/qemu-kvm/qemu-kvm.h:1234: error: field ‘kvm_sw_breakpoints’ has incomplete type

Dropped.

Signature · 1 line
error compiling committee.c: too many arguments to function
#3 lore raw
Quoted 13 lines · Avi Kivity
Quoted 11 lines · Avi Kivity
Quoted 7 lines · Michael S. Tsirkin

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.

Applied, thanks.

Quoted 7 lines

Er, this doesn't build:

In file included from /home/avi/qemu-kvm/hw/msix.c:18:
/home/avi/qemu-kvm/qemu-kvm.h:1234: error: field ‘kvm_sw_breakpoints’ has incomplete type

Dropped.

And re-applied, after seeing your previous fix.

Signature · 1 line
error compiling committee.c: too many arguments to function