From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWX4X-0008P9-41 for qemu-devel@nongnu.org; Mon, 21 May 2012 14:11:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SWX4T-0001AC-9V for qemu-devel@nongnu.org; Mon, 21 May 2012 14:11:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41566) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWX4T-000188-18 for qemu-devel@nongnu.org; Mon, 21 May 2012 14:11:05 -0400 From: Avi Kivity Date: Mon, 21 May 2012 19:37:40 +0300 Message-Id: <1337618267-16669-13-git-send-email-avi@redhat.com> In-Reply-To: <1337618267-16669-1-git-send-email-avi@redhat.com> References: <1337618267-16669-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 12/19] kvm: Rename kvm_irqchip_add_route to kvm_irqchip_add_irq_route List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Jan Kiszka , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org From: Jan Kiszka We will add kvm_irqchip_add_msi_route, so let's make the difference clearer. Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity --- hw/pc_piix.c | 8 ++++---- kvm-all.c | 2 +- kvm.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 6a75718..c17f906 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -63,17 +63,17 @@ static void kvm_piix3_setup_irq_routing(bool pci_enabled) if (i == 2) { continue; } - kvm_irqchip_add_route(s, i, KVM_IRQCHIP_PIC_MASTER, i); + kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_MASTER, i); } for (i = 8; i < 16; ++i) { - kvm_irqchip_add_route(s, i, KVM_IRQCHIP_PIC_SLAVE, i - 8); + kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_SLAVE, i - 8); } if (pci_enabled) { for (i = 0; i < 24; ++i) { if (i == 0) { - kvm_irqchip_add_route(s, i, KVM_IRQCHIP_IOAPIC, 2); + kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, 2); } else if (i != 2) { - kvm_irqchip_add_route(s, i, KVM_IRQCHIP_IOAPIC, i); + kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, i); } } } diff --git a/kvm-all.c b/kvm-all.c index 1913d6a..0117837 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -935,7 +935,7 @@ static void kvm_add_routing_entry(KVMState *s, set_gsi(s, entry->gsi); } -void kvm_irqchip_add_route(KVMState *s, int irq, int irqchip, int pin) +void kvm_irqchip_add_irq_route(KVMState *s, int irq, int irqchip, int pin) { struct kvm_irq_routing_entry e; diff --git a/kvm.h b/kvm.h index 7857dbf..8b061bd 100644 --- a/kvm.h +++ b/kvm.h @@ -134,7 +134,7 @@ void kvm_arch_init_irq_routing(KVMState *s); int kvm_irqchip_set_irq(KVMState *s, int irq, int level); int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg); -void kvm_irqchip_add_route(KVMState *s, int gsi, int irqchip, int pin); +void kvm_irqchip_add_irq_route(KVMState *s, int gsi, int irqchip, int pin); int kvm_irqchip_commit_routes(KVMState *s); void kvm_put_apic_state(DeviceState *d, struct kvm_lapic_state *kapic); -- 1.7.10.1