OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

device_tree: Replace error_setg(&error_fatal) by error_report() + exit() 

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é <f4bug@amsat.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-id: 20180625165749.3910-4-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2018-06-29 15:11:00 +01:00 committed by Peter Maydell
parent 88bbd3fb60
commit 38754e43f6
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
device_tree.c
View File

@ -140,15 +140,16 @@ static void read_fstree(void *fdt, const char *dirname)
const char *parent_node; const char *parent_node;
if (strstr(dirname, root_dir) != dirname) { if (strstr(dirname, root_dir) != dirname) {
error_setg(&error_fatal, "%s: %s must be searched within %s", error_report("%s: %s must be searched within %s",
__func__, dirname, root_dir); __func__, dirname, root_dir);
exit(1);
} }
parent_node = &dirname[strlen(SYSFS_DT_BASEDIR)]; parent_node = &dirname[strlen(SYSFS_DT_BASEDIR)];
d = opendir(dirname); d = opendir(dirname);
if (!d) { if (!d) {
error_setg(&error_fatal, "%s cannot open %s", __func__, dirname); error_report("%s cannot open %s", __func__, dirname);
return; exit(1);
} }
while ((de = readdir(d)) != NULL) { 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); tmpnam = g_strdup_printf("%s/%s", dirname, de->d_name);
if (lstat(tmpnam, &st) < 0) { 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)) { if (S_ISREG(st.st_mode)) {
@ -170,8 +172,9 @@ static void read_fstree(void *fdt, const char *dirname)
gsize len; gsize len;
if (!g_file_get_contents(tmpnam, &val, &len, NULL)) { if (!g_file_get_contents(tmpnam, &val, &len, NULL)) {
error_setg(&error_fatal, "%s not able to extract info from %s", error_report("%s not able to extract info from %s",
__func__, tmpnam); __func__, tmpnam);
exit(1);
} }
if (strlen(parent_node) > 0) { if (strlen(parent_node) > 0) {
@ -206,9 +209,9 @@ void *load_device_tree_from_sysfs(void)
host_fdt = create_device_tree(&host_fdt_size); host_fdt = create_device_tree(&host_fdt_size);
read_fstree(host_fdt, SYSFS_DT_BASEDIR); read_fstree(host_fdt, SYSFS_DT_BASEDIR);
if (fdt_check_header(host_fdt)) { if (fdt_check_header(host_fdt)) {
error_setg(&error_fatal, error_report("%s host device tree extracted into memory is invalid",
"%s host device tree extracted into memory is invalid", __func__);
__func__); exit(1);
} }
return host_fdt; return host_fdt;
} }