UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: x86: Drop ____kvm_handle_fault_on_reboot() 

Remove the variation of __kvm_handle_fault_on_reboot() that accepts a
post-fault cleanup instruction now that its sole user (VMREAD) uses
a different method for handling faults.

Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson 2019-07-19 13:41:09 -07:00 committed by Paolo Bonzini
parent 6e2020977e
commit 98cd382d50
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/include/asm/kvm_host.h
View File

@ -1542,7 +1542,7 @@ asmlinkage void kvm_spurious_fault(void);
* Usually after catching the fault we just panic; during reboot * Usually after catching the fault we just panic; during reboot
* instead the instruction is ignored. * instead the instruction is ignored.
*/ */
#define ____kvm_handle_fault_on_reboot(insn, cleanup_insn) \ #define __kvm_handle_fault_on_reboot(insn) \
"666: \n\t" \ "666: \n\t" \
insn "\n\t" \ insn "\n\t" \
"jmp 668f \n\t" \ "jmp 668f \n\t" \
@ -1551,16 +1551,12 @@ asmlinkage void kvm_spurious_fault(void);
"668: \n\t" \ "668: \n\t" \
".pushsection .fixup, \"ax\" \n\t" \ ".pushsection .fixup, \"ax\" \n\t" \
"700: \n\t" \ "700: \n\t" \
cleanup_insn "\n\t" \
"cmpb $0, kvm_rebooting\n\t" \ "cmpb $0, kvm_rebooting\n\t" \
"je 667b \n\t" \ "je 667b \n\t" \
"jmp 668b \n\t" \ "jmp 668b \n\t" \
".popsection \n\t" \ ".popsection \n\t" \
_ASM_EXTABLE(666b, 700b) _ASM_EXTABLE(666b, 700b)
#define __kvm_handle_fault_on_reboot(insn) \
____kvm_handle_fault_on_reboot(insn, "")
#define KVM_ARCH_WANT_MMU_NOTIFIER #define KVM_ARCH_WANT_MMU_NOTIFIER
int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end); int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end);
int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end); int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end);