[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 2/7] kvm: Rename kvm_irqchip_set_irq() to kvm_set
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH v2 2/7] kvm: Rename kvm_irqchip_set_irq() to kvm_set_irq() |
Date: |
Thu, 26 Jul 2012 15:35:12 +0100 |
Rename the function kvm_irqchip_set_irq() to kvm_set_irq(),
since it can be used for sending (asynchronous) interrupts whether
there is a full irqchip model in the kernel or not. (We don't
include 'async' in the function name since asynchronous is the
normal case.)
Signed-off-by: Peter Maydell <address@hidden>
---
hw/kvm/i8259.c | 2 +-
hw/kvm/ioapic.c | 2 +-
kvm-all.c | 6 +++---
kvm.h | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/kvm/i8259.c b/hw/kvm/i8259.c
index 94d1b9a..1e24cd4 100644
--- a/hw/kvm/i8259.c
+++ b/hw/kvm/i8259.c
@@ -94,7 +94,7 @@ static void kvm_pic_set_irq(void *opaque, int irq, int level)
{
int delivered;
- delivered = kvm_irqchip_set_irq(kvm_state, irq, level);
+ delivered = kvm_set_irq(kvm_state, irq, level);
apic_report_irq_delivered(delivered);
}
diff --git a/hw/kvm/ioapic.c b/hw/kvm/ioapic.c
index 3ae3175..6c3b8fe 100644
--- a/hw/kvm/ioapic.c
+++ b/hw/kvm/ioapic.c
@@ -82,7 +82,7 @@ static void kvm_ioapic_set_irq(void *opaque, int irq, int
level)
KVMIOAPICState *s = opaque;
int delivered;
- delivered = kvm_irqchip_set_irq(kvm_state, s->kvm_gsi_base + irq, level);
+ delivered = kvm_set_irq(kvm_state, s->kvm_gsi_base + irq, level);
apic_report_irq_delivered(delivered);
}
diff --git a/kvm-all.c b/kvm-all.c
index 0a38ba1..7c635be 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -853,7 +853,7 @@ static void kvm_handle_interrupt(CPUArchState *env, int
mask)
}
}
-int kvm_irqchip_set_irq(KVMState *s, int irq, int level)
+int kvm_set_irq(KVMState *s, int irq, int level)
{
struct kvm_irq_level event;
int ret;
@@ -864,7 +864,7 @@ int kvm_irqchip_set_irq(KVMState *s, int irq, int level)
event.irq = irq;
ret = kvm_vm_ioctl(s, s->irqchip_inject_ioctl, &event);
if (ret < 0) {
- perror("kvm_set_irqchip_line");
+ perror("kvm_set_irq");
abort();
}
@@ -1089,7 +1089,7 @@ int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg)
assert(route->kroute.type == KVM_IRQ_ROUTING_MSI);
- return kvm_irqchip_set_irq(s, route->kroute.gsi, 1);
+ return kvm_set_irq(s, route->kroute.gsi, 1);
}
int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg)
diff --git a/kvm.h b/kvm.h
index 09818f3..744209d 100644
--- a/kvm.h
+++ b/kvm.h
@@ -146,7 +146,7 @@ int kvm_arch_on_sigbus(int code, void *addr);
void kvm_arch_init_irq_routing(KVMState *s);
-int kvm_irqchip_set_irq(KVMState *s, int irq, int level);
+int kvm_set_irq(KVMState *s, int irq, int level);
int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg);
void kvm_irqchip_add_irq_route(KVMState *s, int gsi, int irqchip, int pin);
--
1.7.5.4
- [Qemu-devel] [PATCH v2 0/7] split out uses of kvm_irqchip_in_kernel(), Peter Maydell, 2012/07/26
- [Qemu-devel] [PATCH v2 3/7] kvm: Move kvm_allows_irq0_override() to target-i386, fix return type, Peter Maydell, 2012/07/26
- [Qemu-devel] [PATCH v2 7/7] kvm: Add documentation comment for kvm_irqchip_in_kernel(), Peter Maydell, 2012/07/26
- [Qemu-devel] [PATCH v2 2/7] kvm: Rename kvm_irqchip_set_irq() to kvm_set_irq(),
Peter Maydell <=
- [Qemu-devel] [PATCH v2 6/7] kvm: Decouple 'GSI routing' from 'kernel irqchip', Peter Maydell, 2012/07/26
- [Qemu-devel] [PATCH v2 4/7] kvm: Decouple 'irqfds usable' from 'kernel irqchip', Peter Maydell, 2012/07/26
- [Qemu-devel] [PATCH v2 5/7] kvm: Decouple 'MSI routing via irqfds' from 'kernel irqchip', Peter Maydell, 2012/07/26
- [Qemu-devel] [PATCH v2 1/7] kvm: Decouple 'async interrupt delivery' from 'kernel irqchip', Peter Maydell, 2012/07/26