softmmu/device_tree.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fdt_open_into() obligingly returns an error code in case the operation
failed. So be obliging as well and use it in the error message.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
softmmu/device_tree.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c
index 3965c834ca..31d1066940 100644
--- a/softmmu/device_tree.c
+++ b/softmmu/device_tree.c
@@ -60,7 +60,8 @@ void *create_device_tree(int *sizep)
}
ret = fdt_open_into(fdt, fdt, *sizep);
if (ret) {
- error_report("Unable to copy device tree in memory");
+ error_report("%s: Unable to copy device tree into memory: %s",
+ __func__, fdt_strerror(ret));
exit(1);
}
@@ -104,7 +105,8 @@ void *load_device_tree(const char *filename_path, int *sizep)
ret = fdt_open_into(fdt, fdt, dt_size);
if (ret) {
- error_report("Unable to copy device tree in memory");
+ error_report("%s: Unable to copy device tree into memory: %s",
+ __func__, fdt_strerror(ret));
goto fail;
}
--
2.34.1
On 16/1/22 12:46, Bernhard Beschow wrote: > fdt_open_into() obligingly returns an error code in case the operation > failed. So be obliging as well and use it in the error message. > > Signed-off-by: Bernhard Beschow <shentey@gmail.com> > --- > softmmu/device_tree.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
On Sun, Jan 16, 2022 at 9:49 PM Bernhard Beschow <shentey@gmail.com> wrote: > > fdt_open_into() obligingly returns an error code in case the operation > failed. So be obliging as well and use it in the error message. > > Signed-off-by: Bernhard Beschow <shentey@gmail.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > softmmu/device_tree.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c > index 3965c834ca..31d1066940 100644 > --- a/softmmu/device_tree.c > +++ b/softmmu/device_tree.c > @@ -60,7 +60,8 @@ void *create_device_tree(int *sizep) > } > ret = fdt_open_into(fdt, fdt, *sizep); > if (ret) { > - error_report("Unable to copy device tree in memory"); > + error_report("%s: Unable to copy device tree into memory: %s", > + __func__, fdt_strerror(ret)); > exit(1); > } > > @@ -104,7 +105,8 @@ void *load_device_tree(const char *filename_path, int *sizep) > > ret = fdt_open_into(fdt, fdt, dt_size); > if (ret) { > - error_report("Unable to copy device tree in memory"); > + error_report("%s: Unable to copy device tree into memory: %s", > + __func__, fdt_strerror(ret)); > goto fail; > } > > -- > 2.34.1 > >
Le 16/01/2022 à 12:46, Bernhard Beschow a écrit : > fdt_open_into() obligingly returns an error code in case the operation > failed. So be obliging as well and use it in the error message. > > Signed-off-by: Bernhard Beschow <shentey@gmail.com> > --- > softmmu/device_tree.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c > index 3965c834ca..31d1066940 100644 > --- a/softmmu/device_tree.c > +++ b/softmmu/device_tree.c > @@ -60,7 +60,8 @@ void *create_device_tree(int *sizep) > } > ret = fdt_open_into(fdt, fdt, *sizep); > if (ret) { > - error_report("Unable to copy device tree in memory"); > + error_report("%s: Unable to copy device tree into memory: %s", > + __func__, fdt_strerror(ret)); > exit(1); > } > > @@ -104,7 +105,8 @@ void *load_device_tree(const char *filename_path, int *sizep) > > ret = fdt_open_into(fdt, fdt, dt_size); > if (ret) { > - error_report("Unable to copy device tree in memory"); > + error_report("%s: Unable to copy device tree into memory: %s", > + __func__, fdt_strerror(ret)); > goto fail; > } > Applied to my trivial-patches branch. Thanks, Laurent
© 2016 - 2024 Red Hat, Inc.