From 614c371bcc2dfa00a5ca6f7f6076006f86dcaa25 Mon Sep 17 00:00:00 2001 From: jianchunfu Date: Mon, 1 Aug 2022 01:23:12 +0000 Subject: [PATCH 1/5] [PATCH 1/5]target/ppc/kvm.c: do not return -1 on uint64_t return --- target/ppc/kvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index dc93b99189..87f4d95a1f 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -1906,7 +1906,7 @@ static uint64_t kvmppc_read_int_dt(const char *filename) f = fopen(filename, "rb"); if (!f) { - return -1; + return 0; } len = fread(&u, 1, sizeof(u), f); @@ -1933,7 +1933,7 @@ static uint64_t kvmppc_read_int_cpu_dt(const char *propname) uint64_t val; if (kvmppc_find_cpu_dt(buf, sizeof(buf))) { - return -1; + return 0; } tmp = g_strdup_printf("%s/%s", buf, propname); -- Gitee From c0225fd4eef1437c25a7ec10572600b091bc8c0d Mon Sep 17 00:00:00 2001 From: jianchunfu Date: Mon, 1 Aug 2022 01:29:56 +0000 Subject: [PATCH 2/5] [PATCH 2/5] target/ppc: add errp to kvmppc_read_int_cpu_dt() --- target/ppc/kvm.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 87f4d95a1f..db8c3ca0d5 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -1924,15 +1924,17 @@ static uint64_t kvmppc_read_int_dt(const char *filename) /* * Read a CPU node property from the host device tree that's a single - * integer (32-bit or 64-bit). Returns 0 if anything goes wrong - * (can't find or open the property, or doesn't understand the format) + * integer (32-bit or 64-bit). Returns 0 and set errp if anything goes + * wrong (can't find or open the property, or doesn't understand the + * format) */ -static uint64_t kvmppc_read_int_cpu_dt(const char *propname) +static uint64_t kvmppc_read_int_cpu_dt(const char *propname, Error **errp) { char buf[PATH_MAX], *tmp; uint64_t val; if (kvmppc_find_cpu_dt(buf, sizeof(buf))) { + error_setg(errp, "Failed to read CPU property %s", propname); return 0; } @@ -1945,12 +1947,12 @@ static uint64_t kvmppc_read_int_cpu_dt(const char *propname) uint64_t kvmppc_get_clockfreq(void) { - return kvmppc_read_int_cpu_dt("clock-frequency"); + return kvmppc_read_int_cpu_dt("clock-frequency", NULL); } static int kvmppc_get_dec_bits(void) { - int nr_bits = kvmppc_read_int_cpu_dt("ibm,dec-bits"); + int nr_bits = kvmppc_read_int_cpu_dt("ibm,dec-bits", NULL); if (nr_bits > 0) { return nr_bits; @@ -2335,8 +2337,8 @@ static void alter_insns(uint64_t *word, uint64_t flags, bool on) static void kvmppc_host_cpu_class_init(ObjectClass *oc, void *data) { PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc); - uint32_t dcache_size = kvmppc_read_int_cpu_dt("d-cache-size"); - uint32_t icache_size = kvmppc_read_int_cpu_dt("i-cache-size"); + uint32_t dcache_size = kvmppc_read_int_cpu_dt("d-cache-size", NULL); + uint32_t icache_size = kvmppc_read_int_cpu_dt("i-cache-size", NULL); /* Now fix up the class with information we can query from the host */ pcc->pvr = mfpvr(); -- Gitee From b8fda105d4f0719feb02e5d9b2151214ef3b77e7 Mon Sep 17 00:00:00 2001 From: jianchunfu Date: Mon, 1 Aug 2022 01:36:03 +0000 Subject: [PATCH 3/5] [PATCH 3/5] target/ppc: Add error reporting when opening file fails --- 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 db8c3ca0d5..769541b7d8 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -1895,7 +1895,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; @@ -1906,6 +1906,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; } @@ -1939,7 +1940,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; -- Gitee From 842b4a2a7c8531cfb36a9cba1ba4ab078956b329 Mon Sep 17 00:00:00 2001 From: jianchunfu Date: Mon, 1 Aug 2022 01:39:16 +0000 Subject: [PATCH 4/5] [PATCH 4/5] target/ppc: use g_autofree in kvmppc_read_int_cpu_dt() --- target/ppc/kvm.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 769541b7d8..4b1bcddf23 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -1931,8 +1931,8 @@ static uint64_t kvmppc_read_int_dt(const char *filename, Error **errp) */ static uint64_t kvmppc_read_int_cpu_dt(const char *propname, Error **errp) { - char buf[PATH_MAX], *tmp; - uint64_t val; + g_autofree char *tmp = NULL; + char buf[PATH_MAX]; if (kvmppc_find_cpu_dt(buf, sizeof(buf))) { error_setg(errp, "Failed to read CPU property %s", propname); @@ -1940,10 +1940,8 @@ 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, errp); - g_free(tmp); - return val; + return kvmppc_read_int_dt(tmp, errp); } uint64_t kvmppc_get_clockfreq(void) -- Gitee From c2b2aa2441a3654b68ee56a319fe7d2145761836 Mon Sep 17 00:00:00 2001 From: jianchunfu Date: Mon, 1 Aug 2022 01:42:53 +0000 Subject: [PATCH 5/5] [PATCH 5/5] target/ppc: exit(1) on failure in kvmppc_get_clockfreq() --- target/ppc/kvm.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 4b1bcddf23..2ab6bf156a 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -1944,9 +1944,24 @@ static uint64_t kvmppc_read_int_cpu_dt(const char *propname, Error **errp) return kvmppc_read_int_dt(tmp, errp); } +/* + * Read the clock-frequency from the DT. On error (e.g. + * 'clock-frequency' is not present in the DT) will + * report an error and exit(1). + */ uint64_t kvmppc_get_clockfreq(void) { - return kvmppc_read_int_cpu_dt("clock-frequency", NULL); + Error *local_err = NULL; + int ret; + + ret = kvmppc_read_int_cpu_dt("clock-frequency", &local_err); + + if (local_err) { + error_report_err(local_err); + exit(1); + } + + return ret; } static int kvmppc_get_dec_bits(void) -- Gitee