From: Daniel Henrique Barboza <danielhb413@gmail.com>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, clg@kaod.org,
jianchunfu <jianchunfu@cmss.chinamobile.com>,
Daniel Henrique Barboza <danielhb413@gmail.com>
Subject: [PATCH v3 1/4] target/ppc: add error report when fopen fails in kvmppc_read_int_dt()
Date: Thu, 7 Jul 2022 18:30:12 -0300 [thread overview]
Message-ID: <20220707213015.552104-2-danielhb413@gmail.com> (raw)
In-Reply-To: <20220707213015.552104-1-danielhb413@gmail.com>
From: jianchunfu <jianchunfu@cmss.chinamobile.com>
Use an Error pointer to report the error back to the caller.
While we're at it, return '0' instead of '-1' on error since the
function is supposed to return an uint64_t.
Signed-off-by: jianchunfu <jianchunfu@cmss.chinamobile.com>
[danielhb: return 0, use error_set_errno() instead of fprintf]
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
target/ppc/kvm.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 6eed466f80..65d136ed5a 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,7 +1907,8 @@ static uint64_t kvmppc_read_int_dt(const char *filename)
f = fopen(filename, "rb");
if (!f) {
- return -1;
+ error_setg_errno(errp, errno, "error opening %s", filename);
+ return 0;
}
len = fread(&u, 1, sizeof(u), f);
@@ -1938,7 +1939,7 @@ static uint64_t kvmppc_read_int_cpu_dt(const char *propname)
}
tmp = g_strdup_printf("%s/%s", buf, propname);
- val = kvmppc_read_int_dt(tmp);
+ val = kvmppc_read_int_dt(tmp, NULL);
g_free(tmp);
return val;
--
2.36.1
next prev parent reply other threads:[~2022-07-07 21:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-07 21:30 [PATCH v3 0/4] enhance error handling in kvmppc_read_int* Daniel Henrique Barboza
2022-07-07 21:30 ` Daniel Henrique Barboza [this message]
2022-07-07 21:30 ` [PATCH v3 2/4] target/ppc: enhance error report in kvmppc_read_int_cpu_dt() Daniel Henrique Barboza
2022-07-07 21:30 ` [PATCH v3 3/4] target/ppc: use g_autofree " Daniel Henrique Barboza
2022-07-07 21:30 ` [PATCH v3 4/4] target/ppc: exit(1) on failure in kvmppc_get_clockfreq() Daniel Henrique Barboza
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220707213015.552104-2-danielhb413@gmail.com \
--to=danielhb413@gmail.com \
--cc=clg@kaod.org \
--cc=jianchunfu@cmss.chinamobile.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.