From patchwork Wed Nov 8 22:57:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836068 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="5tPxvh1F"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yXMp53XBvz9s3w for ; Thu, 9 Nov 2017 10:24:45 +1100 (AEDT) Received: from localhost ([::1]:34420 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZi7-0001ZA-F1 for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:24:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZM4-00006N-0M for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZM0-0003Q9-Rf for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:56 -0500 Received: from mail-bl2nam02on0050.outbound.protection.outlook.com ([104.47.38.50]:19184 helo=NAM02-BL2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eCZM0-0003Pu-Ik for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=8wOOr00/IAJh/wy1ySpCHYw6lRMoQqnzQi9FaYIvGYE=; b=5tPxvh1FZLDPy/Cm74l5XqIoh27xv7wgL3t1judFrfeHSYgZ5egSAWQuApQ3LJ2nuY9Q1faWQrh+SPg3ty9HsXR8ZoU5PzzNbnjnZANja5mtCXAMFPfkQIAXoNdzXguW0auLCUg/34KaJxt0TSKOMu4Ey6dfVgDMcQo1GYkiWhw= Received: from MWHPR02CA0052.namprd02.prod.outlook.com (10.164.133.41) by CY4PR02MB3383.namprd02.prod.outlook.com (10.165.89.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.218.12; Wed, 8 Nov 2017 23:01:48 +0000 Received: from CY1NAM02FT063.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::200) by MWHPR02CA0052.outlook.office365.com (2603:10b6:301:60::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:01:48 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; reactos.org; dkim=none (message not signed) header.d=none;reactos.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT063.mail.protection.outlook.com (10.152.75.161) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:01:46 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLu-0001MR-6b; Wed, 08 Nov 2017 15:01:46 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLu-0002si-30; Wed, 08 Nov 2017 15:01:46 -0800 Received: from xsj-pvapsmtp01 (smtp2.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N1iPa009834; Wed, 8 Nov 2017 15:01:44 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLs-0002s9-EF; Wed, 08 Nov 2017 15:01:44 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:57:43 -0800 Message-ID: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: MIME-Version: 1.0 X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23450.000 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(376002)(39860400002)(346002)(2980300002)(438002)(199003)(189002)(2950100002)(8936002)(305945005)(6916009)(47776003)(118296001)(478600001)(316002)(575784001)(5820100001)(23676003)(54906003)(81156014)(81166006)(106002)(50466002)(5660300001)(356003)(36386004)(36756003)(4326008)(8676002)(77096006)(2351001)(33646002)(50986999)(76176999)(50226002)(39060400002)(106466001)(9786002)(63266004)(2870700001)(189998001)(2906002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR02MB3383; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT063; 1:ivj2w5vlotPVrqpWkgg3GBnwW6/mYKtEYxCsIyzQg3wcgbB7IlvkVpuuPLvIkI3XamjWOS7x0YoA49Bj4FUNIqnJtBCBUGCTjuU7e4Gzs7W2PMVBB8z3K30iJzjEI+I2 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4fd5a426-92b2-45bc-fe70-08d526fcb07b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:CY4PR02MB3383; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3383; 3:lOjlVCQEgl/GdXTS8pmLNXgac3GXiGo3bq8e7GZ4/074uuErsUH9cDMFwfyCHQ1w/8/oKtp72wkC4052TyNKYtTAIL4hf6ACr24k+WQw3fBczgiMLuJGykyBxIcwbxvRue5uIVHvvyArFTMgFnB09Fnf9/iRz9Xz8Uv9q3MvGg4jGiXz8iBFQ7FjOlEJBM728xyTPM7AXPsI1Joz7ISyjro3afB1B2bJe80zG6O0IaJqmTvXQ3KBoxKYnrRGGHrgmTynv67EVeOASqTaF3TUV3tNAS3+YKekNnmHwfhpR7Gq4eidQeAUAoPLRk3SQZRSpK3AdEr994iPxOVHr4rBSY1wexKK5pi9thK5j1xrfig=; 25:3nU0aSc0DJKKNVZWzruwBvIQkC6wauFyivjTJqEF+AilZvw3NyojL9XywvEuVlktut0okutsuXooCW1h9LhqOPqUsVtzskbdhWtrblzDhkgE9iBb2eP7fXxdYcr1KENBF6r6cLe/bUMJT3q1TcovT2V1sXgKLnsoO78tFZFN/Otv1u77xrDXgycxTRFdjvCTL5NR2Xg8NSyUO/o9tnFY4CZTFZc2rRoBkxRKlpzvRtUvAp5LAaX1TKX4xN7Agp7f2E5x/mkRN5ZGtMFL6ozldjFn9IOGSy5peS5hJZ68eSa+uqESDNW+TmESdELO+M4a0zjeT0ZymuZoV1OqJAiKEQ== X-MS-TrafficTypeDiagnostic: CY4PR02MB3383: X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3383; 31:X+z2OPT/vhRhrZGsjq37rhOYgGSE4j3OVKxNBW6UzPMMN3v5uf5vhuMIi25mjhavoSOvnfIAGoUyjrjWIPzHKH11AM+VKg4UCpxibXf8CcFUxmexhEaWOEJTcI2+EXvxZ9vzOBC+0Me2ggeVSGWvycPEk/dGZV5Le0rO+Cc/u9D+Y0k1b/P7Zk0DXx/aSggXzzBnikAWSDQDqTaZJSqsecIgljx9+FAyMFqHsxUPTy8=; 20:5zOHk7jgKDW+nlfcCmiOOl5kRhBcBEkyZXYjCJ8He6PeCCgzP5G6rF9o5p+SdYtWm7qQ+tOAIWbizt73/k8cSVN5fAd0FcTDTTG5TzfOPWkyREzUvLl020czJ+FdRwvdCb6LYjAzB5hDN8Zn3eL0ms2c5bJelskmy4dgpSUKOlpeCacsb9D9S+LCq5se2m2DZzUD8UOjid7Kx+XVKF10/cwAE2t3B4ctKpP/N/AT11sgFpM4y+UbDPra3Rps/JVe46JjCB3NG7vq23REDXRAinxn52XhUXkn+CyIyz8FCtSHZO0TvA6EcIrdS3O0/XXnmbEmNXRwsebGYKoqJbkYl0FHKpkvFQmvS6SLxGBrma/bvaFouhXlSzd2Ob3uXPJE2cm97n+CXSBqC3+Nje05+dyjzEEJ9YcWXJfafxkhu824TWUNQI0jAqzZoekIeRLj01O68N+3R7SzFwcWeT2qMyK6mKZDoh4S/lmi0hYU/5Pamnu/GutddB6I2Q0eTtbs X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3231021)(100000703101)(100105400095)(3002001)(10201501046)(93006095)(93004095)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123562025)(20161123560025)(20161123558100)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR02MB3383; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR02MB3383; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3383; 4:J759Pep7d8NftCTbjRnIuWOv30bxre8cz6mIXNSLkL+WNfxYBMP2LH3tO+ODWarl5l4mDGlrdakxofcemHRKtUX7JVMV6TLIBQ85+HhebidAkUThDSW8eq3fRDZXRJRWuoqFUXcePXyUVsahRXf/YT3Q6ftXaFv7VzS3IdXH4whu5xTYBr0GlfMxqe7nAk6x+FTEDoTikR5/HVvNSnFzKuw4oHJ9s+D4OvuAagPYJIGhoZEKj0XUbfJ2Upxj0t+qD+tAO+TzldVYB5kd6vr6pMF07Y8BHifRdUHFvhtc6SdKGvOxbt3FQGRS2aDPUjS4ZYj+PjkQqvDNoQ/98ZEwyQ== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR02MB3383; 23:i/F/tGd230wy7cIv3ThL/PlLxm7ynI+GrAFF2doJR?= I4wBk0WL4aY119zrBRXQDAk3S8ndEvYQn1VbAao+Cl6ulwwbfRlsrgeEQO34OAF6Ugn++Jk1tYArh8z7Sb1UDrstl/PiFypLB4K8jejUrZ2uQJjg7F0jkELWiMoVLc+X0uuho/CR2iKC8MHcM2NoKj+3WJiGsh2VXCYgAxRnnvyu5/01SfcP0ksQTDDqGfvUFKXexEzxg/w+7Y1vcvXt6I9r1VMJWCtHmWxRXPKCjngQOkrKi2pqFdoFMovPDSljZFG6oAdeR3NEWSiYNJGzXz4hvV8bfnyUAirDSOur+ksIULHphj5fiW7tTrxr2Ke/5UeN+2ofwtiTXIFekrvYVFf/uFTTcT/AthTSkQlZWXnlaVUwWc5E2NMEr+0nfbYyFwJVfN4BOoDlOPIYejfbhz1eUT92JwH8jyv1QyO139TfwCeWZTai8ILf2xUrAWK0K0jA5oaB52R1NODDB/SbN9dmaJOL97eJtXVfVByoZUuMEEFRa7EA0YN9lm8iTc5zMgSq/KX5tqIoET6fHSMl+csPqEFlD7lo/E0gqValkzxwQCqgn2eG3w9mD1kJ+YEXO7yUo91yHm5BWTgV9c4XLjlSeDNKeR5QdmbDwuaQ2QjzdCNsHkfXfvTpOg+rmmQa4wlXsI2Jv6Na83myHM92qD4R5K+wkTxoWxSwIAhheo4tA9PMvndinAxLdKtI/ORGJ9PaGeMG9dysqHgO/Q6oizxOCEmDPcxU+5Dc+Rs9du+x6BVKgXCrCMoZSFAZxW7HP4f8n9t0BGT4bZVmEW3OqXoRInKUXxTZe1CqE3EIWLjmENySQ8T0SbKF6v7iTKQiCgHR+/ty59C552yt6VTAmE0aKRuGxx/DpGwT2hNZSKXaQzGpPyid4ND5WGpWKICTZ+WdeQ+T7dljJUcQamFllmPVyz8tM6D8nxXMICRN9QuYogPmrsY+5HEhmURJzAkO4aXLyXV7pXA0c5PFRmGtYyP9Juu3wW7X/9Ie0myuK53QDAQO/GRlsmFsAsMl806iZg= X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3383; 6:svEhtjNLZz/Swd6JrBHng3P8a1kRy8/bJdsZZPUO9OLM3wpz40s/HMVhw/p9WteKxlySnR7Y0pgrA+2Tb4PxCIjghzgxU+9evqT0kXfDIYLYr7eEnbWXRlixYiYpcEnyik5e8qn2bYDm+oOcNtwFRcma/l8Htm8B/EZOOMGcCS/8N28FJ1o1h3BfBgqEY7YRlDNTDhf+zk74+GnPCHpCSdJdLZjGpMdsj7cZYK8J3Fwjg9hwLOVow2wwBjRW62xmgky/0QaEV5YI2mcJg1+LsccRibmhsj1ln2/easqJYk9FfCp5SJ195nV2H2QsqTqL+sWAL6OmAtek5js2DovRvLz7udocI5yT/KhJwtS9WdA=; 5:aBZ4ouCOw6ph3klH+xW+gSSNLACO7LYG/c7SjGt5z8K0DM8FElKVoZsvZPwMRmyWFdqgiWrjzArk879wBh25UY9v/qdnyBWV/V/56UGiYJwyhHKf6f1xZMnawnitDvM601O2FBGrx2SfvzFS2ZeUgua4/moR2h9FQcUUWzILw+w=; 24:eeIsNDwAB6L78/ZZeHAMhfbNEWvPDQfs3y1QNnpl+rkjeS7OGxwnFiR4V+5XyoYxZ3kF2B0wC2Jsq9aL7tGSR4Wa8PcOzxv/7vMe/CRwm5Y=; 7:h18R7u+zZ4JrKjZ58E7qdfEO4fGJBC0Y/NjZ7muthFyy42ip4Ef7eCgmL8gfWHKb55Ksj0J/RsWx9cII1qZkQ9BzwvoGk2P1mttXkY1+XKVKT2HalGE+VVpfZ3XBjqYv+k+eEeAhHA0gFUc1zLnXya7IcfMhvDjleVd5AjyR0xWVBiCtdEGs3ePZMpFL5MOVvSEBg/YL61WJ09ZZInyjs3jQeNp6s6ehgUhCGuxGOF0+9m4elZzAoUaiW8QBk3hp SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:46.9198 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4fd5a426-92b2-45bc-fe70-08d526fcb07b X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR02MB3383 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.38.50 Subject: [Qemu-devel] [PATCH v4 23/45] hw/mips: Replace fprintf(stderr, "*\n" with error_report() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Burton , armbru@redhat.com, alistair.francis@xilinx.com, =?utf-8?q?Herv=C3=A9_Poussineau?= , Yongbok Kim , alistair23@gmail.com, Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed. find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + Some lines where then manually tweaked to pass checkpatch. Signed-off-by: Alistair Francis Cc: Paul Burton Cc: Aurelien Jarno Cc: Yongbok Kim Cc: "Hervé Poussineau" Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Hervé Poussineau kernel_cmdline : " "; err = qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline); if (err < 0) { - fprintf(stderr, "couldn't set /chosen/bootargs\n"); + error_report("couldn't set /chosen/bootargs"); return NULL; } diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 146cf0fccd..344171e40b 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -120,7 +120,7 @@ static int64_t load_kernel (CPUMIPSState *env) (uint64_t *)&kernel_low, (uint64_t *)&kernel_high, 0, EM_MIPS, 1, 0); if (kernel_size < 0) { - error_report("qemu: could not load kernel '%s': %s", + error_report("could not load kernel '%s': %s", loaderparams.kernel_filename, load_elf_strerror(kernel_size)); exit(1); @@ -134,17 +134,16 @@ static int64_t load_kernel (CPUMIPSState *env) if (initrd_size > 0) { initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK; if (initrd_offset + initrd_size > ram_size) { - fprintf(stderr, - "qemu: memory too small for initial ram disk '%s'\n", - loaderparams.initrd_filename); + error_report("memory too small for initial ram disk '%s'", + loaderparams.initrd_filename); exit(1); } initrd_size = load_image_targphys(loaderparams.initrd_filename, initrd_offset, ram_size - initrd_offset); } if (initrd_size == (target_ulong) -1) { - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", - loaderparams.initrd_filename); + error_report("could not load initial ram disk '%s'", + loaderparams.initrd_filename); exit(1); } } @@ -338,7 +337,7 @@ static void mips_fulong2e_init(MachineState *machine) isa_bus = vt82c686b_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 0)); if (!isa_bus) { - fprintf(stderr, "vt82c686b_init error\n"); + error_report("vt82c686b_init error"); exit(1); } diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index fe4f17389f..18b5ff733e 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -267,10 +267,10 @@ static void mips_jazz_init(MachineState *machine, sysbus_connect_irq(sysbus, 0, qdev_get_gpio_in(rc4030, 4)); break; } else if (is_help_option(nd->model)) { - fprintf(stderr, "qemu: Supported NICs: dp83932\n"); + error_report("Supported NICs: dp83932"); exit(1); } else { - fprintf(stderr, "qemu: Unsupported NIC: %s\n", nd->model); + error_report("Unsupported NIC: %s", nd->model); exit(1); } } diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index ec6af4a277..9702ff85ff 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -812,7 +812,7 @@ static int64_t load_kernel (void) NULL, (uint64_t *)&kernel_entry, NULL, (uint64_t *)&kernel_high, big_endian, EM_MIPS, 1, 0); if (kernel_size < 0) { - error_report("qemu: could not load kernel '%s': %s", + error_report("could not load kernel '%s': %s", loaderparams.kernel_filename, load_elf_strerror(kernel_size)); exit(1); @@ -846,9 +846,8 @@ static int64_t load_kernel (void) initrd_offset = (loaderparams.ram_low_size - initrd_size - 131072 - ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK; if (kernel_high >= initrd_offset) { - fprintf(stderr, - "qemu: memory too small for initial ram disk '%s'\n", - loaderparams.initrd_filename); + error_report("memory too small for initial ram disk '%s'", + loaderparams.initrd_filename); exit(1); } initrd_size = load_image_targphys(loaderparams.initrd_filename, @@ -856,8 +855,8 @@ static int64_t load_kernel (void) ram_size - initrd_offset); } if (initrd_size == (target_ulong) -1) { - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", - loaderparams.initrd_filename); + error_report("could not load initial ram disk '%s'", + loaderparams.initrd_filename); exit(1); } } @@ -1034,9 +1033,8 @@ void mips_malta_init(MachineState *machine) /* allocate RAM */ if (ram_size > (2048u << 20)) { - fprintf(stderr, - "qemu: Too much memory for this machine: %d MB, maximum 2048 MB\n", - ((unsigned int)ram_size / (1 << 20))); + error_report("Too much memory for this machine: %dMB, maximum 2048MB", + ((unsigned int)ram_size / (1 << 20))); exit(1); } diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c index e5d3654586..e0ba5efc84 100644 --- a/hw/mips/mips_mipssim.c +++ b/hw/mips/mips_mipssim.c @@ -78,7 +78,7 @@ static int64_t load_kernel(void) if ((entry & ~0x7fffffffULL) == 0x80000000) entry = (int32_t)entry; } else { - error_report("qemu: could not load kernel '%s': %s", + error_report("could not load kernel '%s': %s", loaderparams.kernel_filename, load_elf_strerror(kernel_size)); exit(1); @@ -92,17 +92,16 @@ static int64_t load_kernel(void) if (initrd_size > 0) { initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK; if (initrd_offset + initrd_size > loaderparams.ram_size) { - fprintf(stderr, - "qemu: memory too small for initial ram disk '%s'\n", - loaderparams.initrd_filename); + error_report("memory too small for initial ram disk '%s'", + loaderparams.initrd_filename); exit(1); } initrd_size = load_image_targphys(loaderparams.initrd_filename, initrd_offset, loaderparams.ram_size - initrd_offset); } if (initrd_size == (target_ulong) -1) { - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", - loaderparams.initrd_filename); + error_report("could not load initial ram disk '%s'", + loaderparams.initrd_filename); exit(1); } } diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 3bbb1827e1..2e2f9aa5cc 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -97,7 +97,7 @@ static int64_t load_kernel(void) if ((entry & ~0x7fffffffULL) == 0x80000000) entry = (int32_t)entry; } else { - error_report("qemu: could not load kernel '%s': %s", + error_report("could not load kernel '%s': %s", loaderparams.kernel_filename, load_elf_strerror(kernel_size)); exit(1); @@ -111,9 +111,8 @@ static int64_t load_kernel(void) if (initrd_size > 0) { initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK; if (initrd_offset + initrd_size > ram_size) { - fprintf(stderr, - "qemu: memory too small for initial ram disk '%s'\n", - loaderparams.initrd_filename); + error_report("memory too small for initial ram disk '%s'", + loaderparams.initrd_filename); exit(1); } initrd_size = load_image_targphys(loaderparams.initrd_filename, @@ -121,8 +120,8 @@ static int64_t load_kernel(void) ram_size - initrd_offset); } if (initrd_size == (target_ulong) -1) { - fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", - loaderparams.initrd_filename); + error_report("could not load initial ram disk '%s'", + loaderparams.initrd_filename); exit(1); } } @@ -195,9 +194,8 @@ void mips_r4k_init(MachineState *machine) /* allocate RAM */ if (ram_size > (256 << 20)) { - fprintf(stderr, - "qemu: Too much memory for this machine: %d MB, maximum 256 MB\n", - ((unsigned int)ram_size / (1 << 20))); + error_report("Too much memory for this machine: %dMB, maximum 256MB", + ((unsigned int)ram_size / (1 << 20))); exit(1); } memory_region_allocate_system_memory(ram, NULL, "mips_r4k.ram", ram_size); @@ -238,7 +236,7 @@ void mips_r4k_init(MachineState *machine) blk_by_legacy_dinfo(dinfo), sector_len, mips_rom / sector_len, 4, 0, 0, 0, 0, be)) { - fprintf(stderr, "qemu: Error registering flash memory.\n"); + error_report("Error registering flash memory."); } } else if (!qtest_enabled()) { /* not fatal */