aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yjwei@cn.fujitsu.com>2010-03-04 23:11:48 -0500
committerAvi Kivity <avi@redhat.com>2010-05-17 05:15:28 -0400
commitec68798c8fd0f01cdbd3f3e1a970e76a644cf08e (patch)
tree39627b21aa97d20502cf387bdbd56ab1a0acbf5f
parent5c1c85d08da5c257b21b0423b96fa6554aa4cb6f (diff)
KVM: x86: Use native_store_idt() instead of kvm_get_idt()
This patch use generic linux function native_store_idt() instead of kvm_get_idt(), and also removed the useless function kvm_get_idt(). Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--arch/x86/include/asm/kvm_host.h5
-rw-r--r--arch/x86/kvm/vmx.c2
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index ec891a2ce86e..ea1b6c615f9f 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -716,11 +716,6 @@ static inline void kvm_load_ldt(u16 sel)
716 asm("lldt %0" : : "rm"(sel)); 716 asm("lldt %0" : : "rm"(sel));
717} 717}
718 718
719static inline void kvm_get_idt(struct desc_ptr *table)
720{
721 asm("sidt %0" : "=m"(*table));
722}
723
724#ifdef CONFIG_X86_64 719#ifdef CONFIG_X86_64
725static inline unsigned long read_msr(unsigned long msr) 720static inline unsigned long read_msr(unsigned long msr)
726{ 721{
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 3dbfc20824b7..33d88e0a0601 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2452,7 +2452,7 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx)
2452 2452
2453 vmcs_write16(HOST_TR_SELECTOR, GDT_ENTRY_TSS*8); /* 22.2.4 */ 2453 vmcs_write16(HOST_TR_SELECTOR, GDT_ENTRY_TSS*8); /* 22.2.4 */
2454 2454
2455 kvm_get_idt(&dt); 2455 native_store_idt(&dt);
2456 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */ 2456 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
2457 2457
2458 asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return)); 2458 asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return));