[3/9] target/ppc: Add error reporting when opening file fails

Commit Message

Daniel Henrique Barboza June 30, 2022, 7:42 p.m. UTC

From: jianchunfu <[e-mail]>

Add error reporting before return when opening file fails in
kvmppc_read_int_dt().

Signed-off-by: jianchunfu <[e-mail]>
[danielhb: use error_setg() instead of fprintf]
Signed-off-by: Daniel Henrique Barboza <[e-mail]>
---
 target/ppc/kvm.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Cédric Le Goater July 2, 2022, 6:24 a.m. UTC | #1

On 6/30/22 21:42, Daniel Henrique Barboza wrote:
> From: jianchunfu <[e-mail]>
> 
> Add error reporting before return when opening file fails in
> kvmppc_read_int_dt().
> 
> Signed-off-by: jianchunfu <[e-mail]>
> [danielhb: use error_setg() instead of fprintf]
> Signed-off-by: Daniel Henrique Barboza <[e-mail]>


Reviewed-by: Cédric Le Goater <[e-mail]>

Thanks,

C.

> ---
>   target/ppc/kvm.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> index bc17437097..7611e9ccf6 100644
> --- a/target/ppc/kvm.c
> +++ b/target/ppc/kvm.c
> @@ -1896,7 +1896,7 @@ static int kvmppc_find_cpu_dt(char *buf, int buf_len)
>       return 0;
>   }
>   
> -static uint64_t kvmppc_read_int_dt(const char *filename)
> +static uint64_t kvmppc_read_int_dt(const char *filename, Error **errp)
>   {
>       union {
>           uint32_t v32;
> @@ -1907,6 +1907,7 @@ static uint64_t kvmppc_read_int_dt(const char *filename)
>   
>       f = fopen(filename, "rb");
>       if (!f) {
> +        error_setg(errp, "Error opening %s: %s", filename, strerror(errno));
>           return 0;
>       }
>   
> @@ -1940,7 +1941,7 @@ static uint64_t kvmppc_read_int_cpu_dt(const char *propname, Error **errp)
>       }
>   
>       tmp = g_strdup_printf("%s/%s", buf, propname);
> -    val = kvmppc_read_int_dt(tmp);
> +    val = kvmppc_read_int_dt(tmp, errp);
>       g_free(tmp);
>   
>       return val;

Patch

diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index bc17437097..7611e9ccf6 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -1896,7 +1896,7 @@  static int kvmppc_find_cpu_dt(char *buf, int buf_len)
     return 0;
 }
 
-static uint64_t kvmppc_read_int_dt(const char *filename)
+static uint64_t kvmppc_read_int_dt(const char *filename, Error **errp)
 {
     union {
         uint32_t v32;
@@ -1907,6 +1907,7 @@  static uint64_t kvmppc_read_int_dt(const char *filename)
 
     f = fopen(filename, "rb");
     if (!f) {
+        error_setg(errp, "Error opening %s: %s", filename, strerror(errno));
         return 0;
     }
 
@@ -1940,7 +1941,7 @@  static uint64_t kvmppc_read_int_cpu_dt(const char *propname, Error **errp)
     }
 
     tmp = g_strdup_printf("%s/%s", buf, propname);
-    val = kvmppc_read_int_dt(tmp);
+    val = kvmppc_read_int_dt(tmp, errp);
     g_free(tmp);
 
     return val;