[PATCH] x86/vmx: Fix label name in vmwrite_safe()

Andrew Cooper posted 1 patch 6 months ago
Patches applied successfully (tree, apply log)
git fetch https://gitlab.com/xen-project/patchew/xen tags/patchew/20250501230834.759523-1-andrew.cooper3@citrix.com
xen/arch/x86/include/asm/hvm/vmx/vmx.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
[PATCH] x86/vmx: Fix label name in vmwrite_safe()
Posted by Andrew Cooper 6 months ago
This condition is called VMFail(valid) in the SDM.

No functional change.

Fixes: fc3db01db6fb ("x86/vmx: Rework VMX wrappers using `asm goto()`")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
---
 xen/arch/x86/include/asm/hvm/vmx/vmx.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xen/arch/x86/include/asm/hvm/vmx/vmx.h b/xen/arch/x86/include/asm/hvm/vmx/vmx.h
index cc8c53fab149..d85b52b9d522 100644
--- a/xen/arch/x86/include/asm/hvm/vmx/vmx.h
+++ b/xen/arch/x86/include/asm/hvm/vmx/vmx.h
@@ -382,17 +382,17 @@ static inline enum vmx_insn_errno vmwrite_safe(unsigned long field,
 {
     asm goto ( "vmwrite %[value], %[field]\n\t"
                "jc %l[vmfail_invalid]\n\t"
-               "jz %l[vmfail_error]"
+               "jz %l[vmfail_valid]"
                :
                : [field] "r" (field), [value] "rm" (value)
                :
-               : vmfail_invalid, vmfail_error );
+               : vmfail_invalid, vmfail_valid );
     return VMX_INSN_SUCCEED;
 
  vmfail_invalid:
     return VMX_INSN_FAIL_INVALID;
 
- vmfail_error:
+ vmfail_valid:
     return vmread(VM_INSTRUCTION_ERROR);
 }
 
-- 
2.39.5


Re: [PATCH] x86/vmx: Fix label name in vmwrite_safe()
Posted by Jan Beulich 6 months ago
On 02.05.2025 01:08, Andrew Cooper wrote:
> This condition is called VMFail(valid) in the SDM.
> 
> No functional change.
> 
> Fixes: fc3db01db6fb ("x86/vmx: Rework VMX wrappers using `asm goto()`")
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Acked-by: Jan Beulich <jbeulich@suse.com>