aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2013-01-21 08:36:47 -0500
committerMarcelo Tosatti <mtosatti@redhat.com>2013-01-23 21:40:30 -0500
commit91b0aa2ca63e60ac69c5dd96bff580d3947073d4 (patch)
tree90a56d9637834c81d74436ac6cbc1f1a860b3479 /arch/x86
parent25391454e73e3156202264eb3c473825afe4bc94 (diff)
KVM: VMX: rename fix_pmode_dataseg to fix_pmode_seg.
The function deals with code segment too. Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kvm/vmx.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 77212d1e1df9..9bc68c7bca7d 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2759,7 +2759,7 @@ static __exit void hardware_unsetup(void)
2759 free_kvm_area(); 2759 free_kvm_area();
2760} 2760}
2761 2761
2762static void fix_pmode_dataseg(struct kvm_vcpu *vcpu, int seg, 2762static void fix_pmode_seg(struct kvm_vcpu *vcpu, int seg,
2763 struct kvm_segment *save) 2763 struct kvm_segment *save)
2764{ 2764{
2765 if (!emulate_invalid_guest_state) { 2765 if (!emulate_invalid_guest_state) {
@@ -2811,12 +2811,12 @@ static void enter_pmode(struct kvm_vcpu *vcpu)
2811 2811
2812 update_exception_bitmap(vcpu); 2812 update_exception_bitmap(vcpu);
2813 2813
2814 fix_pmode_dataseg(vcpu, VCPU_SREG_CS, &vmx->rmode.segs[VCPU_SREG_CS]); 2814 fix_pmode_seg(vcpu, VCPU_SREG_CS, &vmx->rmode.segs[VCPU_SREG_CS]);
2815 fix_pmode_dataseg(vcpu, VCPU_SREG_SS, &vmx->rmode.segs[VCPU_SREG_SS]); 2815 fix_pmode_seg(vcpu, VCPU_SREG_SS, &vmx->rmode.segs[VCPU_SREG_SS]);
2816 fix_pmode_dataseg(vcpu, VCPU_SREG_ES, &vmx->rmode.segs[VCPU_SREG_ES]); 2816 fix_pmode_seg(vcpu, VCPU_SREG_ES, &vmx->rmode.segs[VCPU_SREG_ES]);
2817 fix_pmode_dataseg(vcpu, VCPU_SREG_DS, &vmx->rmode.segs[VCPU_SREG_DS]); 2817 fix_pmode_seg(vcpu, VCPU_SREG_DS, &vmx->rmode.segs[VCPU_SREG_DS]);
2818 fix_pmode_dataseg(vcpu, VCPU_SREG_FS, &vmx->rmode.segs[VCPU_SREG_FS]); 2818 fix_pmode_seg(vcpu, VCPU_SREG_FS, &vmx->rmode.segs[VCPU_SREG_FS]);
2819 fix_pmode_dataseg(vcpu, VCPU_SREG_GS, &vmx->rmode.segs[VCPU_SREG_GS]); 2819 fix_pmode_seg(vcpu, VCPU_SREG_GS, &vmx->rmode.segs[VCPU_SREG_GS]);
2820 2820
2821 /* CPL is always 0 when CPU enters protected mode */ 2821 /* CPL is always 0 when CPU enters protected mode */
2822 __set_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail); 2822 __set_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail);