| Message ID | 20220420173513.1217360-8-bgardon@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: x86: Add a cap to disable NX hugepages on a VM | expand |
On Wed, Apr 20, 2022 at 10:35:10AM -0700, Ben Gardon wrote: > 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> > Signed-off-by: Ben Gardon <bgardon@google.com> Reviewed-by: Peter Xu <peterx@redhat.com>
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index ab336f7c82e4..665c1fa8bb57 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4382,10 +4382,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;
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> Signed-off-by: Ben Gardon <bgardon@google.com> --- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)