From: Jan Beulich <jbeulich@suse.com>
Date: Thu, 25 Apr 2024 14:38:01 +0000 (+0200)
Subject: VMX: no open-coding in vmx_get_cpl()
X-Git-Tag: 4.19.0-rc1~275
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=23cd1207e7f6ee3e51fb42e11dba8d7cdb28e1e5;p=xen.git

VMX: no open-coding in vmx_get_cpl()

Neither X86_SEG_AR_DPL nor MASK_EXTR() should really be avoided here,
using literal number instead.

No difference in generated code (with gcc13 at least).

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 0935762378..5f67a48592 100644
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -1192,7 +1192,7 @@ unsigned int vmx_get_cpl(void)
 
     __vmread(GUEST_SS_AR_BYTES, &attr);
 
-    return (attr >> 5) & 3;
+    return MASK_EXTR(attr, X86_SEG_AR_DPL);
 }
 
 static unsigned int cf_check _vmx_get_cpl(struct vcpu *v)