From: Ben Gardon <bgardon@google.com>
To: kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>
Cc: linux-kernel@vger.kernel.org, Peter Xu <peterx@redhat.com>,
Sean Christopherson <seanjc@google.com>,
David Matlack <dmatlack@google.com>,
Jim Mattson <jmattson@google.com>,
David Dunn <daviddunn@google.com>,
Jing Zhang <jingzhangos@google.com>,
Junaid Shahid <junaids@google.com>,
Ben Gardon <bgardon@google.com>
Subject: [PATCH v9 07/10] KVM: x86: Fix errant brace in KVM capability handling
Date: Mon, 13 Jun 2022 21:25:20 +0000 [thread overview]
Message-ID: <20220613212523.3436117-8-bgardon@google.com> (raw)
In-Reply-To: <20220613212523.3436117-1-bgardon@google.com>
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>
---
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 2318a99139fa..d6639653a113 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -4398,10 +4398,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.36.1.476.g0c4daa206d-goog
next prev parent reply other threads:[~2022-06-13 21:30 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-13 21:25 [PATCH v9 00/10] KVM: x86: Add a cap to disable NX hugepages on a VM Ben Gardon
2022-06-13 21:25 ` [PATCH v9 01/10] KVM: selftests: Remove dynamic memory allocation for stats header Ben Gardon
2022-06-13 21:25 ` [PATCH v9 02/10] KVM: selftests: Read binary stats header in lib Ben Gardon
2022-06-13 21:25 ` [PATCH v9 03/10] KVM: selftests: Read binary stats desc " Ben Gardon
2022-06-13 21:25 ` [PATCH v9 04/10] KVM: selftests: Clean up coding style in binary stats test Ben Gardon
2022-06-13 21:25 ` [PATCH v9 05/10] KVM: selftests: Read binary stat data in lib Ben Gardon
2022-06-13 21:25 ` [PATCH v9 06/10] KVM: selftests: Add NX huge pages test Ben Gardon
2022-06-13 21:25 ` Ben Gardon [this message]
2022-06-13 21:25 ` [PATCH v9 08/10] KVM: x86/MMU: Allow NX huge pages to be disabled on a per-vm basis Ben Gardon
2022-06-13 21:25 ` [PATCH v9 09/10] KVM: selftests: Test disabling NX hugepages on a VM Ben Gardon
2022-06-13 21:25 ` [PATCH v9 10/10] KVM: selftests: Cache binary stats metadata for duration of test Ben Gardon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220613212523.3436117-8-bgardon@google.com \
--to=bgardon@google.com \
--cc=daviddunn@google.com \
--cc=dmatlack@google.com \
--cc=jingzhangos@google.com \
--cc=jmattson@google.com \
--cc=junaids@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=seanjc@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.