From 530d58a1697056d52b84f55fb7c1526d001af469 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 30 Jul 2007 20:08:05 +1000 Subject: [PATCH] --- yaml --- r: 68371 b: refs/heads/master c: 0e5017d4ae981b0311a3ec1ca04806a4ae7d7446 h: refs/heads/master i: 68369: f2739e0b41cc24389c36fcde1678268c8a611df1 68367: 541cfb66c2a4bd4a17853bc7752a97877a8e8b42 v: v3 --- [refs] | 2 +- trunk/drivers/kvm/svm.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index fb57f07e3bc3..0a7f08bfcbda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e756fc626d7d8a220864dd6bc6634d9d933650b0 +refs/heads/master: 0e5017d4ae981b0311a3ec1ca04806a4ae7d7446 diff --git a/trunk/drivers/kvm/svm.c b/trunk/drivers/kvm/svm.c index 504fb50662d9..cd966739970f 100644 --- a/trunk/drivers/kvm/svm.c +++ b/trunk/drivers/kvm/svm.c @@ -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; @@ -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__); @@ -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; @@ -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; @@ -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. @@ -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;