diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2022-06-09 11:38:12 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-06-09 11:38:12 -0400 |
| commit | e15f5e6fa6ca1b3baf087314b2541afa935d00e7 (patch) | |
| tree | f2b136922cb3ebd89da3a36742600ec30b4e4e69 /arch/x86/kvm/debugfs.c | |
| parent | KVM: selftests: Restrict test region to 48-bit physical addresses when using nested (diff) | |
| parent | KVM: x86: PIT: Preserve state of speaker port data bit (diff) | |
| download | linux-dev-e15f5e6fa6ca1b3baf087314b2541afa935d00e7.tar.xz linux-dev-e15f5e6fa6ca1b3baf087314b2541afa935d00e7.zip | |
Merge branch 'kvm-5.20-early'
s390:
* add an interface to provide a hypervisor dump for secure guests
* improve selftests to show tests
x86:
* Intel IPI virtualization
* Allow getting/setting pending triple fault with KVM_GET/SET_VCPU_EVENTS
* PEBS virtualization
* Simplify PMU emulation by just using PERF_TYPE_RAW events
* More accurate event reinjection on SVM (avoid retrying instructions)
* Allow getting/setting the state of the speaker port data bit
* Rewrite gfn-pfn cache refresh
* Refuse starting the module if VM-Entry/VM-Exit controls are inconsistent
* "Notify" VM exit
Diffstat (limited to 'arch/x86/kvm/debugfs.c')
| -rw-r--r-- | arch/x86/kvm/debugfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/debugfs.c b/arch/x86/kvm/debugfs.c index 9240b3b7f8dd..cfed36aba2f7 100644 --- a/arch/x86/kvm/debugfs.c +++ b/arch/x86/kvm/debugfs.c @@ -48,7 +48,7 @@ DEFINE_SIMPLE_ATTRIBUTE(vcpu_tsc_scaling_fops, vcpu_get_tsc_scaling_ratio, NULL, static int vcpu_get_tsc_scaling_frac_bits(void *data, u64 *val) { - *val = kvm_tsc_scaling_ratio_frac_bits; + *val = kvm_caps.tsc_scaling_ratio_frac_bits; return 0; } @@ -66,7 +66,7 @@ void kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu, struct dentry *debugfs_ debugfs_dentry, vcpu, &vcpu_timer_advance_ns_fops); - if (kvm_has_tsc_control) { + if (kvm_caps.has_tsc_control) { debugfs_create_file("tsc-scaling-ratio", 0444, debugfs_dentry, vcpu, &vcpu_tsc_scaling_fops); |