diff mbox

[1/3] Make 'qemu_init_vcpu' a function (instead of a macro)

Message ID 20110921154221.27648.63402.stgit@ginnungagap.bsc.es
State New
Headers show

Commit Message

Lluís Vilanova Sept. 21, 2011, 3:42 p.m. UTC 
Implementation with 'CONFIG_USER_ONLY' is moved into new file 'cpus-user.c'.

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

Comments

Anthony Liguori Sept. 23, 2011, 4:20 p.m. UTC | #1 
On 09/21/2011 10:42 AM, Lluís Vilanova wrote:
> Implementation with 'CONFIG_USER_ONLY' is moved into new file 'cpus-user.c'.
>
> Signed-off-by: Lluís Vilanova<vilanova@ac.upc.edu>
> ---
>   Makefile.objs |    1 +
>   cpus-user.c   |    8 ++++++++
>   qemu-common.h |    4 ----
>   3 files changed, 9 insertions(+), 4 deletions(-)
>   create mode 100644 cpus-user.c
>
> diff --git a/Makefile.objs b/Makefile.objs
> index 1c65087..c94abd9 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..c1e5e58
> --- /dev/null
> +++ b/cpus-user.c
> @@ -0,0 +1,8 @@
> +/* Implementation of routines in "cpus.c" when compiling for CONFIG_USER_ONLY */
> +
> +#include "qemu-common.h"
> +
> +
> +void qemu_init_vcpu(void *env)
> +{
> +}

New files need a copyright and license.

Regards,

Anthony Liguori

> 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;
>
>
>
diff mbox

Patch

diff --git a/Makefile.objs b/Makefile.objs
index 1c65087..c94abd9 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..c1e5e58
--- /dev/null
+++ b/cpus-user.c
@@ -0,0 +1,8 @@ 
+/* Implementation of routines in "cpus.c" when compiling for CONFIG_USER_ONLY */
+
+#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;