On Mon, Jan 07, 2013 at 04:14:37PM +0100, Andreas Färber wrote:
> Turn the *-user macro into a no-op inline function to avoid
> unused-variable warnings and band-aiding #ifdef'ery.
>
> This allows to drop an #ifdef for alpha and avoids more for unicore32
> and other upcoming trivial realizefn implementations.
>
> Suggested-by: Lluís Vilanova <vilan...@ac.upc.edu>
> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
> Signed-off-by: Andreas Färber <afaer...@suse.de>
Reviewed-by: Eduardo Habkost <ehabk...@redhat.com>
> ---
> include/qemu-common.h | 4 +++-
> target-alpha/cpu.c | 2 --
> 2 Dateien geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)
>
> diff --git a/include/qemu-common.h b/include/qemu-common.h
> index 2b83de3..ca464bb 100644
> --- a/include/qemu-common.h
> +++ b/include/qemu-common.h
> @@ -288,7 +288,9 @@ struct qemu_work_item {
> };
>
> #ifdef CONFIG_USER_ONLY
> -#define qemu_init_vcpu(env) do { } while (0)
> +static inline void qemu_init_vcpu(void *env)
> +{
> +}
> #else
> void qemu_init_vcpu(void *env);
> #endif
> diff --git a/target-alpha/cpu.c b/target-alpha/cpu.c
> index 212a625..40e9809 100644
> --- a/target-alpha/cpu.c
> +++ b/target-alpha/cpu.c
> @@ -26,11 +26,9 @@
>
> static void alpha_cpu_realize(Object *obj, Error **errp)
> {
> -#ifndef CONFIG_USER_ONLY
> AlphaCPU *cpu = ALPHA_CPU(obj);
>
> qemu_init_vcpu(&cpu->env);
> -#endif
> }
>
> /* Sort alphabetically by type name. */
> --
> 1.7.10.4
>
>
--
Eduardo
