summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Christopherson <sean.j.christopherson@intel.com>2019-01-25 18:40:59 +0300
committerPaolo Bonzini <pbonzini@redhat.com>2019-02-12 15:12:20 +0300
commitbbc0b8239257d91cd43fe219de5552dee8bb9123 (patch)
tree1aa729f87e615c43fd3268fa0cc108c6d2e9817e
parentf1727b4954772a778df0b73a93c4b646fd3c21f6 (diff)
downloadlinux-bbc0b8239257d91cd43fe219de5552dee8bb9123.tar.xz
KVM: nVMX: Capture VM-Fail via CC_{SET,OUT} in nested early checks
...to take advantage of __GCC_ASM_FLAG_OUTPUTS__ when possible. Reviewed-by: Jim Mattson <jmattson@google.com> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--arch/x86/kvm/vmx/nested.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
index bfacf9029466..67f8fdf568eb 100644
--- a/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@ -2768,12 +2768,12 @@ static int nested_vmx_check_vmentry_hw(struct kvm_vcpu *vcpu)
* VMLAUNCH and VMRESUME clear RFLAGS.{CF,ZF} on VM-Exit, set
* RFLAGS.CF on VM-Fail Invalid and set RFLAGS.ZF on VM-Fail
* Valid. vmx_vmenter() directly "returns" RFLAGS, and so the
- * results of VM-Enter is captured via SETBE to vm_fail.
+ * results of VM-Enter is captured via CC_{SET,OUT} to vm_fail.
*/
"call vmx_vmenter\n\t"
- "setbe %[fail]\n\t"
- : ASM_CALL_CONSTRAINT, [fail]"=qm"(vm_fail)
+ CC_SET(be)
+ : ASM_CALL_CONSTRAINT, CC_OUT(be) (vm_fail)
: "c"(vmx), "d"((unsigned long)HOST_RSP),
[launched]"i"(offsetof(struct vcpu_vmx, __launched)),
[host_rsp]"i"(offsetof(struct vcpu_vmx, host_rsp)),