openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: VMX: Use local labels in inline assembly 

This makes oprofile dumps and disassebly easier to read.

Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
Avi Kivity 2007-05-14 20:41:13 +03:00
parent cd0536d7cb
commit cd2276a795
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/kvm/vmx.c
View File

@ -1188,7 +1188,7 @@ static int vmx_vcpu_setup(struct kvm_vcpu *vcpu)
struct descriptor_table dt; struct descriptor_table dt;
int i; int i;
int ret = 0; int ret = 0;
extern asmlinkage void kvm_vmx_return(void); unsigned long kvm_vmx_return;
if (!init_rmode_tss(vcpu->kvm)) { if (!init_rmode_tss(vcpu->kvm)) {
ret = -ENOMEM; ret = -ENOMEM;
@ -1306,8 +1306,8 @@ static int vmx_vcpu_setup(struct kvm_vcpu *vcpu)
get_idt(&dt); get_idt(&dt);
vmcs_writel(HOST_IDTR_BASE, dt.base); /* 22.2.4 */ vmcs_writel(HOST_IDTR_BASE, dt.base); /* 22.2.4 */
asm ("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return));
vmcs_writel(HOST_RIP, (unsigned long)kvm_vmx_return); /* 22.2.5 */ vmcs_writel(HOST_RIP, kvm_vmx_return); /* 22.2.5 */
rdmsr(MSR_IA32_SYSENTER_CS, host_sysenter_cs, junk); rdmsr(MSR_IA32_SYSENTER_CS, host_sysenter_cs, junk);
vmcs_write32(HOST_IA32_SYSENTER_CS, host_sysenter_cs); vmcs_write32(HOST_IA32_SYSENTER_CS, host_sysenter_cs);
@ -1997,12 +1997,11 @@ static int vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
"mov %c[rcx](%3), %%ecx \n\t" /* kills %3 (ecx) */ "mov %c[rcx](%3), %%ecx \n\t" /* kills %3 (ecx) */
#endif #endif
/* Enter guest mode */ /* Enter guest mode */
"jne launched \n\t" "jne .Llaunched \n\t"
ASM_VMX_VMLAUNCH "\n\t" ASM_VMX_VMLAUNCH "\n\t"
"jmp kvm_vmx_return \n\t" "jmp .Lkvm_vmx_return \n\t"
"launched: " ASM_VMX_VMRESUME "\n\t" ".Llaunched: " ASM_VMX_VMRESUME "\n\t"
".globl kvm_vmx_return \n\t" ".Lkvm_vmx_return: "
"kvm_vmx_return: "
/* Save guest registers, load host registers, keep flags */ /* Save guest registers, load host registers, keep flags */
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
"xchg %3, (%%rsp) \n\t" "xchg %3, (%%rsp) \n\t"