From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LPJuz-0007CI-Cj for qemu-devel@nongnu.org; Tue, 20 Jan 2009 11:57:37 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LPJuy-0007C2-L8 for qemu-devel@nongnu.org; Tue, 20 Jan 2009 11:57:36 -0500 Received: from [199.232.76.173] (port=37626 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LPJuy-0007Bv-Ao for qemu-devel@nongnu.org; Tue, 20 Jan 2009 11:57:36 -0500 Received: from savannah.gnu.org ([199.232.41.3]:55182 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LPJuy-0000na-0F for qemu-devel@nongnu.org; Tue, 20 Jan 2009 11:57:36 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1LPJux-0005bB-38 for qemu-devel@nongnu.org; Tue, 20 Jan 2009 16:57:35 +0000 Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1LPJuw-0005b7-S3 for qemu-devel@nongnu.org; Tue, 20 Jan 2009 16:57:35 +0000 MIME-Version: 1.0 Errors-To: blueswir1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Blue Swirl Message-Id: Date: Tue, 20 Jan 2009 16:57:34 +0000 Subject: [Qemu-devel] [6371] Fix user emulator breakage, based on patch by Riku Voipio 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 Revision: 6371 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6371 Author: blueswir1 Date: 2009-01-20 16:57:34 +0000 (Tue, 20 Jan 2009) Log Message: ----------- Fix user emulator breakage, based on patch by Riku Voipio Modified Paths: -------------- trunk/bsd-user/main.c trunk/linux-user/main.c Modified: trunk/bsd-user/main.c =================================================================== --- trunk/bsd-user/main.c 2009-01-20 04:15:47 UTC (rev 6370) +++ trunk/bsd-user/main.c 2009-01-20 16:57:34 UTC (rev 6371) @@ -533,19 +533,21 @@ free(target_environ); - log_page_dump(); + if (qemu_log_enabled()) { + log_page_dump(); - qemu_log("start_brk 0x" TARGET_ABI_FMT_lx "\n", info->start_brk); - qemu_log("end_code 0x" TARGET_ABI_FMT_lx "\n", info->end_code); - qemu_log("start_code 0x" TARGET_ABI_FMT_lx "\n", - info->start_code); - qemu_log("start_data 0x" TARGET_ABI_FMT_lx "\n", - info->start_data); - qemu_log("end_data 0x" TARGET_ABI_FMT_lx "\n", info->end_data); - qemu_log("start_stack 0x" TARGET_ABI_FMT_lx "\n", - info->start_stack); - qemu_log("brk 0x" TARGET_ABI_FMT_lx "\n", info->brk); - qemu_log("entry 0x" TARGET_ABI_FMT_lx "\n", info->entry); + qemu_log("start_brk 0x" TARGET_ABI_FMT_lx "\n", info->start_brk); + qemu_log("end_code 0x" TARGET_ABI_FMT_lx "\n", info->end_code); + qemu_log("start_code 0x" TARGET_ABI_FMT_lx "\n", + info->start_code); + qemu_log("start_data 0x" TARGET_ABI_FMT_lx "\n", + info->start_data); + qemu_log("end_data 0x" TARGET_ABI_FMT_lx "\n", info->end_data); + qemu_log("start_stack 0x" TARGET_ABI_FMT_lx "\n", + info->start_stack); + qemu_log("brk 0x" TARGET_ABI_FMT_lx "\n", info->brk); + qemu_log("entry 0x" TARGET_ABI_FMT_lx "\n", info->entry); + } target_set_brk(info->brk); syscall_init(); Modified: trunk/linux-user/main.c =================================================================== --- trunk/linux-user/main.c 2009-01-20 04:15:47 UTC (rev 6370) +++ trunk/linux-user/main.c 2009-01-20 16:57:34 UTC (rev 6371) @@ -2394,19 +2394,21 @@ free(target_environ); - log_page_dump(); + if (qemu_log_enabled()) { + log_page_dump(); - qemu_log("start_brk 0x" TARGET_ABI_FMT_lx "\n", info->start_brk); - qemu_log("end_code 0x" TARGET_ABI_FMT_lx "\n", info->end_code); - qemu_log("start_code 0x" TARGET_ABI_FMT_lx "\n", - info->start_code); - qemu_log("start_data 0x" TARGET_ABI_FMT_lx "\n", - info->start_data); - qemu_log("end_data 0x" TARGET_ABI_FMT_lx "\n", info->end_data); - qemu_log("start_stack 0x" TARGET_ABI_FMT_lx "\n", - info->start_stack); - qemu_log("brk 0x" TARGET_ABI_FMT_lx "\n", info->brk); - qemu_log("entry 0x" TARGET_ABI_FMT_lx "\n", info->entry); + qemu_log("start_brk 0x" TARGET_ABI_FMT_lx "\n", info->start_brk); + qemu_log("end_code 0x" TARGET_ABI_FMT_lx "\n", info->end_code); + qemu_log("start_code 0x" TARGET_ABI_FMT_lx "\n", + info->start_code); + qemu_log("start_data 0x" TARGET_ABI_FMT_lx "\n", + info->start_data); + qemu_log("end_data 0x" TARGET_ABI_FMT_lx "\n", info->end_data); + qemu_log("start_stack 0x" TARGET_ABI_FMT_lx "\n", + info->start_stack); + qemu_log("brk 0x" TARGET_ABI_FMT_lx "\n", info->brk); + qemu_log("entry 0x" TARGET_ABI_FMT_lx "\n", info->entry); + } target_set_brk(info->brk); syscall_init();