From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45590) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VEKy3-0004Jt-9X for qemu-devel@nongnu.org; Tue, 27 Aug 2013 11:14:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VEKxu-0006gZ-Sz for qemu-devel@nongnu.org; Tue, 27 Aug 2013 11:14:03 -0400 Received: from mail-wi0-x22b.google.com ([2a00:1450:400c:c05::22b]:48883) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VEKxu-0006gQ-Me for qemu-devel@nongnu.org; Tue, 27 Aug 2013 11:13:54 -0400 Received: by mail-wi0-f171.google.com with SMTP id ez12so749130wid.10 for ; Tue, 27 Aug 2013 08:13:53 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 27 Aug 2013 17:13:44 +0200 Message-Id: <1377616424-26493-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH uq/master] kvm-stub: fix compilation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: gleb@redhat.com, kvm@vger.kernel.org Non-KVM targets fail compilation on the uq/master branch. Fix the prototype of kvm_irqchip_add_irqfd_notifier to match the one in kvm-all.c. Signed-off-by: Paolo Bonzini --- Gleb, can you add it on top, or squash it, and resend the pull request to Anthony? Bisectability is not a huge problem, because all patches between the breakage point and this one would only affect targets with KVM enabled. However, it would be a bit cleaner to squash. kvm-stub.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; } -- 1.8.3.1