Re: [Qemu-devel] [PATCH v3 1/3] Make 'qemu_init_vcpu' a function (instead of a macro)

["Lluís Vilanova" <vilanova@ac.upc.edu>]

Lluís Vilanova writes:

> Implementation with 'CONFIG_USER_ONLY' is moved into new file 'cpus-user.c'.

Ping


> Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
> ---
>  Makefile.objs |    1 +
>  cpus-user.c   |   15 +++++++++++++++
>  qemu-common.h |    4 ----
>  3 files changed, 16 insertions(+), 4 deletions(-)
>  create mode 100644 cpus-user.c

> diff --git a/Makefile.objs b/Makefile.objs
> index 8afed3d..0656991 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -177,6 +177,7 @@ user-obj-y =
>  user-obj-y += envlist.o path.o
>  user-obj-y += tcg-runtime.o host-utils.o
>  user-obj-y += cutils.o cache-utils.o
> +user-obj-y += cpus-user.o
>  user-obj-y += $(trace-obj-y)
 
>  ######################################################################
> diff --git a/cpus-user.c b/cpus-user.c
> new file mode 100644
> index 0000000..50e45ce
> --- /dev/null
> +++ b/cpus-user.c
> @@ -0,0 +1,15 @@
> +/*
> + * Implementation of routines in "cpus.c" when compiling for CONFIG_USER_ONLY.
> + *
> + * Copyright (C) 2011 Lluís Vilanova <vilanova@ac.upc.edu>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
> + */
> +
> +#include "qemu-common.h"
> +
> +
> +void qemu_init_vcpu(void *env)
> +{
> +}
> diff --git a/qemu-common.h b/qemu-common.h
> index 404c421..7cda162 100644
> --- a/qemu-common.h
> +++ b/qemu-common.h
> @@ -296,11 +296,7 @@ struct qemu_work_item {
>      int done;
>  };
 
> -#ifdef CONFIG_USER_ONLY
> -#define qemu_init_vcpu(env) do { } while (0)
> -#else
>  void qemu_init_vcpu(void *env);
> -#endif
 
>  typedef struct QEMUIOVector {
>      struct iovec *iov;



-- 
 "And it's much the same thing with knowledge, for whenever you learn
 something new, the whole world becomes that much richer."
 -- The Princess of Pure Reason, as told by Norton Juster in The Phantom
 Tollbooth