diff options
| -rw-r--r-- | hw/pc_piix.c | 8 | ||||
| -rw-r--r-- | kvm-all.c | 2 | ||||
| -rw-r--r-- | kvm.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 6a75718fbb..c17f906f2d 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 1913d6a337..0117837e9a 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 7857dbfb05..8b061bd0d0 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); |