From nobody Wed Feb 11 05:35:45 2026 Delivered-To: importer@patchew.org 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; 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1528383822701190.59001113530655; Thu, 7 Jun 2018 08:03:42 -0700 (PDT) Received: from localhost ([::1]:58463 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQwRy-0004Z4-4T for importer@patchew.org; Thu, 07 Jun 2018 11:03:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQwCA-00010x-07 for qemu-devel@nongnu.org; Thu, 07 Jun 2018 10:47:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQwC7-0008I5-5N for qemu-devel@nongnu.org; Thu, 07 Jun 2018 10:47:22 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:33723) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fQwC7-0008Ho-0Z for qemu-devel@nongnu.org; Thu, 07 Jun 2018 10:47:19 -0400 Received: by mail-qt0-x242.google.com with SMTP id l10-v6so4899369qtj.0 for ; Thu, 07 Jun 2018 07:47:18 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id s128-v6sm11607363qkh.2.2018.06.07.07.47.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 07:47:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f8L3PDupUWK0QJE501qgxRGNYceMpPxa0cK+Z5p74FA=; b=Ceu5GRt/jNMJ6txwHyIPcqVWfP/QlGcahPRXiK9fIB2oLmPrKcz7XeEDEVY6KkY+tR s/JQyxE4UH3M2khaWV54+nsw8QWkrCw40vtZ88cxir6cEXkUE8nwsXbjNwiWvJBDVat8 hDfcGRB5jYogwgba3y+qz7TFZkQrFpsinJh5PJsVcNa8jWN8bUcyf7d22C7qlitSJwaB BG3ajr8WBvBwbOy+Qp4fD+wVUZGDahvGxAGu6EuVdpduokxa5GxBZA63lWYrtlQlyXOB iepBmoO24MK965oEie6tHsBnQ8Vn5g1xRiJiLjqiRSN9e6eycF7GfLeoKvUFiYGMMa69 lXtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=f8L3PDupUWK0QJE501qgxRGNYceMpPxa0cK+Z5p74FA=; b=QFkhHi+rRSedR0xGr5XKzNuLtbrUK2qMpJYYdoN9Ve2dKTUbRSwEqX6AMp8lndXnN1 8IsUwFVnjC4HPjgW4+1NouQJRxXLALwBZf6kwycf81Wp1IHqRRVRTLcsY7pUdgs+jaEW Sz1wPQpSOlkNrk2k7us8syQiSJVmmngoLXS/xcnWsJ4IFUJGt+51UpKBAMBLoAppv7ct K4QfOESpai7fN0SjbrY05InXJgWNAvOqiM1kAuGHgsU6SzqFmtB+lzDDla5vSaPF8fGK hO070uG72DJpzQm6Ka5DvczwVJMc6c4k75Hh2HEoiqnRSa6JGccTXVaZTvJjv4POZsOk s+Wg== X-Gm-Message-State: APt69E11BsOVN/mmdeGayG7nUKbR1DU4JcQ1vyTEMxD7hsbQ5/PU+NMt ZyGMjILf8o89COzaaf15bI4= X-Google-Smtp-Source: ADUXVKKPUFRwNgMvgW3IMThsFihTqAEO17bxBQsad90ynAWTvIQRyVh+CuCCt+VCeAbdI9q03/nJWQ== X-Received: by 2002:a0c:b2ca:: with SMTP id d10-v6mr1962127qvf.16.1528382838352; Thu, 07 Jun 2018 07:47:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Eric Blake , Markus Armbruster , Peter Maydell , Peter Crosthwaite , Alexander Graf Date: Thu, 7 Jun 2018 11:46:45 -0300 Message-Id: <20180607144645.10187-5-f4bug@amsat.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180607144645.10187-1-f4bug@amsat.org> References: <20180607144645.10187-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH v2 4/4] device_tree: Replace error_setg(&error_fatal) by error_report() + exit() 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: David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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 Use error_report() + exit() instead of error_setg(&error_fatal), as suggested by the "qapi/error.h" documentation: Please don't error_setg(&error_fatal, ...), use error_report() and exit(), because that's more obvious. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Eric Auger Reviewed-by: Markus Armbruster Reviewed-by: David Gibson --- device_tree.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/device_tree.c b/device_tree.c index 52c3358a55..3553819257 100644 --- a/device_tree.c +++ b/device_tree.c @@ -140,15 +140,16 @@ static void read_fstree(void *fdt, const char *dirnam= e) const char *parent_node; =20 if (strstr(dirname, root_dir) !=3D dirname) { - error_setg(&error_fatal, "%s: %s must be searched within %s", - __func__, dirname, root_dir); + error_report("%s: %s must be searched within %s", + __func__, dirname, root_dir); + exit(1); } parent_node =3D &dirname[strlen(SYSFS_DT_BASEDIR)]; =20 d =3D opendir(dirname); if (!d) { - error_setg(&error_fatal, "%s cannot open %s", __func__, dirname); - return; + error_report("%s cannot open %s", __func__, dirname); + exit(1); } =20 while ((de =3D readdir(d)) !=3D NULL) { @@ -162,7 +163,8 @@ static void read_fstree(void *fdt, const char *dirname) tmpnam =3D g_strdup_printf("%s/%s", dirname, de->d_name); =20 if (lstat(tmpnam, &st) < 0) { - error_setg(&error_fatal, "%s cannot lstat %s", __func__, tmpna= m); + error_report("%s cannot lstat %s", __func__, tmpnam); + exit(1); } =20 if (S_ISREG(st.st_mode)) { @@ -170,8 +172,9 @@ static void read_fstree(void *fdt, const char *dirname) gsize len; =20 if (!g_file_get_contents(tmpnam, &val, &len, NULL)) { - error_setg(&error_fatal, "%s not able to extract info from= %s", - __func__, tmpnam); + error_report("%s not able to extract info from %s", + __func__, tmpnam); + exit(1); } =20 if (strlen(parent_node) > 0) { @@ -206,9 +209,9 @@ void *load_device_tree_from_sysfs(void) host_fdt =3D create_device_tree(&host_fdt_size); read_fstree(host_fdt, SYSFS_DT_BASEDIR); if (fdt_check_header(host_fdt)) { - error_setg(&error_fatal, - "%s host device tree extracted into memory is invalid", - __func__); + error_report("%s host device tree extracted into memory is invalid= ", + __func__); + exit(1); } return host_fdt; } --=20 2.17.1