diff options
author | Guo Hui Liu <liuguohui@gmail.com> | 2014-09-12 01:43:19 -0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-09-16 08:44:20 -0400 |
commit | 105b21bbf67bb50000a0dc4b547a2f99b6376136 (patch) | |
tree | 87e3e6394fd2057a67e7bd5d17347940a1aa74ec | |
parent | a183b638b61c104920a42b1eb7668953f8ada5cb (diff) |
KVM: x86: Use kvm_make_request when applicable
This patch replace the set_bit method by kvm_make_request
to make code more readable and consistent.
Signed-off-by: Guo Hui Liu <liuguohui@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | arch/x86/kvm/x86.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 7b25aa2725f8..68660b31457e 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -1521,7 +1521,7 @@ static void kvm_gen_update_masterclock(struct kvm *kvm) | |||
1521 | pvclock_update_vm_gtod_copy(kvm); | 1521 | pvclock_update_vm_gtod_copy(kvm); |
1522 | 1522 | ||
1523 | kvm_for_each_vcpu(i, vcpu, kvm) | 1523 | kvm_for_each_vcpu(i, vcpu, kvm) |
1524 | set_bit(KVM_REQ_CLOCK_UPDATE, &vcpu->requests); | 1524 | kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu); |
1525 | 1525 | ||
1526 | /* guest entries allowed */ | 1526 | /* guest entries allowed */ |
1527 | kvm_for_each_vcpu(i, vcpu, kvm) | 1527 | kvm_for_each_vcpu(i, vcpu, kvm) |
@@ -1664,7 +1664,7 @@ static void kvmclock_update_fn(struct work_struct *work) | |||
1664 | struct kvm_vcpu *vcpu; | 1664 | struct kvm_vcpu *vcpu; |
1665 | 1665 | ||
1666 | kvm_for_each_vcpu(i, vcpu, kvm) { | 1666 | kvm_for_each_vcpu(i, vcpu, kvm) { |
1667 | set_bit(KVM_REQ_CLOCK_UPDATE, &vcpu->requests); | 1667 | kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu); |
1668 | kvm_vcpu_kick(vcpu); | 1668 | kvm_vcpu_kick(vcpu); |
1669 | } | 1669 | } |
1670 | } | 1670 | } |
@@ -1673,7 +1673,7 @@ static void kvm_gen_kvmclock_update(struct kvm_vcpu *v) | |||
1673 | { | 1673 | { |
1674 | struct kvm *kvm = v->kvm; | 1674 | struct kvm *kvm = v->kvm; |
1675 | 1675 | ||
1676 | set_bit(KVM_REQ_CLOCK_UPDATE, &v->requests); | 1676 | kvm_make_request(KVM_REQ_CLOCK_UPDATE, v); |
1677 | schedule_delayed_work(&kvm->arch.kvmclock_update_work, | 1677 | schedule_delayed_work(&kvm->arch.kvmclock_update_work, |
1678 | KVMCLOCK_UPDATE_DELAY); | 1678 | KVMCLOCK_UPDATE_DELAY); |
1679 | } | 1679 | } |
@@ -2849,7 +2849,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) | |||
2849 | if (unlikely(vcpu->arch.tsc_offset_adjustment)) { | 2849 | if (unlikely(vcpu->arch.tsc_offset_adjustment)) { |
2850 | adjust_tsc_offset_host(vcpu, vcpu->arch.tsc_offset_adjustment); | 2850 | adjust_tsc_offset_host(vcpu, vcpu->arch.tsc_offset_adjustment); |
2851 | vcpu->arch.tsc_offset_adjustment = 0; | 2851 | vcpu->arch.tsc_offset_adjustment = 0; |
2852 | set_bit(KVM_REQ_CLOCK_UPDATE, &vcpu->requests); | 2852 | kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu); |
2853 | } | 2853 | } |
2854 | 2854 | ||
2855 | if (unlikely(vcpu->cpu != cpu) || check_tsc_unstable()) { | 2855 | if (unlikely(vcpu->cpu != cpu) || check_tsc_unstable()) { |
@@ -5606,7 +5606,7 @@ static void pvclock_gtod_update_fn(struct work_struct *work) | |||
5606 | spin_lock(&kvm_lock); | 5606 | spin_lock(&kvm_lock); |
5607 | list_for_each_entry(kvm, &vm_list, vm_list) | 5607 | list_for_each_entry(kvm, &vm_list, vm_list) |
5608 | kvm_for_each_vcpu(i, vcpu, kvm) | 5608 | kvm_for_each_vcpu(i, vcpu, kvm) |
5609 | set_bit(KVM_REQ_MASTERCLOCK_UPDATE, &vcpu->requests); | 5609 | kvm_make_request(KVM_REQ_MASTERCLOCK_UPDATE, vcpu); |
5610 | atomic_set(&kvm_guest_has_master_clock, 0); | 5610 | atomic_set(&kvm_guest_has_master_clock, 0); |
5611 | spin_unlock(&kvm_lock); | 5611 | spin_unlock(&kvm_lock); |
5612 | } | 5612 | } |
@@ -6984,7 +6984,7 @@ int kvm_arch_hardware_enable(void) | |||
6984 | list_for_each_entry(kvm, &vm_list, vm_list) { | 6984 | list_for_each_entry(kvm, &vm_list, vm_list) { |
6985 | kvm_for_each_vcpu(i, vcpu, kvm) { | 6985 | kvm_for_each_vcpu(i, vcpu, kvm) { |
6986 | if (!stable && vcpu->cpu == smp_processor_id()) | 6986 | if (!stable && vcpu->cpu == smp_processor_id()) |
6987 | set_bit(KVM_REQ_CLOCK_UPDATE, &vcpu->requests); | 6987 | kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu); |
6988 | if (stable && vcpu->arch.last_host_tsc > local_tsc) { | 6988 | if (stable && vcpu->arch.last_host_tsc > local_tsc) { |
6989 | backwards_tsc = true; | 6989 | backwards_tsc = true; |
6990 | if (vcpu->arch.last_host_tsc > max_tsc) | 6990 | if (vcpu->arch.last_host_tsc > max_tsc) |
@@ -7038,8 +7038,7 @@ int kvm_arch_hardware_enable(void) | |||
7038 | kvm_for_each_vcpu(i, vcpu, kvm) { | 7038 | kvm_for_each_vcpu(i, vcpu, kvm) { |
7039 | vcpu->arch.tsc_offset_adjustment += delta_cyc; | 7039 | vcpu->arch.tsc_offset_adjustment += delta_cyc; |
7040 | vcpu->arch.last_host_tsc = local_tsc; | 7040 | vcpu->arch.last_host_tsc = local_tsc; |
7041 | set_bit(KVM_REQ_MASTERCLOCK_UPDATE, | 7041 | kvm_make_request(KVM_REQ_MASTERCLOCK_UPDATE, vcpu); |
7042 | &vcpu->requests); | ||
7043 | } | 7042 | } |
7044 | 7043 | ||
7045 | /* | 7044 | /* |