diff options
author | Gleb Natapov <gleb@redhat.com> | 2010-02-25 05:43:09 -0500 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2010-04-25 06:53:39 -0400 |
commit | 2d49ec72d3fab0aa90510a64a973d594c48b1fd1 (patch) | |
tree | 30faaab6569d138bf3c4cb244e8e50e3fa6f4e37 /arch/x86/kvm/vmx.c | |
parent | 254d4d48a56925622a5592ad590a738735b66135 (diff) |
KVM: move segment_base() into vmx.c
segment_base() is used only by vmx so move it there.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
-rw-r--r-- | arch/x86/kvm/vmx.c | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 68712bdf0407..8e2a24693be9 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -634,6 +634,43 @@ static bool update_transition_efer(struct vcpu_vmx *vmx, int efer_offset) | |||
634 | return true; | 634 | return true; |
635 | } | 635 | } |
636 | 636 | ||
637 | static unsigned long segment_base(u16 selector) | ||
638 | { | ||
639 | struct desc_ptr gdt; | ||
640 | struct desc_struct *d; | ||
641 | unsigned long table_base; | ||
642 | unsigned long v; | ||
643 | |||
644 | if (!(selector & ~3)) | ||
645 | return 0; | ||
646 | |||
647 | native_store_gdt(&gdt); | ||
648 | table_base = gdt.address; | ||
649 | |||
650 | if (selector & 4) { /* from ldt */ | ||
651 | u16 ldt_selector = kvm_read_ldt(); | ||
652 | |||
653 | if (!(ldt_selector & ~3)) | ||
654 | return 0; | ||
655 | |||
656 | table_base = segment_base(ldt_selector); | ||
657 | } | ||
658 | d = (struct desc_struct *)(table_base + (selector & ~7)); | ||
659 | v = get_desc_base(d); | ||
660 | #ifdef CONFIG_X86_64 | ||
661 | if (d->s == 0 && (d->type == 2 || d->type == 9 || d->type == 11)) | ||
662 | v |= ((unsigned long)((struct ldttss_desc64 *)d)->base3) << 32; | ||
663 | #endif | ||
664 | return v; | ||
665 | } | ||
666 | |||
667 | static inline unsigned long kvm_read_tr_base(void) | ||
668 | { | ||
669 | u16 tr; | ||
670 | asm("str %0" : "=g"(tr)); | ||
671 | return segment_base(tr); | ||
672 | } | ||
673 | |||
637 | static void vmx_save_host_state(struct kvm_vcpu *vcpu) | 674 | static void vmx_save_host_state(struct kvm_vcpu *vcpu) |
638 | { | 675 | { |
639 | struct vcpu_vmx *vmx = to_vmx(vcpu); | 676 | struct vcpu_vmx *vmx = to_vmx(vcpu); |