From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXMAA-0005pu-ID for qemu-devel@nongnu.org; Tue, 30 Apr 2013 21:48:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UXMA5-0006zo-TK for qemu-devel@nongnu.org; Tue, 30 Apr 2013 21:48:54 -0400 From: Scott Wood Date: Tue, 30 Apr 2013 20:48:27 -0500 Message-ID: <1367372912-23519-4-git-send-email-scottwood@freescale.com> In-Reply-To: <1367372912-23519-1-git-send-email-scottwood@freescale.com> References: <1367372912-23519-1-git-send-email-scottwood@freescale.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 4/9] KVM: Export kvm_init_irq_routing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Graf Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org From: Alexander Graf On PPC, we can have different types of interrupt controllers, so we really only know that we are going to use one when we created it. Export kvm_init_irq_routing() to common code, so that we don't have to call kvm_irqchip_create(). Signed-off-by: Alexander Graf --- include/sysemu/kvm.h | 1 + kvm-all.c | 4 ++-- kvm-stub.c | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 4a010c6..9833b20 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -302,4 +302,5 @@ int kvm_irqchip_add_irqfd_notifier(KVMState *s, EventNotifier *n, int virq); int kvm_irqchip_remove_irqfd_notifier(KVMState *s, EventNotifier *n, int virq); void kvm_pc_gsi_handler(void *opaque, int n, int level); void kvm_pc_setup_irq_routing(bool pci_enabled); +void kvm_init_irq_routing(KVMState *s); #endif diff --git a/kvm-all.c b/kvm-all.c index 7976b2d..296ed0c 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -926,7 +926,7 @@ static void clear_gsi(KVMState *s, unsigned int gsi) s->used_gsi_bitmap[gsi / 32] &= ~(1U << (gsi % 32)); } -static void kvm_init_irq_routing(KVMState *s) +void kvm_init_irq_routing(KVMState *s) { int gsi_count, i; @@ -1214,7 +1214,7 @@ static int kvm_irqchip_assign_irqfd(KVMState *s, int fd, int virq, bool assign) #else /* !KVM_CAP_IRQ_ROUTING */ -static void kvm_init_irq_routing(KVMState *s) +void kvm_init_irq_routing(KVMState *s) { } diff --git a/kvm-stub.c b/kvm-stub.c index 5f52186..ffd4e64 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -116,6 +116,10 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg) return -ENOSYS; } +void kvm_init_irq_routing(KVMState *s) +{ +} + void kvm_irqchip_release_virq(KVMState *s, int virq) { } -- 1.7.10.4