diff mbox

[Bug,Report] Compile error in current uq/master

Message ID CABpY8MJ7q5WPCmpeJNs0pXaSaPEG+BL1GKjJjRXx-p-MBRppFA@mail.gmail.com
State New
Headers show

Commit Message

Arthur Chunqi Li Aug. 14, 2013, 2:20 a.m. UTC 
Hi Paolo and Vincenzo,

Here is a compile error in current uq/master
(ca916d3729564d0eb3c2374a96903f7e8aced8a7) as follows:

/root/qemu-kvm.git/kvm-stub.c:138:5: error: conflicting types for
'kvm_irqchip_add_irqfd_notifier'
/root/qemu-kvm.git/include/sysemu/kvm.h:312:5: note: previous
declaration of 'kvm_irqchip_add_irqfd_notifier' was here
make[1]: *** [kvm-stub.o] Error 1

This bug is related to the latest patch
ca916d3729564d0eb3c2374a96903f7e8aced8a7 in uq/master. Which needs a
patch:

---
 }
diff mbox

Patch

diff --git a/kvm-stub.c b/kvm-stub.c
index 7b2233a..806b044 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -135,7 +135,8 @@  int kvm_irqchip_update_msi_route(KVMState *s, int
virq, MSIMessage msg)
     return -ENOSYS;
 }

-int kvm_irqchip_add_irqfd_notifier(KVMState *s, EventNotifier *n, int virq)
+int kvm_irqchip_add_irqfd_notifier(KVMState *s, EventNotifier *n,
+                                   EventNotifier *rn, int virq)
 {
     return -ENOSYS;