Could this patchset apply to -trivial, thank you! Best regards, Li.
On 2014/8/26 14:38, john.liuli wrote: > From: Li Liu <john.li...@huawei.com> > > Reviewed-by: Peter Crosthwaite <peter.crosthwa...@xilinx.com> > Signed-off-by: Li Liu <john.li...@huawei.com> > --- > changes v1 -> v2: > 1) fix indent issue as peter suggested. > 2) dump all err mesages with error_report. > > --- > device_tree.c | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > > diff --git a/device_tree.c b/device_tree.c > index ca83504..9d47195 100644 > --- a/device_tree.c > +++ b/device_tree.c > @@ -20,6 +20,7 @@ > > #include "config.h" > #include "qemu-common.h" > +#include "qemu/error-report.h" > #include "sysemu/device_tree.h" > #include "sysemu/sysemu.h" > #include "hw/loader.h" > @@ -79,8 +80,8 @@ void *load_device_tree(const char *filename_path, int > *sizep) > *sizep = 0; > dt_size = get_image_size(filename_path); > if (dt_size < 0) { > - printf("Unable to get size of device tree file '%s'\n", > - filename_path); > + error_report("Unable to get size of device tree file '%s'", > + filename_path); > goto fail; > } > > @@ -92,21 +93,21 @@ void *load_device_tree(const char *filename_path, int > *sizep) > > dt_file_load_size = load_image(filename_path, fdt); > if (dt_file_load_size < 0) { > - printf("Unable to open device tree file '%s'\n", > - filename_path); > + error_report("Unable to open device tree file '%s'", > + filename_path); > goto fail; > } > > ret = fdt_open_into(fdt, fdt, dt_size); > if (ret) { > - printf("Unable to copy device tree in memory\n"); > + error_report("Unable to copy device tree in memory"); > goto fail; > } > > /* Check sanity of device tree */ > if (fdt_check_header(fdt)) { > - printf ("Device tree file loaded into memory is invalid: %s\n", > - filename_path); > + error_report("Device tree file loaded into memory is invalid: %s", > + filename_path); > goto fail; > } > *sizep = dt_size; >