Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6ab1ed4 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: Drop kvm_get_gdt() in favor of generic linux function 



Linux now has native_store_gdt() to do the same. Use it instead of
kvm local version.

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent f5c98031

arch/x86/include/asm/kvm_host.h

+0 −5
Original line number Diff line number Diff line
@@ -723,11 +723,6 @@ static inline void kvm_get_idt(struct desc_ptr *table) 
	asm("sidt %0" : "=m"(*table));

}



static inline void kvm_get_gdt(struct desc_ptr *table)

{

	asm("sgdt %0" : "=m"(*table));

}



static inline unsigned long kvm_read_tr_base(void)

{

	u16 tr;

arch/x86/kvm/svm.c

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ static int svm_hardware_enable(void *garbage) 
	sd->max_asid = cpuid_ebx(SVM_CPUID_FUNC) - 1;

	sd->next_asid = sd->max_asid + 1;



	kvm_get_gdt(&gdt_descr);

	native_store_gdt(&gdt_descr);

	gdt = (struct desc_struct *)gdt_descr.address;

	sd->tss_desc = (struct kvm_ldttss_desc *)(gdt + GDT_ENTRY_TSS);

arch/x86/kvm/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ static void reload_tss(void) 
	struct desc_ptr gdt;

	struct desc_struct *descs;



	kvm_get_gdt(&gdt);

	native_store_gdt(&gdt);

	descs = (void *)gdt.address;

	descs[GDT_ENTRY_TSS].type = 9; /* available TSS */

	load_TR_desc();
@@ -767,7 +767,7 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 
		 * processors.

		 */

		vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */

		kvm_get_gdt(&dt);

		native_store_gdt(&dt);

		vmcs_writel(HOST_GDTR_BASE, dt.address);   /* 22.2.4 */



		rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ unsigned long segment_base(u16 selector) 
	if (selector == 0)

		return 0;



	kvm_get_gdt(&gdt);

	native_store_gdt(&gdt);

	table_base = gdt.address;



	if (selector & 4) {           /* from ldt */