diff options
author | Avi Kivity <avi@qumranet.com> | 2008-04-13 10:54:35 -0400 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-04-27 05:04:13 -0400 |
commit | a45352908b88d383bc40e1e4d1a6cc5bbcefc895 (patch) | |
tree | be0f519e05f8df4409b595928338b2939ed64f6a /include | |
parent | 3d80840d96127401ba6aeadd813c3a15b84e70fe (diff) |
KVM: Rename VCPU_MP_STATE_* to KVM_MP_STATE_*
We wish to export it to userspace, so move it into the kvm namespace.
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-ia64/kvm_host.h | 8 | ||||
-rw-r--r-- | include/asm-x86/kvm_host.h | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/asm-ia64/kvm_host.h b/include/asm-ia64/kvm_host.h index d6d6e15c1924..c082c208c1f3 100644 --- a/include/asm-ia64/kvm_host.h +++ b/include/asm-ia64/kvm_host.h | |||
@@ -318,10 +318,10 @@ struct kvm_vcpu_arch { | |||
318 | int vmm_tr_slot; | 318 | int vmm_tr_slot; |
319 | int vm_tr_slot; | 319 | int vm_tr_slot; |
320 | 320 | ||
321 | #define VCPU_MP_STATE_RUNNABLE 0 | 321 | #define KVM_MP_STATE_RUNNABLE 0 |
322 | #define VCPU_MP_STATE_UNINITIALIZED 1 | 322 | #define KVM_MP_STATE_UNINITIALIZED 1 |
323 | #define VCPU_MP_STATE_INIT_RECEIVED 2 | 323 | #define KVM_MP_STATE_INIT_RECEIVED 2 |
324 | #define VCPU_MP_STATE_HALTED 3 | 324 | #define KVM_MP_STATE_HALTED 3 |
325 | int mp_state; | 325 | int mp_state; |
326 | 326 | ||
327 | #define MAX_PTC_G_NUM 3 | 327 | #define MAX_PTC_G_NUM 3 |
diff --git a/include/asm-x86/kvm_host.h b/include/asm-x86/kvm_host.h index 15169cb71c83..f35a6ad43c0a 100644 --- a/include/asm-x86/kvm_host.h +++ b/include/asm-x86/kvm_host.h | |||
@@ -227,11 +227,11 @@ struct kvm_vcpu_arch { | |||
227 | u64 shadow_efer; | 227 | u64 shadow_efer; |
228 | u64 apic_base; | 228 | u64 apic_base; |
229 | struct kvm_lapic *apic; /* kernel irqchip context */ | 229 | struct kvm_lapic *apic; /* kernel irqchip context */ |
230 | #define VCPU_MP_STATE_RUNNABLE 0 | 230 | #define KVM_MP_STATE_RUNNABLE 0 |
231 | #define VCPU_MP_STATE_UNINITIALIZED 1 | 231 | #define KVM_MP_STATE_UNINITIALIZED 1 |
232 | #define VCPU_MP_STATE_INIT_RECEIVED 2 | 232 | #define KVM_MP_STATE_INIT_RECEIVED 2 |
233 | #define VCPU_MP_STATE_SIPI_RECEIVED 3 | 233 | #define KVM_MP_STATE_SIPI_RECEIVED 3 |
234 | #define VCPU_MP_STATE_HALTED 4 | 234 | #define KVM_MP_STATE_HALTED 4 |
235 | int mp_state; | 235 | int mp_state; |
236 | int sipi_vector; | 236 | int sipi_vector; |
237 | u64 ia32_misc_enable_msr; | 237 | u64 ia32_misc_enable_msr; |