]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: x86: Drop local pvclock_flags variable in kvm_guest_time_update()
authorSean Christopherson <seanjc@google.com>
Sat, 1 Feb 2025 01:38:19 +0000 (17:38 -0800)
committerSean Christopherson <seanjc@google.com>
Wed, 12 Feb 2025 18:45:54 +0000 (10:45 -0800)
Drop the local pvclock_flags in kvm_guest_time_update(), the local variable
is immediately shoved into the per-vCPU "cache", i.e. the local variable
serves no purpose.

No functional change intended.

Reviewed-by: Paul Durrant <paul@xen.org>
Link: https://lore.kernel.org/r/20250201013827.680235-4-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
arch/x86/kvm/x86.c

index fa409d540d831b8c9255e970551cdad67b7833f0..08e9ea87994b3cff975ecf214a481f19dc83af6c 100644 (file)
@@ -3178,7 +3178,6 @@ static int kvm_guest_time_update(struct kvm_vcpu *v)
        struct kvm_arch *ka = &v->kvm->arch;
        s64 kernel_ns;
        u64 tsc_timestamp, host_tsc;
-       u8 pvclock_flags;
        bool use_master_clock;
 #ifdef CONFIG_KVM_XEN
        /*
@@ -3261,11 +3260,9 @@ static int kvm_guest_time_update(struct kvm_vcpu *v)
        vcpu->last_guest_tsc = tsc_timestamp;
 
        /* If the host uses TSC clocksource, then it is stable */
-       pvclock_flags = 0;
+       vcpu->hv_clock.flags = 0;
        if (use_master_clock)
-               pvclock_flags |= PVCLOCK_TSC_STABLE_BIT;
-
-       vcpu->hv_clock.flags = pvclock_flags;
+               vcpu->hv_clock.flags |= PVCLOCK_TSC_STABLE_BIT;
 
        if (vcpu->pv_time.active)
                kvm_setup_guest_pvclock(v, &vcpu->pv_time, 0, false);