Commit f924d66d authored by Gleb Natapov's avatar Gleb Natapov

KVM: VMX: remove unneeded temporary variable from vmx_set_segment()

Reviewed-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
parent 1ecd50a9
...@@ -3268,7 +3268,6 @@ static void vmx_set_segment(struct kvm_vcpu *vcpu, ...@@ -3268,7 +3268,6 @@ static void vmx_set_segment(struct kvm_vcpu *vcpu,
{ {
struct vcpu_vmx *vmx = to_vmx(vcpu); struct vcpu_vmx *vmx = to_vmx(vcpu);
const struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg]; const struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg];
u32 ar = 0;
vmx_segment_cache_clear(vmx); vmx_segment_cache_clear(vmx);
__clear_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail); __clear_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail);
...@@ -3285,7 +3284,6 @@ static void vmx_set_segment(struct kvm_vcpu *vcpu, ...@@ -3285,7 +3284,6 @@ static void vmx_set_segment(struct kvm_vcpu *vcpu,
vmcs_writel(sf->base, var->base); vmcs_writel(sf->base, var->base);
vmcs_write32(sf->limit, var->limit); vmcs_write32(sf->limit, var->limit);
vmcs_write16(sf->selector, var->selector); vmcs_write16(sf->selector, var->selector);
ar = vmx_segment_access_rights(var);
/* /*
* Fix the "Accessed" bit in AR field of segment registers for older * Fix the "Accessed" bit in AR field of segment registers for older
...@@ -3299,9 +3297,9 @@ static void vmx_set_segment(struct kvm_vcpu *vcpu, ...@@ -3299,9 +3297,9 @@ static void vmx_set_segment(struct kvm_vcpu *vcpu,
* kvm hack. * kvm hack.
*/ */
if (enable_unrestricted_guest && (seg != VCPU_SREG_LDTR)) if (enable_unrestricted_guest && (seg != VCPU_SREG_LDTR))
ar |= 0x1; /* Accessed */ var->type |= 0x1; /* Accessed */
vmcs_write32(sf->ar_bytes, ar); vmcs_write32(sf->ar_bytes, vmx_segment_access_rights(var));
} }
static void vmx_get_cs_db_l_bits(struct kvm_vcpu *vcpu, int *db, int *l) static void vmx_get_cs_db_l_bits(struct kvm_vcpu *vcpu, int *db, int *l)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment