diff options
author | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2013-10-07 12:48:02 -0400 |
---|---|---|
committer | Alexander Graf <agraf@suse.de> | 2013-10-17 12:43:34 -0400 |
commit | a78b55d1c0218b6d91d504941d20e36435c276f5 (patch) | |
tree | 2c9ff880ba9fd1e83cc54464e8d86b56593217f1 /arch/powerpc/include/asm/kvm_ppc.h | |
parent | cbbc58d4fdfab1a39a6ac1b41fcb17885952157a (diff) |
kvm: powerpc: book3s: drop is_hv_enabled
drop is_hv_enabled, because that should not be a callback property
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc/include/asm/kvm_ppc.h')
-rw-r--r-- | arch/powerpc/include/asm/kvm_ppc.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h index 3069cf4dcc88..c8317fbf92c4 100644 --- a/arch/powerpc/include/asm/kvm_ppc.h +++ b/arch/powerpc/include/asm/kvm_ppc.h | |||
@@ -183,7 +183,6 @@ union kvmppc_one_reg { | |||
183 | 183 | ||
184 | struct kvmppc_ops { | 184 | struct kvmppc_ops { |
185 | struct module *owner; | 185 | struct module *owner; |
186 | bool is_hv_enabled; | ||
187 | int (*get_sregs)(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs); | 186 | int (*get_sregs)(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs); |
188 | int (*set_sregs)(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs); | 187 | int (*set_sregs)(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs); |
189 | int (*get_one_reg)(struct kvm_vcpu *vcpu, u64 id, | 188 | int (*get_one_reg)(struct kvm_vcpu *vcpu, u64 id, |
@@ -232,6 +231,11 @@ struct kvmppc_ops { | |||
232 | extern struct kvmppc_ops *kvmppc_hv_ops; | 231 | extern struct kvmppc_ops *kvmppc_hv_ops; |
233 | extern struct kvmppc_ops *kvmppc_pr_ops; | 232 | extern struct kvmppc_ops *kvmppc_pr_ops; |
234 | 233 | ||
234 | static inline bool is_kvmppc_hv_enabled(struct kvm *kvm) | ||
235 | { | ||
236 | return kvm->arch.kvm_ops == kvmppc_hv_ops; | ||
237 | } | ||
238 | |||
235 | /* | 239 | /* |
236 | * Cuts out inst bits with ordering according to spec. | 240 | * Cuts out inst bits with ordering according to spec. |
237 | * That means the leftmost bit is zero. All given bits are included. | 241 | * That means the leftmost bit is zero. All given bits are included. |