Commit db013f81 authored by Li Liu's avatar Li Liu Committed by Michael Tokarev
Browse files

device_tree.c: redirect load_device_tree err message to stderr 



Reviewed-by: default avatarPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: default avatarLi Liu <john.liuli@huawei.com>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 7d2ff422

device_tree.c

+8 −7
Original line number Diff line number Diff line
@@ -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,7 +80,7 @@ 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",

        error_report("Unable to get size of device tree file '%s'",

                     filename_path);

        goto fail;

    }
@@ -92,20 +93,20 @@ 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",

        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",

        error_report("Device tree file loaded into memory is invalid: %s",

                     filename_path);

        goto fail;

    }