From nobody Mon Feb 9 13:22:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508432232037617.2102212987277; Thu, 19 Oct 2017 09:57:12 -0700 (PDT) Received: from localhost ([::1]:50249 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5E7v-0002Bc-3R for importer@patchew.org; Thu, 19 Oct 2017 12:56:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56195) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5DaQ-00065W-PZ for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:22:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5DaN-0002DP-Hg for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:22:22 -0400 Received: from mail-bn3nam01on0087.outbound.protection.outlook.com ([104.47.33.87]:47712 helo=NAM01-BN3-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 1e5DaN-0002Cy-AC for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:22:19 -0400 Received: from CY4PR02CA0034.namprd02.prod.outlook.com (10.175.57.148) by DM5PR02MB3385.namprd02.prod.outlook.com (10.164.152.161) 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:22:17 +0000 Received: from SN1NAM02FT062.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::209) by CY4PR02CA0034.outlook.office365.com (2603:10b6:903:117::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.77.21 via Frontend Transport; Thu, 19 Oct 2017 16:22:16 +0000 Received: from xsj-pvapsmtpgw02 (149.199.60.100) by SN1NAM02FT062.mail.protection.outlook.com (10.152.72.208) 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:22:16 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:39533 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1e5DaJ-0007yO-H6; Thu, 19 Oct 2017 09:22:15 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e5DaJ-0003J5-Dn; Thu, 19 Oct 2017 09:22:15 -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 v9JGM7X2018304; Thu, 19 Oct 2017 09:22:07 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e5DaB-0003H7-2Y; Thu, 19 Oct 2017 09:22:07 -0700 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=71Wdt/wphhdDrtisio0i7kS58N8rD5dg/rHmbHJ8680=; b=xvuC17eKh/aiqDoTezCqKT/MZ0R98SrRXEUTP8IcAyzgQztM564YULC729liW7j3zJO0cseSSpRbC+C5HSZoVHVQZrDWTSkNJbRjmHLgm0J/wW1lwg0jmVRtP4OujoXAgBktxso3nZZWi0m0fZo7D0QOcgn8LXUbfuvJimIFXX8= Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; citrix.com; dkim=none (message not signed) header.d=none;citrix.com; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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; From: Alistair Francis To: Date: Thu, 19 Oct 2017 09:18:14 -0700 Message-ID: <55afe994ca32715382326d5d250231bdaa836f08.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)(346002)(39860400002)(376002)(2980300002)(438002)(189002)(199003)(8936002)(8666007)(33646002)(106466001)(36756003)(5003940100001)(36386004)(5660300001)(189998001)(4326008)(118296001)(81166006)(47776003)(8676002)(81156014)(63266004)(16586007)(9786002)(2351001)(356003)(106002)(316002)(6916009)(77096006)(50226002)(50986999)(2950100002)(48376002)(76176999)(54906003)(2906002)(478600001)(6666003)(305945005)(39060400002)(50466002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB3385; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT062; 1:n2qyQDCQFpkzAfnO/rQzJj8KZVKvMRqEasHiHHR24QMlB6jtn7SuZB9ictGCjy9NwPzg2VLw0fvUCyKLQ972/q7mqdv5j9bD2ho1NgK/6lgicJz2ojOF0bxKQeuDm/qo MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ee3a2a7b-6ccd-40d9-40ae-08d5170d902d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:DM5PR02MB3385; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 3:CYlOE+CSwl9zzIUhPiOOColiqT3m/nIC201vm0C+M+qOYDNsJUNR3TUG1XHlgZcPobPl9ocr/NXa5WZaBAJgdcYzq0qwLayumZVopBR9oLB2GZhs21S03HsEJMOFIh9Gpc1/cyXxiuMccQO0wr6hVzvvWfMAGvVZy0iqYojVJaNaAZfC4xwvyAc4/893WISfV9ICsNy2v1xxVphGvxNY90y+0XGuMpA3Dkv9qkHHww58rRTCboebuf/YIBq1IA/1QZhJT3eueLoS2AP1+YYOFvCpMHJ48zi7KKEe9tOc/O8Q2GUMbkzD4t1tedpczwT/mks0Dsq8GnH7QWK03S0h6ZHuSZprNtsyHJ8CoziWM70=; 25:1m//g1LUcX/o/yEdqIM4Y++TczqT3e/1mZRIgDcf1W7W/E8g53TRW+MdlJsrgwYuOLI/TkTJby4PVXHs0oUKHZCmKW+L3/Lw3u4GMe1ccpNwLBkJGQWDATZ/D6reIF+K69abUSr/ca/IF16P7sKSaNBRqQBm4TNGnevJENgmAOJQ9HIriu3O49B8Lx7sy+g8vnQtxWugrl2u6/i/1wPdqt5ika3YA5MIq3oqNuJBxw/Te67i0Rhr2PUSgHk6P7eyhMN5P8mRRaB2xBUUmjffIZp+HsFk68syxq6Ooa/m8k25q1+PFeZMduSagOrCoMwgi7mvy+CX+O5vCpgqYYVQvg== X-MS-TrafficTypeDiagnostic: DM5PR02MB3385: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 31:l4ljIDXqv/sQ1dk6RRtgMf+JusOX3hAIMU30wDKPPn3Ae8mTQESR/6al6robY/60dqW4r6Kn2HGR5E0N9g1RI5diHS2c3osDO0ql5EQmwwMSBmSJpqLLPRKp4Nt2vHCJmJAolzl5rWHMcnAcKnuG8RP8oyEBinl33LK5qayanwPjXMyFTk0aelwB1k7D1YiPhcNpzk07lCuJOr30dtVbBQmX3OUASXaE7BjwApUhAm4=; 20:8YskOG46hXzgdsA14M+g0uQsARhzUoumUeDuXPH1xX9/HqNaZ6lHb6UT+ssQ2636rs1nmj3upk6k99jJW5MZdWshq5xfQmJ/5eC6+1tpBXinBJ7YS0ITL5Hvq5QtUQVOpCsZInNOVinqYz4XEaw5p90McjRvL8hBEDaxz34v01WsM6xVrS8Hp9zLzXou+dDdNP5k2h3t7qWvXa36XQ8L8SC9Tsdcx8XmL8AIT/HZsWHl6riNagKzxngTumSqmesa9b5WKaPh+90yEl+JuLl2WhEEeQ2G483mL+eDT691J1h5iy4R8gwrhMJ+PG4RIYhaNuzRbh1JqUzNP5f7mX7KMbo+nWz2ujUlA7+Uxp98IuYra9CySmHRkpASFaK96ZwN4Ijg3j6HYnfcmZa1s3BNh2+dAE4NlkqC+wDkD/wo8/Km9p3/Qs2c0AhuZYkh8IHf2Sjs9ib7+L0Qv+HZh8tc1Wuax85hTxUVqb3cEggmwYvn+nkVEpiwNF93bnKYtndK X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592)(70601490899591); 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)(3002001)(93006095)(93004095)(100000703101)(100105400095)(10201501046)(6055026)(6041248)(20161123558100)(20161123555025)(20161123560025)(20161123564025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR02MB3385; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR02MB3385; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 4:uXkjRO6dIVz/WJkqac6LI77Dy0nav8D/RywrKSbgroOcH/86YYob9wLmwdN4tKca8I0xWKff+3Cl1AT3Vv8gOm8k5xA8nc+B87Cm1P+IhS8IOhEVju0JYtjpc9OoYudR0VTsv3bA5XBH0LcjyA7J0YWAOd/eHhteaJTQxp9oYWNehHVH2M8Fr970Nb/cy0M16FfCPfEMzX48MV4aVSRgNlRarRcXBdGW0nuFzOEtBY9A7tt6v5sp6S1q4q8R+QTjKbC9Ci27WYCjnyDnaN2jJwVF7TvmZ+IIwbg03DiJ9EOx1x7eS+ghO9FXBYQVFFMXXVTqhCZcgKiSMxLjpJWzPtmeII6G0C4J5I9m/qHM7Lw= X-Forefront-PRVS: 0465429B7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3385; 23:uZSOiX+ZiqnGbJZXTTEh8EzehFjMh3UmECPdzbI+N?= =?us-ascii?Q?sTM4NXaDuRCcKaXZcuqbmQcR/EN4gljFcb3IC/aoXtt6UZO6uHtV4k3mbqlM?= =?us-ascii?Q?/u0QnM90J3+q/bIsHxh0gE3Poz1a0fQZPTzlfmcXTnRhUooBxs+pcQAtP85W?= =?us-ascii?Q?Obe/ExnhhmlwN8+33XZ2POVYBT2O2srbcW7eqeGMFtdA13rD4S3tUc6GDpZg?= =?us-ascii?Q?GFjc+EhVNxWb/1YwSDZli5BJ4lNz2RUpWF2FhIqVg7R3XX0z5ELkzsdnP3Bo?= =?us-ascii?Q?Ej9wZnzm6i/0aBk1BivCKhjRzc5IPtugDF9TGzb0/duvNtm/4L65gA8xGfVC?= =?us-ascii?Q?khGBOKkddg7Dzkp3yZ0AFvudgdKMwXCzMif1F7zm9juzfYofeXJBoJyFkVHb?= =?us-ascii?Q?ilHcENplkAHiU+x/dF/COBxhat9XfjTPPaeok63bhgoNHG/Qd8b7TBPy8MQT?= =?us-ascii?Q?OXtsD+9j0bLEZBYQ3uv+MotHqF77VROgO9QepZKP3EP0cL+kEkB6lXS0Iofu?= =?us-ascii?Q?xC3C2fhOXev5EzX/0ETsMp64+5eMpI3YWOz5ywXX1D5IJ89/nrPPqCDhIOVH?= =?us-ascii?Q?wk6aDP135XdS3LtFK2vBCPXkIFqoeF/FFQ3sm+axxc4vYybQL5BeNJHKLymG?= =?us-ascii?Q?2rkGrejpJEMmcoxDyhF19CjYMmsuUOcpY8RaGcIX/qJPkcTsOsPLMQQEnhXp?= =?us-ascii?Q?0G64gBpUV60qsUpEZMSiYaaq+gjYDA/HEgWxTgPiy1YpxtzUVgefN7Oatl+C?= =?us-ascii?Q?AzeAQ1BPKT/0tpGAgFZdaKsMrPeXDyE67obpNcR10Fqtz31TSOEDlPNqtYqE?= =?us-ascii?Q?4SBUAMpEl6BioMY/1x1+1zsxEDR8S5ex3FzEG/kFUHDstvFpW1kpxNg5/P/z?= =?us-ascii?Q?keFmRuYaV2fcHPKBwHXfhTOLqyzOJfcaSVMcMkOSrjQ76g+AC9Dra1K8zYAQ?= =?us-ascii?Q?myVSI3Gr5xCtuwImIKbwR8JgPbwkoW0sJ6921gRwTZasQnMuP5qY/VOi5M01?= =?us-ascii?Q?3KssC0HlZ9oxDYDZ4p8zAvf75yM4K7zzR/4b569Qvdzot3V6YDdxlBRj5EZW?= =?us-ascii?Q?K2vbi6mKqFVC6MNTQLRNsa+Iy2RfPdswpbmAzyJhGm9Ucwihw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 6:e3zn/wdYXxjSD4mD35u0BxVjBjlKEPggrzZprCohJvIKKYNE7Cobdvhs2maBRHHSkLbXtDcky/uo3Iw5ktkYhfxMRTawuKJ47yeJtYYkt+8x/oGCtIyXVWmbRRoCsOzsaVyo0HyFC2mPiY2Io2ZvDDx5cBq6N+v0ZS3ygGIrxQ+J9HN3TDmUENIsQADGcgBNABjzzEFF6b2dDYBERuX51FblYj1RU069s2pO/zA9Axasp9IH1V8bz+dD2KMeHMEHS1zCKMzUXn6N1P91wHp8sCrxnBP8gkP15DrcZElSgq++t5d0RNveheY7y8TqHXbgHhagui4LmvH+jkyhHqmGfg==; 5:69W9f+YsPDSRmseQtUoKJSc8+Z9RzE/0xUyBwLZIK4Io3JRupy8neNWxmFNxogWEWaKyxv3T2QGjJ/ip/6tUYxNgg7lrwfTdlgi0vzPfxDthxLS1Zj1JddVbxH/VE9zWKuTHgFPAZgnm2ZNdqu/Q6g==; 24:X63NrBR7Cn7iHntku+0+t3tTKS510yabhm30Zj9/hk0hUGDiA5q5YXZNpUA0zKfinxZwX4tVfVEdnPPYxpzWF5bqyDENxM0t2m+Ie6vZY4E=; 7:gsS55oVzOdOre42yZphHz3/E/t1iaSbC7Fz3vy7X/UYFYCL9+nbDrQ8HPGtqt/0lEjLGfpaFfvvGLUv4+I+qoRzr2GblBBgyCGCVPe/Y515p1TXTes9JQwUuZYQLNmQtKpwE0GgAdKDJirSosFQ6lQHm5YOkqCWyP8xWW5F/e8h0n0ivgxSDQnVUK3syvE03JS7pTAwrM6DtL/cgEMCzoJdc4FPg3NSlM3Ps3dfpn1k= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2017 16:22:16.0722 (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: DM5PR02MB3385 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.87 Subject: [Qemu-devel] [PATCH v3 41/46] hw/xen*: 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: Anthony Perard , alistair23@gmail.com, Stefano Stabellini , armbru@redhat.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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_re= port("\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. xen_pt_log() was left with an fprintf(stderr, Signed-off-by: Alistair Francis Cc: Stefano Stabellini Cc: Anthony Perard Acked-by: Anthony PERARD --- V3: - Don't change xen_pt_log() V2: - Split hw patch into individual directories hw/xen/xen-common.c | 11 ++++++----- hw/xenpv/xen_domainbuild.c | 24 ++++++++++++------------ hw/xenpv/xen_machine_pv.c | 9 +++++---- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c index 632a938dcc..42ada2ac05 100644 --- a/hw/xen/xen-common.c +++ b/hw/xen/xen-common.c @@ -9,6 +9,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/xen/xen_backend.h" #include "qmp-commands.h" #include "chardev/char.h" @@ -47,19 +48,19 @@ static int store_dev_info(int domid, Chardev *cs, const= char *string) /* We now have everything we need to set the xenstore entry. */ xs =3D xs_open(0); if (xs =3D=3D NULL) { - fprintf(stderr, "Could not contact XenStore\n"); + error_report("Could not contact XenStore"); goto out; } =20 path =3D xs_get_domain_path(xs, domid); if (path =3D=3D NULL) { - fprintf(stderr, "xs_get_domain_path() error\n"); + error_report("xs_get_domain_path() error"); goto out; } newpath =3D realloc(path, (strlen(path) + strlen(string) + strlen("/tty") + 1)); if (newpath =3D=3D NULL) { - fprintf(stderr, "realloc error\n"); + error_report("realloc error"); goto out; } path =3D newpath; @@ -96,13 +97,13 @@ static void xenstore_record_dm_state(struct xs_handle *= xs, const char *state) char path[50]; =20 if (xs =3D=3D NULL) { - fprintf(stderr, "xenstore connection not initialized\n"); + error_report("xenstore connection not initialized"); exit(1); } =20 snprintf(path, sizeof (path), "device-model/%u/state", xen_domid); if (!xs_write(xs, XBT_NULL, path, state, strlen(state))) { - fprintf(stderr, "error recording dm state\n"); + error_report("error recording dm state"); exit(1); } } diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c index 027f76fad1..f5514ffec2 100644 --- a/hw/xenpv/xen_domainbuild.c +++ b/hw/xenpv/xen_domainbuild.c @@ -25,22 +25,22 @@ static int xenstore_domain_mkdir(char *path) int i; =20 if (!xs_mkdir(xenstore, 0, path)) { - fprintf(stderr, "%s: xs_mkdir %s: failed\n", __func__, path); - return -1; + error_report("%s: xs_mkdir %s: failed", __func__, path); + return -1; } if (!xs_set_permissions(xenstore, 0, path, perms_ro, 2)) { - fprintf(stderr, "%s: xs_set_permissions failed\n", __func__); - return -1; + error_report("%s: xs_set_permissions failed", __func__); + return -1; } =20 for (i =3D 0; writable[i]; i++) { snprintf(subpath, sizeof(subpath), "%s/%s", path, writable[i]); if (!xs_mkdir(xenstore, 0, subpath)) { - fprintf(stderr, "%s: xs_mkdir %s: failed\n", __func__, subpath= ); + error_report("%s: xs_mkdir %s: failed", __func__, subpath); return -1; } if (!xs_set_permissions(xenstore, 0, subpath, perms_rw, 2)) { - fprintf(stderr, "%s: xs_set_permissions failed\n", __func__); + error_report("%s: xs_set_permissions failed", __func__); return -1; } } @@ -235,7 +235,7 @@ int xen_domain_build_pv(const char *kernel, const char = *ramdisk, memcpy(uuid, &qemu_uuid, sizeof(uuid)); rc =3D xen_domain_create(xen_xc, ssidref, uuid, flags, &xen_domid); if (rc < 0) { - fprintf(stderr, "xen: xc_domain_create() failed\n"); + error_report("xen: xc_domain_create() failed"); goto err; } qemu_log("xen: created domain %d\n", xen_domid); @@ -248,21 +248,21 @@ int xen_domain_build_pv(const char *kernel, const cha= r *ramdisk, =20 rc =3D xc_domain_max_vcpus(xen_xc, xen_domid, smp_cpus); if (rc < 0) { - fprintf(stderr, "xen: xc_domain_max_vcpus() failed\n"); + error_report("xen: xc_domain_max_vcpus() failed"); goto err; } =20 #if 0 rc =3D xc_domain_setcpuweight(xen_xc, xen_domid, 256); if (rc < 0) { - fprintf(stderr, "xen: xc_domain_setcpuweight() failed\n"); + error_report("xen: xc_domain_setcpuweight() failed"); goto err; } #endif =20 rc =3D xc_domain_setmaxmem(xen_xc, xen_domid, ram_size >> 10); if (rc < 0) { - fprintf(stderr, "xen: xc_domain_setmaxmem() failed\n"); + error_report("xen: xc_domain_setmaxmem() failed"); goto err; } =20 @@ -275,7 +275,7 @@ int xen_domain_build_pv(const char *kernel, const char = *ramdisk, xenstore_port, &xenstore_mfn, console_port, &console_mfn); if (rc < 0) { - fprintf(stderr, "xen: xc_linux_build() failed\n"); + error_report("xen: xc_linux_build() failed"); goto err; } =20 @@ -285,7 +285,7 @@ int xen_domain_build_pv(const char *kernel, const char = *ramdisk, qemu_log("xen: unpausing domain %d\n", xen_domid); rc =3D xc_domain_unpause(xen_xc, xen_domid); if (rc < 0) { - fprintf(stderr, "xen: xc_domain_unpause() failed\n"); + error_report("xen: xc_domain_unpause() failed"); goto err; } =20 diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c index 69a52a9f93..44d67b87c4 100644 --- a/hw/xenpv/xen_machine_pv.c +++ b/hw/xenpv/xen_machine_pv.c @@ -23,6 +23,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/boards.h" #include "hw/xen/xen_backend.h" @@ -36,7 +37,7 @@ static void xen_init_pv(MachineState *machine) =20 /* Initialize backend core & drivers */ if (xen_be_init() !=3D 0) { - fprintf(stderr, "%s: xen backend core setup failed\n", __func__); + error_report("%s: xen backend core setup failed", __func__); exit(1); } =20 @@ -51,18 +52,18 @@ static void xen_init_pv(MachineState *machine) const char *initrd_filename =3D machine->initrd_filename; if (xen_domain_build_pv(kernel_filename, initrd_filename, kernel_cmdline) < 0) { - fprintf(stderr, "xen pv domain creation failed\n"); + error_report("xen pv domain creation failed"); exit(1); } break; } #endif case XEN_EMULATE: - fprintf(stderr, "xen emulation not implemented (yet)\n"); + error_report("xen emulation not implemented (yet)"); exit(1); break; default: - fprintf(stderr, "unhandled xen_mode %d\n", xen_mode); + error_report("unhandled xen_mode %d", xen_mode); exit(1); break; } --=20 2.11.0