summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-01-05 14:44:08 +0100
committerAndreas Färber <afaerber@suse.de>2013-01-08 21:03:44 +0100
commit75a192aa68e7801ab8465b3345ac74d6d3cdceca (patch)
tree70949cf6e43dcbe308e59f42c3b26bf29685cec8
parente8beac00bd26a60e788ab336f38bc12a95b20f0d (diff)
downloadqemu-75a192aa68e7801ab8465b3345ac74d6d3cdceca.tar.gz
qemu-75a192aa68e7801ab8465b3345ac74d6d3cdceca.tar.bz2
qemu-75a192aa68e7801ab8465b3345ac74d6d3cdceca.zip
qemu-common.h: Make qemu_init_vcpu() stub static inline
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 <vilanova@ac.upc.edu> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
-rw-r--r--include/qemu-common.h4
-rw-r--r--target-alpha/cpu.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 2b83de395c..ca464bb367 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 212a6250ba..40e980933f 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. */