From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JzViY-0001Cc-8n for qemu-devel@nongnu.org; Fri, 23 May 2008 07:45:50 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JzViU-00019R-F9 for qemu-devel@nongnu.org; Fri, 23 May 2008 07:45:48 -0400 Received: from [199.232.76.173] (port=33979 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JzViU-00019C-2C for qemu-devel@nongnu.org; Fri, 23 May 2008 07:45:46 -0400 Received: from smtp.syd.people.net.au ([218.214.225.98]:47718) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1JzViT-0004wc-Ae for qemu-devel@nongnu.org; Fri, 23 May 2008 07:45:45 -0400 Received: from hendrix (hendrix [192.168.200.99]) by hendrix.mega-nerd.net (Postfix) with SMTP id F0CB3AB889 for ; Fri, 23 May 2008 21:45:32 +1000 (EST) Date: Fri, 23 May 2008 21:45:32 +1000 From: Erik de Castro Lopo Message-Id: <20080523214532.524da1ed.mle+tools@mega-nerd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Multipart=_Fri__23_May_2008_21_45_32_+1000_GwmLE5=5kJYGDM0o" Subject: [Qemu-devel] [Patch] Fix compile problems introduced in commit 4537/4538. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is a multi-part message in MIME format. --Multipart=_Fri__23_May_2008_21_45_32_+1000_GwmLE5=5kJYGDM0o Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit --- exec.c | 2 +- tcg/tcg.c | 2 +- tcg/tcg.h | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) --Multipart=_Fri__23_May_2008_21_45_32_+1000_GwmLE5=5kJYGDM0o Content-Type: text/x-patch; name="33915d941019df6245fc1268f1f8600e6b5465f4.diff" Content-Disposition: attachment; filename="33915d941019df6245fc1268f1f8600e6b5465f4.diff" Content-Transfer-Encoding: 7bit diff --git a/exec.c b/exec.c index 7f62e71..50bde7b 100644 --- a/exec.c +++ b/exec.c @@ -3011,7 +3011,7 @@ void dump_exec_info(FILE *f, cpu_fprintf(f, "TB flush count %d\n", tb_flush_count); cpu_fprintf(f, "TB invalidate count %d\n", tb_phys_invalidate_count); cpu_fprintf(f, "TLB flush count %d\n", tlb_flush_count); - tcg_dump_info(f, cpu_fprintf); + dump_tcg_info(f, cpu_fprintf); } #if !defined(CONFIG_USER_ONLY) diff --git a/tcg/tcg.c b/tcg/tcg.c index 31962a9..c3db324 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -2036,6 +2036,6 @@ void tcg_dump_info(FILE *f, void dump_tcg_info(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...)) { - cpu_fprintf("[TCG profiler not compiled]\n"); + cpu_fprintf(f, "[TCG profiler not compiled]\n"); } #endif diff --git a/tcg/tcg.h b/tcg/tcg.h index b29b548..62e866c 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -400,3 +400,6 @@ uint64_t tcg_helper_remu_i64(uint64_t arg1, uint64_t arg2); extern uint8_t code_gen_prologue[]; #define tcg_qemu_tb_exec(tb_ptr) ((long REGPARM (*)(void *))code_gen_prologue)(tb_ptr) + +void dump_tcg_info(FILE *f, + int (*cpu_fprintf)(FILE *f, const char *fmt, ...)); --Multipart=_Fri__23_May_2008_21_45_32_+1000_GwmLE5=5kJYGDM0o--