From patchwork Wed Nov 8 22:58:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10049705 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 35388601EB for ; Wed, 8 Nov 2017 23:36:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 26258299CF for ; Wed, 8 Nov 2017 23:36:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B125299D1; Wed, 8 Nov 2017 23:36:50 +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 25106299D0 for ; Wed, 8 Nov 2017 23:36:49 +0000 (UTC) Received: from localhost ([::1]:34473 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZto-0001rH-Ds for patchwork-qemu-devel@patchwork.kernel.org; Wed, 08 Nov 2017 18:36:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35141) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZNH-00017U-NN for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZNE-0003qr-Hu for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:11 -0500 Received: from mail-sn1nam01on0065.outbound.protection.outlook.com ([104.47.32.65]:58550 helo=NAM01-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 1eCZNE-0003qZ-94 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:08 -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=Yddjkp1sNuRQmKA9/80oGuS4nDQtluQSBfLJkWFNgmk=; b=z6Mse+I+TPWg4tO8CIc0y4uvsB59M37dY5FF8RZVtxTgtxNoJ61nXso2pZjkFhJVyf8KYBQzBCzCvKh5I9W1yOHuBWpiAthn1c7OVOD7S6mASiA20lmLAbcrinar5UaWZJAtaCx7+EDU9PDF0SKLIb8/Y26cL1R/6+Eeuj0l6NA= Received: from MWHPR0201CA0065.namprd02.prod.outlook.com (2603:10b6:301:73::42) by DM2PR02MB1337.namprd02.prod.outlook.com (2a01:111:e400:50c8::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:03:05 +0000 Received: from CY1NAM02FT055.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::207) by MWHPR0201CA0065.outlook.office365.com (2603:10b6:301:73::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.197.13 via Frontend Transport; Wed, 8 Nov 2017 23:03:02 +0000 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 (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 CY1NAM02FT055.mail.protection.outlook.com (10.152.74.80) 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:03:01 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:36704 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZN6-0003za-Mq; Wed, 08 Nov 2017 15:03:00 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZN6-0003BM-5J; Wed, 08 Nov 2017 15:03:00 -0800 Received: from xsj-pvapsmtp01 (smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N2pav010513; Wed, 8 Nov 2017 15:02:52 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMx-0003A5-NC; Wed, 08 Nov 2017 15:02:51 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:53 -0800 Message-ID: <06b7c057b537c1de173ad4ecc9221dcd4fa1c1da.1510181732.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: 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.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(376002)(39860400002)(346002)(2980300002)(438002)(189002)(199003)(47776003)(33646002)(63266004)(39060400002)(50466002)(48376002)(76176999)(2950100002)(106002)(5660300001)(50986999)(36386004)(4326008)(77096006)(8666007)(6916009)(8936002)(2906002)(118296001)(8676002)(81166006)(81156014)(9786002)(356003)(478600001)(50226002)(305945005)(316002)(189998001)(54906003)(16586007)(36756003)(5003940100001)(106466001)(2351001)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR02MB1337; 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; CY1NAM02FT055; 1:UjurErgP9v3K3GQNOufQcC1xtl744Re8yxGBqqGL60qYEa4GQ9z46YjDIMFHzXcXbQwaIFcYF5h+BvXHs+XBVOpSgrah8WpHEEsSiqqKAAFe/8R/CPibUO/4VAUbAD30 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a02ac294-4b3f-4496-2d48-08d526fcdc8d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:DM2PR02MB1337; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1337; 3:PXiLmlzOdQJWFGvuB+h+DIjwWLTtb0Mycd5/yoHJH6d2WDHucTHthvSkztWtteDQ0XYsqxaFSC3pzZROj39Klxzves23XxPv4LECVy5ER3BdD8+SpfTKxSagFLszdJcCWLkFLSaM5F62pZfppdFmyNe8ekBU+ocRv0V7qG9sfVG1zCNArRDam1+pFHQBSpca0qP93eJYcEjoYnF06N/q09tqIK05RzSbPi0dHmteMgpeO4U2r8YXLElL1sViOWs8Fm6oubDfi8aUmKWNO55aY8pKvwbcoEv+9wQl0AmNuXW7y/k9A4jsD/hE5LQZVfBT6bBJAWCiOSvxgLGYC2czaZ2z6rw85uAcx9t2/SMxiDE=; 25:+lE+qv8OqEJxthEQBZwZTnsMXlDduf3EBC9Azu8pY2mvvhSh/NmPQSegbc/OrH/O6Q59lt1HAXHGJdfVJWcH9NBdQFF+WT8lwnCnKItMmSmq5dmsqDCf/Yz4mcK4tHiTJNSChCcel3mlBW7b+1SVXm4LhvIQ4qZhtYUQZpxRUG/knv2K81b7wRFyCGmY5ALU7G4BXoD+YN7OZzUL1wdXKcdj4+ows0QZcI/CKtq51eqPKXb5n8K//FjO2PsijLGP5iHl7Hd2xd3wibyB5WgZYW2tbp2U20GTF6bpMpU+mlkLdh19Fyj0biA2MYHS7KvaeTnNRqFc0s6ov/6nB5DnPjX6vXVU6OsIrrpZ6K1hylQ= X-MS-TrafficTypeDiagnostic: DM2PR02MB1337: X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1337; 31:DA0Ko12LZbnoIn4KoNE4bYVZUHfJQuMsAKCnriSbX8mRtu6oYX9wHgW4/bobuVDii9YgZmZYov5str9cqjiVLIC4Y2K6uKoRInXa5NcJWOtggCjdYdn55xzTs3etou5XW0PqQgfgAIhGU1m2rr3m9z9Lam0Xds767TjFYpYDk1ndIQR6KWXls4k/rXnJc1GIsacxpyrNqyAB+mmBUYdE3AfZEf95hX/FHIuy9R5TEj0=; 20:4yHDq+uUeGUvDXvIGTX0YzxwSpHK1L6zTSHS5DAhEhE0GRf30ftQOgh+XGSmb3dwXm/xyoR2ofUEEbOsJtPwON+wlLXU1Wn0/XD+puozJOPaxe4xVHQz9HFO80anIzrmZajZmvf21sO6O5wcbmCtB3HfrwW1eHn1/3Ih+Bd1G5CWfTgM1TXXCT0WEQi4IrSI1LG0qjhurryCiYtJR6no+0inBoVV4tjemHHmpD4Lzu06f35HI3nm1tP2YFb0wT7Ze3VweygJDfJFXS2FZ42TjXz40XnRAPOegQ56fa4Oe84Gt/Ira4WTk6qJeeYdTIAcPAZfM9cptzcFailCiGl/vNiJq86RDlKwSu1YXs0NTriGstJNvBnTUmsaHSe41LrUHq7aZBHFSw54diWpStGkrfuw6KXWwPzf3aVDtummEWK00X2WqrRjFh7dmjOvnOjNI9/D/HzntL3tXD1140WaNwCmwyRYP4UvXR/+ospojtcjjxhLZfHmz/g6LO4KBAch 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)(3231021)(10201501046)(100000703101)(100105400095)(93006095)(93004095)(6055026)(6041248)(20161123555025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM2PR02MB1337; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM2PR02MB1337; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1337; 4:yTQrRbh7nNC20qcaHJGXdgcO4vHNZ/r/FjAfgunilmCp5jcG5SpsbyuK8gw7e60qmgIIoLYdyMekfLwBptqfDA5yjCGtFzbKp8um2YOrFAwW7bwhvGpMti6lpqzJSz00+45/PfeHzNrx1Qyx3MohAeSOyzZfEx/fK5JARee+8sz53H2FOdmo6+2lu0LpwBACVIFFxgemUpCLcpM0ih40xVtuCoon9tzX4sEkF2VoACelGLxoi/+AuatoujJ/1jbkL/vNULg9spaWQGj9n+VRyvoPkijoQv+bREjJ0wSxdaX4mI0Yas/tT3CDLj+ykphW1M/DRQToerb1nsob3KaFaLspfoZVEziTX/AsI/UkNMqcHZLc62zoHEwY6FJCrIG/ X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR02MB1337; 23:u7u1RBc2LFtG/ihYUgavnXOvER9ffhhbQF/KojtnD?= =?us-ascii?Q?91sZpapUd7hHEGFv4VvIE5u0Wn4WerkTO/pvpyje+MlLRJH6Put7KRMrOTqL?= =?us-ascii?Q?g6KMiUUYu/0flGpOSxOkNWrqqY+Ngl1E8x80ygUTtdqs0BYi9Jz2Tpm3VPPK?= =?us-ascii?Q?BizCpBZAOnhBIJaPZyaxltRI5LEjkEXPuSj8X/hEf+7AHcl1FA3MxarY0KM9?= =?us-ascii?Q?FuO6hJL8YcBrT+oAnvY/qEf+m0d1TN6kM5y522bNusHJhX6HRZI/NoeEqKmn?= =?us-ascii?Q?Y6JIMQbt9DLBriRJGuEF9m2Ga43v+xQEkBjpKwp2GBSQce2bKfyuxlC3j0F+?= =?us-ascii?Q?xWwxzMLukXF6JG3WEzAIh49Io7/orFjMzBALM619fhQCWv5fZikTmrDFw7lK?= =?us-ascii?Q?lTqAQXKLNnRI9h1ErgwIeK1DjBJXH+CYa9V7kab2cd/z9VvpHox9HT50I5Fk?= =?us-ascii?Q?fneczi1qhgAO4yGLr3fcYswshL53aY4ErjgdoJUbsn3jBxZ4DeMNIyRrsGTH?= =?us-ascii?Q?fskqhSxRph0PVthbvEdSQnJV+tUVGMlCKa60AAceCaLuDIQBSQ0oObQjd2tf?= =?us-ascii?Q?kzAZidXWCng84CRixA616O8I6S40LN5+8aI1QFRaWwJsD6bzcNfF+XB4pMU1?= =?us-ascii?Q?KwhgWPnphn6CXnJeKtkUpU4ehGFwEkJ4gTFalKLWkPXIgKelXyJan+c0oKnX?= =?us-ascii?Q?j2U39BMWUe1QnY72bGxRB4baxUqt0PeUVmD5u4qFleQqXqf2Dcu6gQFhdgO8?= =?us-ascii?Q?zuvUMfLRaERYN5/tvrobgsNJgscNLLO6zyeoDPo7jDOf8xTqYSwePjoLxJ8s?= =?us-ascii?Q?+/P0vjxvv9/Hom0A8LqS3EAxgEPoqd+2q00SVwcWqIhpNoK7P28T5OQS8Wiq?= =?us-ascii?Q?dCNwgiLXHCDkXU769Wk7sTKhH1smohQtRt795V1T/mJK9Gbf9F0uaTO7dpiC?= =?us-ascii?Q?KpIU/RJErkFOD0tA2nbWXfCy7XeZ5r6vBipfS0RuXjwXgaVRgkB0l0rCjl8Q?= =?us-ascii?Q?V++MhgCo267K8mOHAfhT+0+jIYtDUfs76Q7mxcPr146QIO+g9fgQhe8q7B1F?= =?us-ascii?Q?XMoMpTIEBApK4BYYlj/PEUZgbPx?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1337; 6:PT1gTvfME3H9/Xc9Kutymyd5ZHR5ZPODLYuha6Jwwe2rZiMBPhwQtj2mo6APaeogXasXWvwlZgpeEGmWQufLjv9gz2GLQ9Kw+3BE0tLeQz/0bF5dwdEEkBivcG/Pk9/b/ryFXCA31/QNd+b+eS3qWePehC39T2wMBqJC3HGgZsgptpGhbdZBcLSA3lYQxxH9IoTrW+stZMoGllBPYc4c7Wbet0Nahk0Mdx+OiDY1M/8QqbUS+vJkUxZc0+ttNxeijL1b1r92h+AT1ylazdjORmYW1SJ1TYS4eB+z4pqvNvEXDvyag9+bxa7f7kge8ToG4Dgn2udIzqMXuvxIsl+KSXflE7t9d6Q4bVMdapjkI3s=; 5:KAWhrj+KDYEx66EKksNayNL0q7OsTqJCtsSnWkhLCQ47x2RIZ97SfbjB2tZgbdS2UiF1FOemoSeignUPu0TUKkssbs/ZBSQtSUbOj/4gX5Ibh09NEul2P1cdzpCcKI1Vy8u5/IiuSBr8LuZRcWqJhDSJHewrSK2LzV49FlDP4AU=; 24:kO1OG7Q4PNPFfVAiHMon5dsOwXg2gy2D9IM8oofVS1aEJtaadwa+yAguIm4SuyoLanBVGwylNPWCiAkHM4cVc570r/Mr7eTVOLdOYzci9vk=; 7:QODMC80WHvQgkDTiDJoQcd2xwVIHCCdzdJ+yQs+OtQndsK/v1XDc1jxZ3/1Lqn+74MTYPoZSa/6uYeqkCxFme9mGHevvZO+Rq06W24Ra0nvzXPngpDenDbTjXEZG5l1HAgQAeqN9QqDUeUokpXPTIfXqnF+GH8MqSV2rzCkcVcij7N2TcrPR9qyBKJYiUD9zR64vMjQoW8j/D/O6c7/46v6otGKY4nykTXjCibgdo2WFqiH0TauQavkY4JpaJ/8P SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:03:01.2584 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a02ac294-4b3f-4496-2d48-08d526fcdc8d 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: DM2PR02MB1337 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.65 Subject: [Qemu-devel] [PATCH v4 41/45] 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+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. 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 @@ */ #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 = xs_open(0); if (xs == NULL) { - fprintf(stderr, "Could not contact XenStore\n"); + error_report("Could not contact XenStore"); goto out; } path = xs_get_domain_path(xs, domid); if (path == NULL) { - fprintf(stderr, "xs_get_domain_path() error\n"); + error_report("xs_get_domain_path() error"); goto out; } newpath = realloc(path, (strlen(path) + strlen(string) + strlen("/tty") + 1)); if (newpath == NULL) { - fprintf(stderr, "realloc error\n"); + error_report("realloc error"); goto out; } path = newpath; @@ -96,13 +97,13 @@ static void xenstore_record_dm_state(struct xs_handle *xs, const char *state) char path[50]; if (xs == NULL) { - fprintf(stderr, "xenstore connection not initialized\n"); + error_report("xenstore connection not initialized"); exit(1); } 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; 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; } for (i = 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 = 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 char *ramdisk, rc = 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; } #if 0 rc = 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 rc = 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; } @@ -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; } @@ -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 = 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; } 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 @@ */ #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) /* Initialize backend core & drivers */ if (xen_be_init() != 0) { - fprintf(stderr, "%s: xen backend core setup failed\n", __func__); + error_report("%s: xen backend core setup failed", __func__); exit(1); } @@ -51,18 +52,18 @@ static void xen_init_pv(MachineState *machine) const char *initrd_filename = 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; }