From patchwork Mon May 14 21:07:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 159191 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 43A31B70EC for ; Tue, 15 May 2012 07:14:22 +1000 (EST) Received: from localhost ([::1]:55473 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SU2Vz-0000qe-V9 for incoming@patchwork.ozlabs.org; Mon, 14 May 2012 17:09:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SU2Uu-0006p4-EN for qemu-devel@nongnu.org; Mon, 14 May 2012 17:08:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SU2Us-0006wE-BQ for qemu-devel@nongnu.org; Mon, 14 May 2012 17:08:03 -0400 Received: from goliath.siemens.de ([192.35.17.28]:16460) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SU2Us-0006vw-1i for qemu-devel@nongnu.org; Mon, 14 May 2012 17:08:02 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id q4EL7wZt018517; Mon, 14 May 2012 23:07:59 +0200 Received: from mchn199C.mchp.siemens.de (atv01a8c.ww300.siemens.net [139.22.118.50]) by mail1.siemens.de (8.13.6/8.13.6) with SMTP id q4EL7kt2003259; Mon, 14 May 2012 23:07:57 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Mon, 14 May 2012 18:07:31 -0300 Message-Id: <10ce373030141d063434507dc3f63c393b66f469.1337029654.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.28 Cc: qemu-devel , kvm@vger.kernel.org, "Michael S. Tsirkin" Subject: [Qemu-devel] [RFC][PATCH 04/11] kvm: Rename kvm_irqchip_add_route to kvm_irqchip_add_irq_route X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We will add kvm_irqchip_add_msi_route, so let's make the difference clearer. Signed-off-by: Jan Kiszka --- 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 8f8cec5..8ab83db 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);