Re: [PATCH 2/4] KVM: PPC: booke: Wrap __kvmppc_vcpu_run()

From: yu liu <redacted>
=20
We need to save/restore SPE environment on e500 core.
Wrap __kvmppc_vcpu_run() so that we can put the SPE code in
e500.c.
=20
Signed-off-by: Liu Yu <redacted>
Signed-off-by: Scott Wood <redacted>
---
arch/powerpc/include/asm/kvm_ppc.h  |    1 +
arch/powerpc/kvm/44x.c              |    5 +++++
arch/powerpc/kvm/book3s.c           |    1 -
arch/powerpc/kvm/booke_interrupts.S |    2 +-
arch/powerpc/kvm/e500.c             |    5 +++++
5 files changed, 12 insertions(+), 2 deletions(-)
=20

diff --git a/arch/powerpc/include/asm/kvm_ppc.h =

index ecb3bc7..4e7a1be 100644

--- a/arch/powerpc/include/asm/kvm_ppc.h
+++ b/arch/powerpc/include/asm/kvm_ppc.h

@@ -42,6 +42,7 @@ enum emulation_result {

	EMULATE_AGAIN,        /* something went wrong. go again */
};
=20
+extern int __kvmppc_vcpu_entry(struct kvm_run *kvm_run, struct =

extern char kvmppc_handlers_start[];
extern unsigned long kvmppc_handler_len;

diff --git a/arch/powerpc/kvm/44x.c b/arch/powerpc/kvm/44x.c
index 74d0e74..3d2e7d2 100644
--- a/arch/powerpc/kvm/44x.c
+++ b/arch/powerpc/kvm/44x.c

@@ -147,6 +147,11 @@ void kvmppc_core_vcpu_free(struct kvm_vcpu *vcpu)

	kmem_cache_free(kvm_vcpu_cache, vcpu_44x);
}
=20
+int __kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
+{
+	return __kvmppc_vcpu_entry(kvm_run, vcpu);

+}
+
static int __init kvmppc_44x_init(void)
{
	int r;

diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c
index c961de4..fb12853 100644
--- a/arch/powerpc/kvm/book3s.c
+++ b/arch/powerpc/kvm/book3s.c

@@ -1379,7 +1379,6 @@ void kvmppc_core_vcpu_free(struct kvm_vcpu =

int __kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
{
	int ret;

diff --git a/arch/powerpc/kvm/booke_interrupts.S =

index 1cc471f..ab29f5f 100644

--- a/arch/powerpc/kvm/booke_interrupts.S
+++ b/arch/powerpc/kvm/booke_interrupts.S

@@ -293,7 +293,7 @@ heavyweight_exit:
 *  r3: kvm_run pointer
 *  r4: vcpu pointer
 */
-_GLOBAL(__kvmppc_vcpu_run)
+_GLOBAL(__kvmppc_vcpu_entry)

=20

diff --git a/arch/powerpc/kvm/e500.c b/arch/powerpc/kvm/e500.c
index e3768ee..e762634 100644
--- a/arch/powerpc/kvm/e500.c
+++ b/arch/powerpc/kvm/e500.c

@@ -70,6 +70,11 @@ int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu)

	return 0;
}
=20
+int __kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
+{
+	return __kvmppc_vcpu_entry(kvm_run, vcpu);
+}