[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 22/24] kvm: i386: require KVM_CAP_ADJUST_CLOCK
From: |
Paolo Bonzini |
Subject: |
[PULL 22/24] kvm: i386: require KVM_CAP_ADJUST_CLOCK |
Date: |
Thu, 26 Oct 2023 01:27:15 +0200 |
This was introduced in KVM in Linux 2.6.33, we can require it
unconditionally. KVM_CLOCK_TSC_STABLE was only added in Linux 4.9,
for now do not require it (though it would allow the removal of some
pretty yucky code).
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/i386/kvm/clock.c | 4 ----
target/i386/kvm/kvm.c | 6 +-----
target/i386/kvm/kvm_i386.h | 1 -
3 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
index f25977d3f68..e756b0aa43f 100644
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
@@ -333,10 +333,6 @@ void kvmclock_create(bool create_always)
X86CPU *cpu = X86_CPU(first_cpu);
assert(kvm_enabled());
- if (!kvm_has_adjust_clock()) {
- return;
- }
-
if (create_always ||
cpu->env.features[FEAT_KVM] & ((1ULL << KVM_FEATURE_CLOCKSOURCE) |
(1ULL << KVM_FEATURE_CLOCKSOURCE2))) {
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 42574c2df89..d4bf327fa6f 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -98,6 +98,7 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
KVM_CAP_INFO(VCPU_EVENTS),
KVM_CAP_INFO(X86_ROBUST_SINGLESTEP),
KVM_CAP_INFO(MCE),
+ KVM_CAP_INFO(ADJUST_CLOCK),
KVM_CAP_LAST_INFO
};
@@ -177,11 +178,6 @@ bool kvm_has_adjust_clock_stable(void)
return (ret & KVM_CLOCK_TSC_STABLE);
}
-bool kvm_has_adjust_clock(void)
-{
- return kvm_check_extension(kvm_state, KVM_CAP_ADJUST_CLOCK);
-}
-
bool kvm_has_exception_payload(void)
{
return has_exception_payload;
diff --git a/target/i386/kvm/kvm_i386.h b/target/i386/kvm/kvm_i386.h
index 55d4e68c342..7e60ea4f23f 100644
--- a/target/i386/kvm/kvm_i386.h
+++ b/target/i386/kvm/kvm_i386.h
@@ -50,7 +50,6 @@ void kvm_request_xsave_components(X86CPU *cpu, uint64_t mask);
#ifdef CONFIG_KVM
-bool kvm_has_adjust_clock(void);
bool kvm_has_adjust_clock_stable(void);
bool kvm_has_exception_payload(void);
void kvm_synchronize_all_tsc(void);
--
2.41.0
- [PULL 12/24] kvm: require KVM_IRQFD for kernel irqchip, (continued)
- [PULL 12/24] kvm: require KVM_IRQFD for kernel irqchip, Paolo Bonzini, 2023/10/25
- [PULL 13/24] kvm: drop reference to KVM_CAP_PCI_2_3, Paolo Bonzini, 2023/10/25
- [PULL 09/24] kvm: require KVM_CAP_INTERNAL_ERROR_DATA, Paolo Bonzini, 2023/10/25
- [PULL 14/24] kvm: assume that many ioeventfds can be created, Paolo Bonzini, 2023/10/25
- [PULL 11/24] kvm: require KVM_IRQFD for kernel irqchip, Paolo Bonzini, 2023/10/25
- [PULL 15/24] kvm: require KVM_CAP_IOEVENTFD and KVM_CAP_IOEVENTFD_ANY_LENGTH, Paolo Bonzini, 2023/10/25
- [PULL 17/24] kvm: i386: move KVM_CAP_IRQ_ROUTING detection to kvm_arch_required_capabilities, Paolo Bonzini, 2023/10/25
- [PULL 18/24] kvm: i386: require KVM_CAP_DEBUGREGS, Paolo Bonzini, 2023/10/25
- [PULL 20/24] kvm: i386: require KVM_CAP_SET_VCPU_EVENTS and KVM_CAP_X86_ROBUST_SINGLESTEP, Paolo Bonzini, 2023/10/25
- [PULL 19/24] kvm: i386: require KVM_CAP_XSAVE, Paolo Bonzini, 2023/10/25
- [PULL 22/24] kvm: i386: require KVM_CAP_ADJUST_CLOCK,
Paolo Bonzini <=
- [PULL 23/24] kvm: i386: require KVM_CAP_SET_IDENTITY_MAP_ADDR, Paolo Bonzini, 2023/10/25
- [PULL 21/24] kvm: i386: require KVM_CAP_MCE, Paolo Bonzini, 2023/10/25
- [PULL 16/24] kvm: unify listeners for PIO address space, Paolo Bonzini, 2023/10/25
- [PULL 24/24] kvm: i8254: require KVM_CAP_PIT2 and KVM_CAP_PIT_STATE2, Paolo Bonzini, 2023/10/25