aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/vmx.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-03-03 15:59:56 -0500
committerAvi Kivity <avi@qumranet.com>2008-04-27 04:53:27 -0400
commitb8688d51bbe4872fbcec751e04369606082ac610 (patch)
treea48191f442d49530265dc92e98fc4877d2e286f7 /arch/x86/kvm/vmx.c
parent71c4dfafc0932d92cc99c7e839d25174b0ce10a1 (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/vmx.c')
-rw-r--r--arch/x86/kvm/vmx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 50345032974d..7ef710afceba 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1254,7 +1254,7 @@ static void enter_lmode(struct kvm_vcpu *vcpu)
1254 guest_tr_ar = vmcs_read32(GUEST_TR_AR_BYTES); 1254 guest_tr_ar = vmcs_read32(GUEST_TR_AR_BYTES);
1255 if ((guest_tr_ar & AR_TYPE_MASK) != AR_TYPE_BUSY_64_TSS) { 1255 if ((guest_tr_ar & AR_TYPE_MASK) != AR_TYPE_BUSY_64_TSS) {
1256 printk(KERN_DEBUG "%s: tss fixup for long mode. \n", 1256 printk(KERN_DEBUG "%s: tss fixup for long mode. \n",
1257 __FUNCTION__); 1257 __func__);
1258 vmcs_write32(GUEST_TR_AR_BYTES, 1258 vmcs_write32(GUEST_TR_AR_BYTES,
1259 (guest_tr_ar & ~AR_TYPE_MASK) 1259 (guest_tr_ar & ~AR_TYPE_MASK)
1260 | AR_TYPE_BUSY_64_TSS); 1260 | AR_TYPE_BUSY_64_TSS);
@@ -1909,7 +1909,7 @@ static int handle_exception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
1909 if ((vect_info & VECTORING_INFO_VALID_MASK) && 1909 if ((vect_info & VECTORING_INFO_VALID_MASK) &&
1910 !is_page_fault(intr_info)) 1910 !is_page_fault(intr_info))
1911 printk(KERN_ERR "%s: unexpected, vectoring info 0x%x " 1911 printk(KERN_ERR "%s: unexpected, vectoring info 0x%x "
1912 "intr info 0x%x\n", __FUNCTION__, vect_info, intr_info); 1912 "intr info 0x%x\n", __func__, vect_info, intr_info);
1913 1913
1914 if (!irqchip_in_kernel(vcpu->kvm) && is_external_interrupt(vect_info)) { 1914 if (!irqchip_in_kernel(vcpu->kvm) && is_external_interrupt(vect_info)) {
1915 int irq = vect_info & VECTORING_INFO_VECTOR_MASK; 1915 int irq = vect_info & VECTORING_INFO_VECTOR_MASK;
@@ -2275,7 +2275,7 @@ static int kvm_handle_exit(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
2275 if ((vectoring_info & VECTORING_INFO_VALID_MASK) && 2275 if ((vectoring_info & VECTORING_INFO_VALID_MASK) &&
2276 exit_reason != EXIT_REASON_EXCEPTION_NMI) 2276 exit_reason != EXIT_REASON_EXCEPTION_NMI)
2277 printk(KERN_WARNING "%s: unexpected, valid vectoring info and " 2277 printk(KERN_WARNING "%s: unexpected, valid vectoring info and "
2278 "exit reason is 0x%x\n", __FUNCTION__, exit_reason); 2278 "exit reason is 0x%x\n", __func__, exit_reason);
2279 if (exit_reason < kvm_vmx_max_exit_handlers 2279 if (exit_reason < kvm_vmx_max_exit_handlers
2280 && kvm_vmx_exit_handlers[exit_reason]) 2280 && kvm_vmx_exit_handlers[exit_reason])
2281 return kvm_vmx_exit_handlers[exit_reason](vcpu, kvm_run); 2281 return kvm_vmx_exit_handlers[exit_reason](vcpu, kvm_run);