[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/19] kvm: Rename kvm_irqchip_add_route to kvm_irqc
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 12/19] kvm: Rename kvm_irqchip_add_route to kvm_irqchip_add_irq_route |
Date: |
Mon, 21 May 2012 19:37:40 +0300 |
From: Jan Kiszka <address@hidden>
We will add kvm_irqchip_add_msi_route, so let's make the difference
clearer.
Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
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
- [Qemu-devel] [PATCH 06/19] kvm: Update kernel headers, (continued)
- [Qemu-devel] [PATCH 06/19] kvm: Update kernel headers, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 04/19] pc: Enable MSI support at APIC level, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 16/19] kvm: Introduce kvm_irqchip_add/remove_irqfd, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 03/19] kvm: Introduce basic MSI support for in-kernel irqchips, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 13/19] kvm: Introduce kvm_irqchip_add_msi_route, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 02/19] Introduce MSIMessage structure, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 07/19] kvm: Add support for direct MSI injections, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 18/19] msix: Add msix_nr_vectors_allocated, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 19/19] virtio/vhost: Add support for KVM in-kernel MSI injection, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 09/19] msix: Factor out msix_get_message, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 12/19] kvm: Rename kvm_irqchip_add_route to kvm_irqchip_add_irq_route,
Avi Kivity <=
- [Qemu-devel] [PATCH 05/19] kvm: x86: Wire up MSI support for in-kernel irqchip, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 15/19] kvm: Make kvm_irqchip_commit_routes an internal service, Avi Kivity, 2012/05/21
- [Qemu-devel] [PATCH 11/19] msix: Introduce vector notifiers, Avi Kivity, 2012/05/21