OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

kvm: Rename kvm_irqchip_add_route to kvm_irqchip_add_irq_route 

We will add kvm_irqchip_add_msi_route, so let's make the difference
clearer.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Jan Kiszka 2012-05-17 10:32:32 -03:00 committed by Avi Kivity
parent 2cdfe53c5f
commit 1df186df35
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/pc_piix.c
View File

@ -63,17 +63,17 @@ static void kvm_piix3_setup_irq_routing(bool pci_enabled)
if (i == 2) { if (i == 2) {
continue; 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) { 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) { if (pci_enabled) {
for (i = 0; i < 24; ++i) { for (i = 0; i < 24; ++i) {
if (i == 0) { 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) { } 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);
} }
} }
} }

2
kvm-all.c
View File

@ -935,7 +935,7 @@ static void kvm_add_routing_entry(KVMState *s,
set_gsi(s, entry->gsi); 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; struct kvm_irq_routing_entry e;

2
kvm.h
View File

@ -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_set_irq(KVMState *s, int irq, int level);
int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg); 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); int kvm_irqchip_commit_routes(KVMState *s);
void kvm_put_apic_state(DeviceState *d, struct kvm_lapic_state *kapic); void kvm_put_apic_state(DeviceState *d, struct kvm_lapic_state *kapic);