diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-03 15:59:56 -0500 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-04-27 04:53:27 -0400 |
commit | b8688d51bbe4872fbcec751e04369606082ac610 (patch) | |
tree | a48191f442d49530265dc92e98fc4877d2e286f7 /arch/x86/kvm/svm.c | |
parent | 71c4dfafc0932d92cc99c7e839d25174b0ce10a1 (diff) |
KVM: replace remaining __FUNCTION__ occurances
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch/x86/kvm/svm.c')
-rw-r--r-- | arch/x86/kvm/svm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index ff6e5c8da3c6..b2c667fe6832 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c | |||
@@ -230,12 +230,12 @@ static void skip_emulated_instruction(struct kvm_vcpu *vcpu) | |||
230 | struct vcpu_svm *svm = to_svm(vcpu); | 230 | struct vcpu_svm *svm = to_svm(vcpu); |
231 | 231 | ||
232 | if (!svm->next_rip) { | 232 | if (!svm->next_rip) { |
233 | printk(KERN_DEBUG "%s: NOP\n", __FUNCTION__); | 233 | printk(KERN_DEBUG "%s: NOP\n", __func__); |
234 | return; | 234 | return; |
235 | } | 235 | } |
236 | if (svm->next_rip - svm->vmcb->save.rip > MAX_INST_SIZE) | 236 | if (svm->next_rip - svm->vmcb->save.rip > MAX_INST_SIZE) |
237 | printk(KERN_ERR "%s: ip 0x%llx next 0x%llx\n", | 237 | printk(KERN_ERR "%s: ip 0x%llx next 0x%llx\n", |
238 | __FUNCTION__, | 238 | __func__, |
239 | svm->vmcb->save.rip, | 239 | svm->vmcb->save.rip, |
240 | svm->next_rip); | 240 | svm->next_rip); |
241 | 241 | ||
@@ -996,7 +996,7 @@ static void svm_set_dr(struct kvm_vcpu *vcpu, int dr, unsigned long value, | |||
996 | } | 996 | } |
997 | default: | 997 | default: |
998 | printk(KERN_DEBUG "%s: unexpected dr %u\n", | 998 | printk(KERN_DEBUG "%s: unexpected dr %u\n", |
999 | __FUNCTION__, dr); | 999 | __func__, dr); |
1000 | *exception = UD_VECTOR; | 1000 | *exception = UD_VECTOR; |
1001 | return; | 1001 | return; |
1002 | } | 1002 | } |
@@ -1109,7 +1109,7 @@ static int invalid_op_interception(struct vcpu_svm *svm, | |||
1109 | static int task_switch_interception(struct vcpu_svm *svm, | 1109 | static int task_switch_interception(struct vcpu_svm *svm, |
1110 | struct kvm_run *kvm_run) | 1110 | struct kvm_run *kvm_run) |
1111 | { | 1111 | { |
1112 | pr_unimpl(&svm->vcpu, "%s: task switch is unsupported\n", __FUNCTION__); | 1112 | pr_unimpl(&svm->vcpu, "%s: task switch is unsupported\n", __func__); |
1113 | kvm_run->exit_reason = KVM_EXIT_UNKNOWN; | 1113 | kvm_run->exit_reason = KVM_EXIT_UNKNOWN; |
1114 | return 0; | 1114 | return 0; |
1115 | } | 1115 | } |
@@ -1125,7 +1125,7 @@ static int emulate_on_interception(struct vcpu_svm *svm, | |||
1125 | struct kvm_run *kvm_run) | 1125 | struct kvm_run *kvm_run) |
1126 | { | 1126 | { |
1127 | if (emulate_instruction(&svm->vcpu, NULL, 0, 0, 0) != EMULATE_DONE) | 1127 | if (emulate_instruction(&svm->vcpu, NULL, 0, 0, 0) != EMULATE_DONE) |
1128 | pr_unimpl(&svm->vcpu, "%s: failed\n", __FUNCTION__); | 1128 | pr_unimpl(&svm->vcpu, "%s: failed\n", __func__); |
1129 | return 1; | 1129 | return 1; |
1130 | } | 1130 | } |
1131 | 1131 | ||
@@ -1257,7 +1257,7 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 data) | |||
1257 | case MSR_IA32_DEBUGCTLMSR: | 1257 | case MSR_IA32_DEBUGCTLMSR: |
1258 | if (!svm_has(SVM_FEATURE_LBRV)) { | 1258 | if (!svm_has(SVM_FEATURE_LBRV)) { |
1259 | pr_unimpl(vcpu, "%s: MSR_IA32_DEBUGCTL 0x%llx, nop\n", | 1259 | pr_unimpl(vcpu, "%s: MSR_IA32_DEBUGCTL 0x%llx, nop\n", |
1260 | __FUNCTION__, data); | 1260 | __func__, data); |
1261 | break; | 1261 | break; |
1262 | } | 1262 | } |
1263 | if (data & DEBUGCTL_RESERVED_BITS) | 1263 | if (data & DEBUGCTL_RESERVED_BITS) |
@@ -1419,7 +1419,7 @@ static int handle_exit(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) | |||
1419 | exit_code != SVM_EXIT_NPF) | 1419 | exit_code != SVM_EXIT_NPF) |
1420 | printk(KERN_ERR "%s: unexpected exit_ini_info 0x%x " | 1420 | printk(KERN_ERR "%s: unexpected exit_ini_info 0x%x " |
1421 | "exit_code 0x%x\n", | 1421 | "exit_code 0x%x\n", |
1422 | __FUNCTION__, svm->vmcb->control.exit_int_info, | 1422 | __func__, svm->vmcb->control.exit_int_info, |
1423 | exit_code); | 1423 | exit_code); |
1424 | 1424 | ||
1425 | if (exit_code >= ARRAY_SIZE(svm_exit_handlers) | 1425 | if (exit_code >= ARRAY_SIZE(svm_exit_handlers) |