diff options
author | Avi Kivity <avi@qumranet.com> | 2007-10-16 11:22:08 -0400 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-01-30 10:52:53 -0500 |
commit | 3176bc3e59cc4e30ac10888f08124b31969a7a88 (patch) | |
tree | a5f7bb276f3b553fffc286bcb28714d478776eb9 | |
parent | ab6ef34b906546d85d92dbc3e0fb4e01cce05f62 (diff) |
KVM: Rename KVM_TLB_FLUSH to KVM_REQ_TLB_FLUSH
We now have a new namespace, KVM_REQ_*, for bits in vcpu->requests.
Signed-off-by: Avi Kivity <avi@qumranet.com>
-rw-r--r-- | drivers/kvm/kvm.h | 2 | ||||
-rw-r--r-- | drivers/kvm/kvm_main.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h index 1edf8a5e365e..6ae7b6332e32 100644 --- a/drivers/kvm/kvm.h +++ b/drivers/kvm/kvm.h | |||
@@ -67,7 +67,7 @@ | |||
67 | /* | 67 | /* |
68 | * vcpu->requests bit members | 68 | * vcpu->requests bit members |
69 | */ | 69 | */ |
70 | #define KVM_TLB_FLUSH 0 | 70 | #define KVM_REQ_TLB_FLUSH 0 |
71 | 71 | ||
72 | /* | 72 | /* |
73 | * Address types: | 73 | * Address types: |
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index 4c96817929fd..1879b409bed2 100644 --- a/drivers/kvm/kvm_main.c +++ b/drivers/kvm/kvm_main.c | |||
@@ -212,7 +212,7 @@ void kvm_flush_remote_tlbs(struct kvm *kvm) | |||
212 | vcpu = kvm->vcpus[i]; | 212 | vcpu = kvm->vcpus[i]; |
213 | if (!vcpu) | 213 | if (!vcpu) |
214 | continue; | 214 | continue; |
215 | if (test_and_set_bit(KVM_TLB_FLUSH, &vcpu->requests)) | 215 | if (test_and_set_bit(KVM_REQ_TLB_FLUSH, &vcpu->requests)) |
216 | continue; | 216 | continue; |
217 | cpu = vcpu->cpu; | 217 | cpu = vcpu->cpu; |
218 | if (cpu != -1 && cpu != raw_smp_processor_id()) | 218 | if (cpu != -1 && cpu != raw_smp_processor_id()) |
@@ -2171,7 +2171,7 @@ again: | |||
2171 | kvm_guest_enter(); | 2171 | kvm_guest_enter(); |
2172 | 2172 | ||
2173 | if (vcpu->requests) | 2173 | if (vcpu->requests) |
2174 | if (test_and_clear_bit(KVM_TLB_FLUSH, &vcpu->requests)) | 2174 | if (test_and_clear_bit(KVM_REQ_TLB_FLUSH, &vcpu->requests)) |
2175 | kvm_x86_ops->tlb_flush(vcpu); | 2175 | kvm_x86_ops->tlb_flush(vcpu); |
2176 | 2176 | ||
2177 | kvm_x86_ops->run(vcpu, kvm_run); | 2177 | kvm_x86_ops->run(vcpu, kvm_run); |