From patchwork Thu Oct 19 16:17:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10017681 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0E62A60224 for ; Thu, 19 Oct 2017 16:36:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0081F28DB4 for ; Thu, 19 Oct 2017 16:36:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F302828E31; Thu, 19 Oct 2017 16:36:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 056C028E12 for ; Thu, 19 Oct 2017 16:36:38 +0000 (UTC) Received: from localhost ([::1]:50138 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5DoD-0000Il-Of for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Oct 2017 12:36:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5DZY-0005O6-Ki for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:21:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5DZV-0001uD-Dy for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:21:28 -0400 Received: from mail-sn1nam02on0081.outbound.protection.outlook.com ([104.47.36.81]:10155 helo=NAM02-SN1-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 1e5DZV-0001tu-5u for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:21:25 -0400 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=9cSzHDO48jSBxRttUgtcOo3cv4+NvaOfFlbSri5jme0=; b=uQgKej9+LyE7VxKKPbCCCQPZZEVir/71rAEcuFrXRRRL0EkE/ae01AS23FXyHZ7GZe9gikI9SOUmTuTy96F4EbY6uJUT9tRatSh/sGXHfexO4t7Ej0sEhUsMh3rQkUCM+JufB4IaVR0/kYx0x8AUbUd1/dCKAeUl103SwWZ/IE0= Received: from BLUPR0201CA0038.namprd02.prod.outlook.com (10.163.116.48) by BN6PR02MB3268.namprd02.prod.outlook.com (10.161.152.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Thu, 19 Oct 2017 16:21:22 +0000 Received: from SN1NAM02FT035.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::203) by BLUPR0201CA0038.outlook.office365.com (2a01:111:e400:52e7::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.77.7 via Frontend Transport; Thu, 19 Oct 2017 16:21:22 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; Received: from xsj-pvapsmtpgw02 (149.199.60.100) by SN1NAM02FT035.mail.protection.outlook.com (10.152.72.145) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Thu, 19 Oct 2017 16:21:22 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:38535 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1e5DZR-0007x5-Gt; Thu, 19 Oct 2017 09:21:21 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e5DZR-00036G-Dh; Thu, 19 Oct 2017 09:21:21 -0700 Received: from xsj-pvapsmtp01 (smtp2.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v9JGLEpw018038; Thu, 19 Oct 2017 09:21:14 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e5DZK-00035r-N6; Thu, 19 Oct 2017 09:21:14 -0700 From: Alistair Francis To: Date: Thu, 19 Oct 2017 09:17:21 -0700 Message-ID: <1cde3cda34e054676e4bb17a7d65f1dd7c74cad6.1508390588.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23404.005 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.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(346002)(376002)(2980300002)(438002)(199003)(189002)(8936002)(2950100002)(5660300001)(356003)(118296001)(106002)(16586007)(8676002)(36386004)(76176999)(6916009)(54906003)(50986999)(9786002)(4326008)(575784001)(305945005)(81166006)(81156014)(47776003)(36756003)(2906002)(6666003)(77096006)(63266004)(189998001)(106466001)(48376002)(2351001)(5003940100001)(478600001)(50466002)(50226002)(316002)(33646002)(39060400002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB3268; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT035; 1:HNSvPHqCqhoQ6I2MBIv5ExPMA5mG49emrkEloNq8OxSWALaj4euuxpQWkxz8XS6D8iVzLkrkTXsY+xZUJLhkaOoY/EcHAsV4ZKdL/Lxy9SyZh192eh6JLfVIAh/pi9YN MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6d749fc1-4d40-4289-01f0-08d5170d700d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:BN6PR02MB3268; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3268; 3:M6AfIhZKpW0V+bu3/XvTQg2oEoUKmzr4ZTMPAJcZeEkKd1Keurar6obj/qoosUu8UK021479ZExlkWF1qCgHSdiesYwsJHMDc4YM9SXm7Ik6QQJDLY/GeLy2YM8TfckKyjG8YLOzkif/2m32tqNJuukBL38ZoTm4a23KJ8a2Pfs0sGLMOPRG8FgeS+Tj6URVJ8d4MdVHK35R1MA7hhXs2CM5b0aI/2Gz+56G8MZq/S25cxVMBI0fiJIgv6t6Q40+GJRekHxvfVQrLF7LzJ/XWMJ4uk/uIbPIUTYaafgz1mFB2sTLZdr4SH7ZYr+A46ap+XKNNI7mOyOP1wx88n3+3Z13OXJPrhI8xhAR4HGTA4A=; 25:1QPfYW8vpaKx+GPsXvvlETrMgE5ZJs39f+uINH4LWH+DFGaBIVeZsPMq+0WAJbabFeCKaTtu7MilloKFlfBUbfDVJMdG8V0WHlX8c5/sZc84ll0jGKosm0MnM3UNveqk1Q6Ut5FxJXuaWFHkvVV3DBbkfp2voUREgWp5aUXwmj3/OQSpEDkwFZ5qQ7u+rBij8YE4DyG7l0582KOwGby1HnTxmscRmJ/2X8S+as1WNlFkj79vJsQSXngKyv8xuiFLEPZgjmuhuxVPF02Plv6AyBFsnt6UonwUbZLBB17F7UvsIkMgiPRxt0uOPaT1X8omj/BBjNrAgrYf2BoAoRHLJg== X-MS-TrafficTypeDiagnostic: BN6PR02MB3268: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3268; 31:tTFIkRgLpij1KZr7dWkcKaKFruw5VyRlitRoe8tdTtLOHQxMpLbY12VJw7br6HODTfhWtpZ3kUbXG32hLGQpSDHVvZS/7m1nt8v58D2HvBJoIFN6EE+2YByC1ztU2htTFgEBWcaLjcf+uCXGMq/mF08zJA2Gpe1mJR5ZyQCYZ7VTn+Umbr8JS8jKGdBCkQjCxUl8m9aD8rctWhnwezyCmoWV6NXuaC2YPei9YPo+Lb4=; 20:rakbxDoHZV7bNErX351e0OjYpHKZY8+tQqdGeU1UsxD/s+yM/iTWQK3+8srOd7qmMkjgo8GMrjzbdKwuQFu0Oks1myK8uov/QC9LE8KfaosiYoByc6/T+0WQu1jTFULQTLppFhoLT2fAGkpquoirUFfAVpUkxY97x4twLSPvbOO0BUOxnYQnUatKJPiTjmz6r/bD7VDQNfbav0fvFpCDl+6MlNtVLl9MTNaif1ccy63bQqWin98nR/8vKecJNZf23LilV8AXp8UIVs2iC+W+N35SvIzur6bvyqVmYbm6clH6+pclQ/8P9zENWUxt4/vuP6hKnlAhC4wGCwfiRUvi1zLWT7Hd6j1IA1CTaoR3IGekqByXzkvpeFe8zRr70WmmcbEI3fm0GQShu5BF7l6yKDTfDnCzUyQKyQQGK3CKBggwSh8CRvZbvw9avuZxXIqAOtDIvZhzKD2jtZWVq+cDKC7EU46OIn3PZkCpZbM5V6EuGJvueQdnUFodX98ZRPf+ 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)(93006095)(93004095)(100000703101)(100105400095)(10201501046)(3002001)(6055026)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123564025)(20161123562025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR02MB3268; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR02MB3268; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3268; 4:Uv6nFauWckmjjf6YTDmgO8XQgf2O7Pg/0tB3D2nT9K8E1BgfJn8t3YyyZ2CcGUe56KiTs953bVktP0i8JeZcaARUqqLiQE0Ipy1RCJiLC77a2n3D2mCJvVfyrz8lBwcLZ23X9EkujQtXh2UUTzoyrBUFQIXbbTbYNgWJGyHWczMRQ8Nbue9EQ+x5oZs5bZCobg4Hcu/AzmJqOhxCrab37Is2iEAKJ32kd7IQi+6gAe/id8ZuqVnN1dhsE1wQko6wuALT7hnUZkqOLLmEIj8TOEOeTI6UYNn9kU8kn0tSkILayPF9vPYBb9XpwK6YsZ+F0t1MosI+X31D8tdcYvcIsg== X-Forefront-PRVS: 0465429B7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3268; 23:1wcLkpveYxHh/B+YbCtLYsCNV79loOap0FtNsP5kM?= =?us-ascii?Q?ErCzq56lJ+vIPbXt+AmYroefp51rqGdoka//z6sHvIrXeT5kWH+ylSnzFxKi?= =?us-ascii?Q?d65/0TVGVVBInzd/+Kkg62MrEYRQzy8tkorXr3+C8iPwlmcLzyPpok/LKw5t?= =?us-ascii?Q?LSUTM5wVNoVWoVW6/rT+/jT692CEc4IREyu7k+RkHaWUKPNgYJCoJScycWBV?= =?us-ascii?Q?xDBkbCCFyMkp3QOlcApAkgP0yD9IkttL2mFsER6q3KPBCE+d3QpuE6NNXjm0?= =?us-ascii?Q?MtzhlRD0xhZZY9qxAfMEQMoUZeVmF9ytSGW3JIr9CIda037KSwTUa2xt7xWM?= =?us-ascii?Q?K0wDJp2u+N3X77Douzlmj7GdBNGMsntnajcdKy+0q/e5+w2h/ZGUITeAzaLs?= =?us-ascii?Q?2V+HjjwgLoSZrEmXqYJHuwcbhzlEpcqpk9lD7Vp7zbJDEyFtuSK2W1I68vSY?= =?us-ascii?Q?U6AUk0SDvppuhn7SbQ7ClJrCi2hXtvaavaZzJD2DhLv8x3LnTlvny4hWoeuS?= =?us-ascii?Q?ovkgdRyUkED4O8XrX1KO0L0aJ6p59jx4g9ZRUZRP0OtkAnwMziH+1hY4A4Wy?= =?us-ascii?Q?FY/6NyNIsBcN6/4msOjM+CpqE0PYs7yEld8XokMwhH15/vQoNf5Xx3FcQO3Q?= =?us-ascii?Q?7UwFs1GK147EGFsznzNpBZa3DMFKl1rvqyHStyqErTwJVgT695NEvnubgOTO?= =?us-ascii?Q?dVKu70/aaa/lrqgin3BbPJCgiU9Dj4ASZYrkkVZkk5uoUA0ojLz9NVbq+z5J?= =?us-ascii?Q?RR3+xmUWv41pML+n8YbTIhPmCJbpfWFa6jC7IOQBJqr+v67+0y0t/2h0vTvj?= =?us-ascii?Q?cucgSoVq35RLDiCpmAEGrWsZiSmuenEwC8NI4Cbv3hiiNmJe00P8ZxmOzVSb?= =?us-ascii?Q?aFUtN2C2xs9AR+yYJnNJ1iBxm/Ie9l1StWNsFyY0qOQZQ8RGfCgBtwIU3qTU?= =?us-ascii?Q?01KBG4swX1NnFIacNBykDXF75R+nON9gr/qKF6wb8IvdKBMh7F6dQYIWJkFE?= =?us-ascii?Q?YEgpnEglgCa7Z/5oQoTLQvmaXEQtbW0Gu0YL8JrttSTjEgI5nDMMNNqdG6C3?= =?us-ascii?Q?ZPoYSkniT/wAmKrTKCgZDS8c3HepdnT/hzfTNfdo4kpPOKKqQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3268; 6:sK7KBysDqonTYcKQsk8gAZxmiMtnlLpOba1MRdAiokaKvqUc3kWNQ5ZXDcU0o6z3rlazi5K2+WV3xgkhSxFtNxUf6DFEKIepD/jFTNaY9WoZKQs3YQRSJn35ns/6S5nlmcDjl5Y8IfvNl9LEBLGW5BJHkL+5BYt0AqSnUu0ptgQjT3IglRPingRHNdBsPrx7y0V3BqwoXar0j4fLAWeVWAc2N7pDwi3pnJnLmEI5Jc2c9ZBIRCWIIII8S2dBm7n33D3yVHRA9iXzZGpbhD0lKZOoc9sMGNGJkxWv7s9pV82BRES4Eoxk/00KloNqQ7pA4KyXDhnG8ZbAMcmHiyetGA==; 5:YgJTBgvo970CwNXxrWrDMX925sB5trudvpPvVajZGn6F7MJkrMhnjEOXQy7HZ/NqFjBi6O0zqZ5l6Ch8uQ0cnMIpDaciBO8g8xhPwzBsyZAAJUIKRPgjZAO3059b513yKG1LmnP1K8tLNGKyJmLm4A==; 24:Zbar527KqSubYIa7Ad4FMjupGa85NWX0WuMvVD1c6UgdbEHthvze5Hp1MhnLUXoSkaE6UyViGovzw3Q6WFwDutPuSrv+GcVggt/+9Y0uGL0=; 7:dG7fduiax58lb8aTNxpAoKnAfGzKd10znK8cFec9XEuJ2RxnrcEV/RAHNch4ehNbm9/yeGCAndLzYh6eeNYCJpyPSaHflX4PhlIXmeAG5aAfxJ3koXscV+9SQu8YDsldJl+E4QV0u91GU/KQzZzKENIE8XND0xbFwgFclgBb2DU/Jwah9RFkBo3sV8NgDMCOnaXyYWwyVzYjx/3ECiykb595f1aJ8bMpnjI2QZt6da0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2017 16:21:22.2520 (UTC) 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.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR02MB3268 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.81 Subject: [Qemu-devel] [PATCH v3 28/46] hw/nvram: 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: alistair23@gmail.com, armbru@redhat.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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. Some of the message in put_unused() was removed and replaced with g_assert_not_reached(). Signed-off-by: Alistair Francis --- V3: - Add g_assert_not_reached() in unused function V2: - Split hw patch into individual directories hw/nvram/eeprom93xx.c | 5 +++-- hw/nvram/fw_cfg.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c index 2fd0e3c29f..5cad031eba 100644 --- a/hw/nvram/eeprom93xx.c +++ b/hw/nvram/eeprom93xx.c @@ -36,6 +36,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/nvram/eeprom93xx.h" @@ -105,8 +106,8 @@ static int get_uint16_from_uint8(QEMUFile *f, void *pv, size_t size, static int put_unused(QEMUFile *f, void *pv, size_t size, VMStateField *field, QJSON *vmdesc) { - fprintf(stderr, "uint16_from_uint8 is used only for backwards compatibility.\n"); - fprintf(stderr, "Never should be used to write a new state.\n"); + error_report("uint16_from_uint8 is used only for backwards compatibility."); + error_report("Never should be used to write a new state."); exit(0); return 0; diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 753ac0e4ea..1c66052f1f 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -518,8 +518,9 @@ static int get_uint32_as_uint16(QEMUFile *f, void *pv, size_t size, static int put_unused(QEMUFile *f, void *pv, size_t size, VMStateField *field, QJSON *vmdesc) { - fprintf(stderr, "uint32_as_uint16 is only used for backward compatibility.\n"); - fprintf(stderr, "This functions shouldn't be called.\n"); + error_report("uint32_as_uint16 is only used for backward compatibility."); + + g_assert_not_reached(); return 0; }