[PATCH] qemu-kvm: move msi-x to Makefile.target

[PATCH] qemu-kvm: move msi-x to Makefile.target

[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.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 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

Re: [PATCH] qemu-kvm: move msi-x to Makefile.target

[Avi Kivity]

On 10/06/2009 02:21 PM, Michael S. Tsirkin wrote:
> 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.

-- 
error compiling committee.c: too many arguments to function

Re: [PATCH] qemu-kvm: move msi-x to Makefile.target

[Avi Kivity]

On 10/08/2009 02:43 PM, Avi Kivity wrote:
> On 10/06/2009 02:21 PM, Michael S. Tsirkin wrote:
>> 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.

-- 
error compiling committee.c: too many arguments to function

Re: [PATCH] qemu-kvm: move msi-x to Makefile.target

[Avi Kivity]

On 10/08/2009 02:57 PM, Avi Kivity wrote:
> On 10/08/2009 02:43 PM, Avi Kivity wrote:
>> On 10/06/2009 02:21 PM, Michael S. Tsirkin wrote:
>>> 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.
>

And re-applied, after seeing your previous fix.

-- 
error compiling committee.c: too many arguments to function