[Qemu-devel] [PATCH v2 1/2] device_tree.c: redirect load_device_tree err message to stderr

[Qemu-devel] [PATCH v2 1/2] device_tree.c: redirect load_device_tree err message to stderr

[john.liuli]

From: Li Liu <john.liuli@huawei.com>

Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Li Liu <john.liuli@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;
-- 
1.7.9.5

[Qemu-devel] [PATCH v2 2/2] device_tree.c: dump all err mesages with error_report

[john.liuli]

From: Li Liu <john.liuli@huawei.com>

Signed-off-by: Li Liu <john.liuli@huawei.com>
---
 device_tree.c |   40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/device_tree.c b/device_tree.c
index 9d47195..df9eed9 100644
--- a/device_tree.c
+++ b/device_tree.c
@@ -60,13 +60,13 @@ void *create_device_tree(int *sizep)
     }
     ret = fdt_open_into(fdt, fdt, *sizep);
     if (ret) {
-        fprintf(stderr, "Unable to copy device tree in memory\n");
+        error_report("Unable to copy device tree in memory");
         exit(1);
     }
 
     return fdt;
 fail:
-    fprintf(stderr, "%s Couldn't create dt: %s\n", __func__, fdt_strerror(ret));
+    error_report("%s Couldn't create dt: %s", __func__, fdt_strerror(ret));
     exit(1);
 }
 
@@ -124,8 +124,8 @@ static int findnode_nofail(void *fdt, const char *node_path)
 
     offset = fdt_path_offset(fdt, node_path);
     if (offset < 0) {
-        fprintf(stderr, "%s Couldn't find node %s: %s\n", __func__, node_path,
-                fdt_strerror(offset));
+        error_report("%s Couldn't find node %s: %s", __func__, node_path,
+                     fdt_strerror(offset));
         exit(1);
     }
 
@@ -139,8 +139,8 @@ int qemu_fdt_setprop(void *fdt, const char *node_path,
 
     r = fdt_setprop(fdt, findnode_nofail(fdt, node_path), property, val, size);
     if (r < 0) {
-        fprintf(stderr, "%s: Couldn't set %s/%s: %s\n", __func__, node_path,
-                property, fdt_strerror(r));
+        error_report("%s: Couldn't set %s/%s: %s", __func__, node_path,
+                     property, fdt_strerror(r));
         exit(1);
     }
 
@@ -154,8 +154,8 @@ int qemu_fdt_setprop_cell(void *fdt, const char *node_path,
 
     r = fdt_setprop_cell(fdt, findnode_nofail(fdt, node_path), property, val);
     if (r < 0) {
-        fprintf(stderr, "%s: Couldn't set %s/%s = %#08x: %s\n", __func__,
-                node_path, property, val, fdt_strerror(r));
+        error_report("%s: Couldn't set %s/%s = %#08x: %s", __func__,
+                     node_path, property, val, fdt_strerror(r));
         exit(1);
     }
 
@@ -176,8 +176,8 @@ int qemu_fdt_setprop_string(void *fdt, const char *node_path,
 
     r = fdt_setprop_string(fdt, findnode_nofail(fdt, node_path), property, string);
     if (r < 0) {
-        fprintf(stderr, "%s: Couldn't set %s/%s = %s: %s\n", __func__,
-                node_path, property, string, fdt_strerror(r));
+        error_report("%s: Couldn't set %s/%s = %s: %s", __func__,
+                     node_path, property, string, fdt_strerror(r));
         exit(1);
     }
 
@@ -194,8 +194,8 @@ const void *qemu_fdt_getprop(void *fdt, const char *node_path,
     }
     r = fdt_getprop(fdt, findnode_nofail(fdt, node_path), property, lenp);
     if (!r) {
-        fprintf(stderr, "%s: Couldn't get %s/%s: %s\n", __func__,
-                node_path, property, fdt_strerror(*lenp));
+        error_report("%s: Couldn't get %s/%s: %s", __func__,
+                     node_path, property, fdt_strerror(*lenp));
         exit(1);
     }
     return r;
@@ -207,8 +207,8 @@ uint32_t qemu_fdt_getprop_cell(void *fdt, const char *node_path,
     int len;
     const uint32_t *p = qemu_fdt_getprop(fdt, node_path, property, &len);
     if (len != 4) {
-        fprintf(stderr, "%s: %s/%s not 4 bytes long (not a cell?)\n",
-                __func__, node_path, property);
+        error_report("%s: %s/%s not 4 bytes long (not a cell?)",
+                     __func__, node_path, property);
         exit(1);
     }
     return be32_to_cpu(*p);
@@ -220,8 +220,8 @@ uint32_t qemu_fdt_get_phandle(void *fdt, const char *path)
 
     r = fdt_get_phandle(fdt, findnode_nofail(fdt, path));
     if (r == 0) {
-        fprintf(stderr, "%s: Couldn't get phandle for %s: %s\n", __func__,
-                path, fdt_strerror(r));
+        error_report("%s: Couldn't get phandle for %s: %s", __func__,
+                     path, fdt_strerror(r));
         exit(1);
     }
 
@@ -266,8 +266,8 @@ int qemu_fdt_nop_node(void *fdt, const char *node_path)
 
     r = fdt_nop_node(fdt, findnode_nofail(fdt, node_path));
     if (r < 0) {
-        fprintf(stderr, "%s: Couldn't nop node %s: %s\n", __func__, node_path,
-                fdt_strerror(r));
+        error_report("%s: Couldn't nop node %s: %s", __func__, node_path,
+                     fdt_strerror(r));
         exit(1);
     }
 
@@ -295,8 +295,8 @@ int qemu_fdt_add_subnode(void *fdt, const char *name)
 
     retval = fdt_add_subnode(fdt, parent, basename);
     if (retval < 0) {
-        fprintf(stderr, "FDT: Failed to create subnode %s: %s\n", name,
-                fdt_strerror(retval));
+        error_report("FDT: Failed to create subnode %s: %s", name,
+                     fdt_strerror(retval));
         exit(1);
     }
 
-- 
1.7.9.5

Re: [Qemu-devel] [PATCH v2 1/2] device_tree.c: redirect load_device_tree err message to stderr

[Li Liu]

Could this patchset apply to -trivial, thank you!

Best regards,
Li.

On 2014/8/26 14:38, john.liuli wrote:
> From: Li Liu <john.liuli@huawei.com>
> 
> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> Signed-off-by: Li Liu <john.liuli@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;
> 

Re: [Qemu-devel] [PATCH v2 1/2] device_tree.c: redirect load_device_tree err message to stderr

[Peter Crosthwaite]

Hi Li,

On Thu, Aug 28, 2014 at 9:37 PM, Li Liu <john.liuli@huawei.com> wrote:
> Could this patchset apply to -trivial, thank you!
>

Pings should generally only be sent after a week or so. My personal
rule is 7 calendar days from the original send before pinging.
Maintainers will often silently take short periods of time off-list
either for work or vacation.

Regards,
Peter

> Best regards,
> Li.
>
> On 2014/8/26 14:38, john.liuli wrote:
>> From: Li Liu <john.liuli@huawei.com>
>>
>> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
>> Signed-off-by: Li Liu <john.liuli@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;
>>
>
>

Re: [Qemu-devel] [Qemu-trivial] [PATCH v2 1/2] device_tree.c: redirect load_device_tree err message to stderr

[Michael Tokarev]

Applied both to -trivial tree, thank you!

/mjt