Philippe Mathieu-Daudé <f4...@amsat.org> writes:
> 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.
>
> Suggested-by: Eric Blake <ebl...@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> 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 *dirname)
> const char *parent_node;
>
> if (strstr(dirname, root_dir) != 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);
Preexisting code smell: __func__ in an error message. Not this patch's
problem.
> }
> parent_node = &dirname[strlen(SYSFS_DT_BASEDIR)];
>
> d = 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);
> }
>
> while ((de = readdir(d)) != NULL) {
> @@ -162,7 +163,8 @@ static void read_fstree(void *fdt, const char *dirname)
> tmpnam = g_strdup_printf("%s/%s", dirname, de->d_name);
>
> if (lstat(tmpnam, &st) < 0) {
> - error_setg(&error_fatal, "%s cannot lstat %s", __func__, tmpnam);
> + error_report("%s cannot lstat %s", __func__, tmpnam);
> + exit(1);
> }
>
> if (S_ISREG(st.st_mode)) {
> @@ -170,8 +172,9 @@ static void read_fstree(void *fdt, const char *dirname)
> gsize len;
>
> 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);
> }
>
> if (strlen(parent_node) > 0) {
> @@ -206,9 +209,9 @@ void *load_device_tree_from_sysfs(void)
> host_fdt = 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;
> }
Reviewed-by: Markus Armbruster <arm...@redhat.com>
