Re: [Qemu-devel] [PATCH] ppc: Fix up usermode only builds

[Alexander Graf]

On 23.10.2011, at 20:25, David Gibson <address@hidden> wrote:

> The recent usage of MemoryRegion in kvm_ppc.h breaks builds with
> CONFIG_USER_ONLY=y.  This patch fixes it.
> 
> Signed-off-by: David Gibson <address@hidden>

Ouch. Thanks a lot for the fix!

Alex

> ---
> target-ppc/kvm_ppc.h |    4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h
> index b0d6fb6..f9c0198 100644
> --- a/target-ppc/kvm_ppc.h
> +++ b/target-ppc/kvm_ppc.h
> @@ -23,9 +23,11 @@ int kvmppc_get_hypercall(CPUState *env, uint8_t *buf, int 
> buf_len);
> int kvmppc_set_interrupt(CPUState *env, int irq, int level);
> void kvmppc_set_papr(CPUState *env);
> int kvmppc_smt_threads(void);
> +#ifndef CONFIG_USER_ONLY
> off_t kvmppc_alloc_rma(const char *name, MemoryRegion *sysmem);
> void *kvmppc_create_spapr_tce(uint32_t liobn, uint32_t window_size, int *pfd);
> int kvmppc_remove_spapr_tce(void *table, int pfd, uint32_t window_size);
> +#endif /* !CONFIG_USER_ONLY */
> const ppc_def_t *kvmppc_host_cpu_def(void);
> 
> #else
> @@ -69,6 +71,7 @@ static inline int kvmppc_smt_threads(void)
>     return 1;
> }
> 
> +#ifndef CONFIG_USER_ONLY
> static inline off_t kvmppc_alloc_rma(const char *name, MemoryRegion *sysmem)
> {
>     return 0;
> @@ -85,6 +88,7 @@ static inline int kvmppc_remove_spapr_tce(void *table, int 
> pfd,
> {
>     return -1;
> }
> +#endif /* !CONFIG_USER_ONLY */
> 
> static inline const ppc_def_t *kvmppc_host_cpu_def(void)
> {
> -- 
> 1.7.6.3
>