From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VM-00010B-K2 for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SR3VK-0000p3-GT for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:12 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55374 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VK-0000o7-88 for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:10 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 6 May 2012 17:34:46 +0200 Message-Id: <1336318514-30906-47-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 46/74] target-xtensa: Let cpu_xtensa_init() return XtensaCPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori , Max Filippov Make the include paths for cpu-qom.h consistent to allow using XtensaCPU in cpu.h. Let cpu_init() return CPUXtensaState for backwards compatibility. Signed-off-by: Andreas F=C3=A4rber --- target-xtensa/cpu.c | 2 +- target-xtensa/cpu.h | 7 ++++--- target-xtensa/helper.c | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/target-xtensa/cpu.c b/target-xtensa/cpu.c index 97deacb..9d01983 100644 --- a/target-xtensa/cpu.c +++ b/target-xtensa/cpu.c @@ -28,7 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ =20 -#include "cpu-qom.h" +#include "cpu.h" #include "qemu-common.h" =20 =20 diff --git a/target-xtensa/cpu.h b/target-xtensa/cpu.h index 6d0ea7c..10e242c 100644 --- a/target-xtensa/cpu.h +++ b/target-xtensa/cpu.h @@ -344,13 +344,15 @@ typedef struct CPUXtensaState { CPU_COMMON } CPUXtensaState; =20 -#define cpu_init cpu_xtensa_init +#include "cpu-qom.h" + +#define cpu_init(model) (&cpu_xtensa_init(model)->env) #define cpu_exec cpu_xtensa_exec #define cpu_gen_code cpu_xtensa_gen_code #define cpu_signal_handler cpu_xtensa_signal_handler #define cpu_list xtensa_cpu_list =20 -CPUXtensaState *cpu_xtensa_init(const char *cpu_model); +XtensaCPU *cpu_xtensa_init(const char *cpu_model); void xtensa_translate_init(void); int cpu_xtensa_exec(CPUXtensaState *s); void xtensa_register_core(XtensaConfigList *node); @@ -471,7 +473,6 @@ static inline void cpu_get_tb_cpu_state(CPUXtensaStat= e *env, target_ulong *pc, } =20 #include "cpu-all.h" -#include "cpu-qom.h" #include "exec-all.h" =20 static inline int cpu_has_work(CPUXtensaState *env) diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c index 2094227..e6cb3fe 100644 --- a/target-xtensa/helper.c +++ b/target-xtensa/helper.c @@ -80,7 +80,7 @@ static void breakpoint_handler(CPUXtensaState *env) } } =20 -CPUXtensaState *cpu_xtensa_init(const char *cpu_model) +XtensaCPU *cpu_xtensa_init(const char *cpu_model) { static int tcg_inited; static int debug_handler_inited; @@ -116,7 +116,7 @@ CPUXtensaState *cpu_xtensa_init(const char *cpu_model= ) =20 xtensa_irq_init(env); qemu_init_vcpu(env); - return env; + return cpu; } =20 =20 --=20 1.7.7