Re: [PATCH 18/27] Add Book3s_64 offsets to asm-offsets.c

Benjamin Herrenschmidt
2009-10-29T02:45:30Z

On Wed, 2009-10-21 at 17:03 +0200, Alexander Graf wrote:
> We need to access some VCPU fields from assembly code. In order to get
> the proper offsets, we have to define them in asm-offsets.c.
>
> Signed-off-by: Alexander Graf <agraf-l3A5Bk7waGM@public.gmane.org>

Acked-by: Benjamin Herrenschmidt <benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>

> ---
> arch/powerpc/kernel/asm-offsets.c | 13 +++++++++++++
> 1 files changed, 13 insertions(+), 0 deletions(-)
>
> diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
> index 0812b0f..aba3ea6 100644
> --- a/arch/powerpc/kernel/asm-offsets.c
> +++ b/arch/powerpc/kernel/asm-offsets.c
> @@ -398,6 +398,19 @@ int main(void)
> DEFINE(VCPU_LAST_INST, offsetof(struct kvm_vcpu, arch.last_inst));
> DEFINE(VCPU_FAULT_DEAR, offsetof(struct kvm_vcpu, arch.fault_dear));
> DEFINE(VCPU_FAULT_ESR, offsetof(struct kvm_vcpu, arch.fault_esr));
> +
> + /* book3s_64 */
> +#ifdef CONFIG_PPC64
> + DEFINE(VCPU_FAULT_DSISR, offsetof(struct kvm_vcpu, arch.fault_dsisr));
> + DEFINE(VCPU_HOST_RETIP, offsetof(struct kvm_vcpu, arch.host_retip));
> + DEFINE(VCPU_HOST_R2, offsetof(struct kvm_vcpu, arch.host_r2));
> + DEFINE(VCPU_HOST_MSR, offsetof(struct kvm_vcpu, arch.host_msr));
> + DEFINE(VCPU_SHADOW_MSR, offsetof(struct kvm_vcpu, arch.shadow_msr));
> + DEFINE(VCPU_TRAMPOLINE_LOWMEM, offsetof(struct kvm_vcpu, arch.trampoline_lowmem));
> + DEFINE(VCPU_TRAMPOLINE_ENTER, offsetof(struct kvm_vcpu, arch.trampoline_enter));
> + DEFINE(VCPU_HIGHMEM_HANDLER, offsetof(struct kvm_vcpu, arch.highmem_handler));
> + DEFINE(VCPU_HFLAGS, offsetof(struct kvm_vcpu, arch.hflags));
> +#endif
> #endif
> #ifdef CONFIG_44x
> DEFINE(PGD_T_LOG2, PGD_T_LOG2);