[PATCH 2/2] svm internal function name cleanup

Rusty Russell
2007-07-30T10:08:05Z

Changes some svm.c internal function names:
1) io_adress -> io_address (de-germanify the spelling)
2) kvm_reput_irq -> reput_irq (it's not a generic kvm function)
3) kvm_do_inject_irq -> (it's not a generic kvm function)

Signed-off-by: Rusty Russell <rusty-8n+1lVoiYb80n/F98K4Iww@public.gmane.org>

diff -r 1bb631b5d298 drivers/kvm/svm.c
--- a/drivers/kvm/svm.c Mon Jul 30 19:40:07 2007 +1000
+++ b/drivers/kvm/svm.c Mon Jul 30 19:44:20 2007 +1000
@@ -1062,7 +1062,7 @@ static int io_get_override(struct vcpu_s
return 0;
}

-static unsigned long io_adress(struct vcpu_svm *svm, int ins, gva_t *address)
+static unsigned long io_address(struct vcpu_svm *svm, int ins, gva_t *address)
{
unsigned long addr_mask;
unsigned long *reg;
@@ -1126,7 +1126,7 @@ static int io_interception(struct vcpu_s
if (string) {
unsigned addr_mask;

- addr_mask = io_adress(svm, in, &address);
+ addr_mask = io_address(svm, in, &address);
if (!addr_mask) {
printk(KERN_DEBUG "%s: get io address failed\n",
__FUNCTION__);
@@ -1421,7 +1421,7 @@ static void pre_svm_run(struct vcpu_svm
}

-static inline void kvm_do_inject_irq(struct vcpu_svm *svm)
+static inline void inject_irq(struct vcpu_svm *svm)
{
struct vmcb_control_area *control;

@@ -1432,7 +1432,7 @@ static inline void kvm_do_inject_irq(str
((/*control->int_vector >> 4*/ 0xf) << V_INTR_PRIO_SHIFT);
}

-static void kvm_reput_irq(struct vcpu_svm *svm)
+static void reput_irq(struct vcpu_svm *svm)
{
struct vmcb_control_area *control = &svm->vmcb->control;

@@ -1458,7 +1458,7 @@ static void do_interrupt_requests(struct
/*
* If interrupts enabled, and not blocked by sti or mov ss. Good.
*/
- kvm_do_inject_irq(svm);
+ inject_irq(svm);

/*
* Interrupts blocked. Wait for unblock.
@@ -1700,7 +1700,7 @@ again:

stgi();

- kvm_reput_irq(svm);
+ reput_irq(svm);

svm->next_rip = 0;