From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59772) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3V1-0008O8-Pj for qemu-devel@nongnu.org; Sun, 06 May 2012 11:35:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SR3Uy-0000bm-Ho for qemu-devel@nongnu.org; Sun, 06 May 2012 11:35:51 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55216 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3Uy-0000bE-9K for qemu-devel@nongnu.org; Sun, 06 May 2012 11:35:48 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 6 May 2012 17:34:07 +0200 Message-Id: <1336318514-30906-8-git-send-email-afaerber@suse.de> In-Reply-To: <1336318514-30906-1-git-send-email-afaerber@suse.de> References: <1336318514-30906-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-next 07/74] target-sparc: Let cpu_sparc_init() return SPARCCPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori Make include paths for cpu-qom.h consistent, so that SPARCCPU can be used in cpu.h. Let cpu_init() return CPUSPARCState for backwards compatibility. Signed-off-by: Andreas F=C3=A4rber --- target-sparc/cpu.c | 4 ++-- target-sparc/cpu.h | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/target-sparc/cpu.c b/target-sparc/cpu.c index 7ac6bdb..8ccac23 100644 --- a/target-sparc/cpu.c +++ b/target-sparc/cpu.c @@ -111,7 +111,7 @@ static int cpu_sparc_register(CPUSPARCState *env, con= st char *cpu_model) return 0; } =20 -CPUSPARCState *cpu_sparc_init(const char *cpu_model) +SPARCCPU *cpu_sparc_init(const char *cpu_model) { SPARCCPU *cpu; CPUSPARCState *env; @@ -129,7 +129,7 @@ CPUSPARCState *cpu_sparc_init(const char *cpu_model) } qemu_init_vcpu(env); =20 - return env; + return cpu; } =20 void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu) diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index 29c63c7..127574c 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -511,9 +511,11 @@ struct CPUSPARCState { uint32_t cache_control; }; =20 +#include "cpu-qom.h" + #ifndef NO_CPU_IO_DEFS /* cpu_init.c */ -CPUSPARCState *cpu_sparc_init(const char *cpu_model); +SPARCCPU *cpu_sparc_init(const char *cpu_model); void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu); void sparc_cpu_list(FILE *f, fprintf_function cpu_fprintf); /* mmu_helper.c */ @@ -590,7 +592,7 @@ target_phys_addr_t cpu_get_phys_page_nofault(CPUSPARC= State *env, target_ulong ad #endif int cpu_sparc_signal_handler(int host_signum, void *pinfo, void *puc); =20 -#define cpu_init cpu_sparc_init +#define cpu_init(model) (&cpu_sparc_init(model)->env) #define cpu_exec cpu_sparc_exec #define cpu_gen_code cpu_sparc_gen_code #define cpu_signal_handler cpu_sparc_signal_handler @@ -691,7 +693,6 @@ static inline void cpu_clone_regs(CPUSPARCState *env,= target_ulong newsp) #endif =20 #include "cpu-all.h" -#include "cpu-qom.h" =20 #ifdef TARGET_SPARC64 /* sun4u.c */ --=20 1.7.7