KVM: More i386 fixes
PATCH 1/1 KVM: More i386 fixes
From: Ingo Molnar <[email protected]>
Signed-off-by Avi Kivity <avi-atKUWr5tajBWk0Htik3J/[email protected]>
drivers/kvm/kvm.h +1 -1
@@ -299,7 +299,7 @@void (*set_rflags)(struct kvm_vcpu *vcpu,unsigned long rflags);void (*invlpg)(struct kvm_vcpu *vcpu,gva_t addr); -void (*flush_tlb)(struct kvm_vcpu *vcpu); +void (*tlb_flush)(struct kvm_vcpu *vcpu);void (*inject_page_fault)(struct kvm_vcpu *vcpu,unsigned long addr,u32 err_code);
drivers/kvm/kvm_main.c +1 -1
@@ -725,7 +725,7 @@if (!vcpu)continue ; - kvm_arch_ops->flush_tlb (vcpu); + kvm_arch_ops->tlb_flush (vcpu);vcpu_put (vcpu); } }
drivers/kvm/mmu.c +3 -3
@@ -324,7 +324,7 @@if (is_paging (vcpu)) root |= (vcpu->cr3 & (CR3_PCD_MASK |CR3_WPT_MASK )); kvm_arch_ops->set_cr3 (vcpu, root); - kvm_arch_ops->flush_tlb (vcpu); + kvm_arch_ops->tlb_flush (vcpu); }static gpa_t nonpaging_gva_to_gpa (struct kvm_vcpu *vcpu,gva_t vaddr)
@@ -408,7 +408,7 @@release_pt_page_64 (vcpu, page->page_hpa,1 ); } ++kvm_stat.tlb_flush; - kvm_arch_ops->flush_tlb (vcpu); + kvm_arch_ops->tlb_flush (vcpu); }static void paging_new_cr3 (struct kvm_vcpu *vcpu)
@@ -516,7 +516,7 @@ table[index] =0 ;release_pt_page_64 (vcpu, page_addr,PT_PAGE_TABLE_LEVEL ); - kvm_arch_ops->flush_tlb (vcpu); + kvm_arch_ops->tlb_flush (vcpu);return ; } }
drivers/kvm/svm.c +10 -8
@@ -115,7 +115,7 @@ asm volatile (SVM_INVLPGA :: "a"(addr), "c"(asid)); } -static inline unsigned long read_cr2 (void ) +static inline unsigned long kvm_read_cr2 (void ) {unsigned long cr2;
@@ -123,7 +123,7 @@return cr2; } -static inline void write_cr2 (unsigned long val) +static inline void kvm_write_cr2 (unsigned long val) { asmvolatile ("mov %0, %%cr2" ::"r" (val)); }
@@ -1129,9 +1129,11 @@static int svm_set_msr (struct kvm_vcpu *vcpu,unsigned ecx,u64 data) {switch (ecx) { +#ifdef __x86_64__case MSR_EFER :set_efer (vcpu, data);break ; +#endif case MSR_IA32_MC0_STATUS :printk (KERN_WARNING "%s: MSR_IA32_MC0_STATUS 0x%llx, nop\n" , __FUNCTION__, data);
@@ -1367,7 +1369,7 @@ fs_selector =read_fs (); gs_selector =read_gs (); ldt_selector =read_ldt (); - vcpu->svm->host_cr2 =read_cr2 (); + vcpu->svm->host_cr2 =kvm_read_cr2 (); vcpu->svm->host_dr6 =read_dr6 (); vcpu->svm->host_dr7 =read_dr7 (); vcpu->svm->vmcb->save.cr2 = vcpu->cr2;
@@ -1384,7 +1386,7 @@"push %%r8; push %%r9; push %%r10; push %%r11;" "push %%r12; push %%r13; push %%r14; push %%r15;"#else -"push %%ebx; push %%rcx push %%edx;" +"push %%ebx; push %%ecx; push %%edx;" "push %%esi; push %%edi; push %%ebp;"#endif
@@ -1462,9 +1464,9 @@ [rdx]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_RDX])), [rsi]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_RSI])), [rdi]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_RDI])), - [rbp]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_RBP])), + [rbp]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_RBP])) #ifdef __x86_64__ - [r8 ]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_R8 ])), + ,[r8 ]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_R8 ])), [r9 ]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_R9 ])), [r10]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_R10])), [r11]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_R11])),
@@ -1482,7 +1484,7 @@write_dr6 (vcpu->svm->host_dr6);write_dr7 (vcpu->svm->host_dr7); -write_cr2 (vcpu->svm->host_cr2); +kvm_write_cr2 (vcpu->svm->host_cr2);load_fs (fs_selector);load_gs (gs_selector);
@@ -1596,7 +1598,7 @@ .set_rflags = svm_set_rflags, .invlpg = svm_invlpg, - .flush_tlb = svm_flush_tlb, + .tlb_flush = svm_flush_tlb, .inject_page_fault = svm_inject_page_fault, .inject_gp = svm_inject_gp,
drivers/kvm/vmx.c +1 -1
@@ -1984,7 +1984,7 @@ .get_rflags = vmx_get_rflags, .set_rflags = vmx_set_rflags, - .flush_tlb = vmx_flush_tlb, + .tlb_flush = vmx_flush_tlb, .inject_page_fault = vmx_inject_page_fault, .inject_gp = vmx_inject_gp,
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV