Skip to content

Commit

Permalink
KVM: SVM: internal function name cleanup
Browse files Browse the repository at this point in the history
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@rustcorp.com.au>
Signed-off-by: Avi Kivity <avi@qumranet.com>
  • Loading branch information
Rusty Russell authored and Avi Kivity committed Oct 13, 2007
1 parent e756fc6 commit 0e5017d
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/kvm/svm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,7 @@ static int io_get_override(struct vcpu_svm *svm,
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;
Expand Down Expand Up @@ -1124,7 +1124,7 @@ static int io_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)
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__);
Expand Down Expand Up @@ -1419,7 +1419,7 @@ static void pre_svm_run(struct vcpu_svm *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;

Expand All @@ -1430,7 +1430,7 @@ static inline void kvm_do_inject_irq(struct vcpu_svm *svm)
((/*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;

Expand All @@ -1456,7 +1456,7 @@ static void do_interrupt_requests(struct vcpu_svm *svm,
/*
* 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.
Expand Down Expand Up @@ -1698,7 +1698,7 @@ static int svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)

stgi();

kvm_reput_irq(svm);
reput_irq(svm);

svm->next_rip = 0;

Expand Down

0 comments on commit 0e5017d

Please sign in to comment.