lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 0690/1095] KVM: x86: Fix errant brace in KVM capability handling
    Date
    From: Ben Gardon <bgardon@google.com>

    [ Upstream commit 1c4dc57328bf218e999951824dce75c6125c4f3c ]

    The braces around the KVM_CAP_XSAVE2 block also surround the
    KVM_CAP_PMU_CAPABILITY block, likely the result of a merge issue. Simply
    move the curly brace back to where it belongs.

    Fixes: ba7bb663f5547 ("KVM: x86: Provide per VM capability for disabling PMU virtualization")

    Reviewed-by: David Matlack <dmatlack@google.com>
    Reviewed-by: Peter Xu <peterx@redhat.com>
    Signed-off-by: Ben Gardon <bgardon@google.com>
    Message-Id: <20220613212523.3436117-8-bgardon@google.com>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/kvm/x86.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index cc2c89c08d85..767a61e29f51 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -4377,10 +4377,10 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
    if (r < sizeof(struct kvm_xsave))
    r = sizeof(struct kvm_xsave);
    break;
    + }
    case KVM_CAP_PMU_CAPABILITY:
    r = enable_pmu ? KVM_CAP_PMU_VALID_MASK : 0;
    break;
    - }
    case KVM_CAP_DISABLE_QUIRKS2:
    r = KVM_X86_VALID_QUIRKS;
    break;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-15 23:50    [W:2.983 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site