qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Henrique Barboza <danielhb413@gmail.com>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, clg@kaod.org,
	Daniel Henrique Barboza <danielhb413@gmail.com>
Subject: [PATCH 5/9] target/ppc: use Error pointer in kvmppc_get_clockfreq()
Date: Thu, 30 Jun 2022 16:42:45 -0300	[thread overview]
Message-ID: <20220630194249.886747-6-danielhb413@gmail.com> (raw)
In-Reply-To: <20220630194249.886747-1-danielhb413@gmail.com>

Callers will then be able to handle any errors that might happen when
reading the clock frequency.

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
 hw/ppc/e500.c          | 2 +-
 hw/ppc/ppc440_bamboo.c | 2 +-
 hw/ppc/sam460ex.c      | 2 +-
 hw/ppc/spapr.c         | 2 +-
 target/ppc/kvm.c       | 4 ++--
 target/ppc/kvm_ppc.h   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 7f7f5b3452..4b4e99ef3c 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -405,7 +405,7 @@ static int ppce500_load_device_tree(PPCE500MachineState *pms,
 
     if (kvm_enabled()) {
         /* Read out host's frequencies */
-        clock_freq = kvmppc_get_clockfreq();
+        clock_freq = kvmppc_get_clockfreq(NULL);
         tb_freq = kvmppc_get_tbfreq();
 
         /* indicate KVM hypercall interface */
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index d5973f2484..d23f881d9d 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -107,7 +107,7 @@ static int bamboo_load_device_tree(hwaddr addr,
      * the correct frequencies. */
     if (kvm_enabled()) {
         tb_freq = kvmppc_get_tbfreq();
-        clock_freq = kvmppc_get_clockfreq();
+        clock_freq = kvmppc_get_clockfreq(NULL);
     }
 
     qemu_fdt_setprop_cell(fdt, "/cpus/cpu@0", "clock-frequency",
diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index 2f24598f55..4d25cb2c2e 100644
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -179,7 +179,7 @@ static int sam460ex_load_device_tree(hwaddr addr,
      * the correct frequencies. */
     if (kvm_enabled()) {
         tb_freq = kvmppc_get_tbfreq();
-        clock_freq = kvmppc_get_clockfreq();
+        clock_freq = kvmppc_get_clockfreq(NULL);
     }
 
     qemu_fdt_setprop_cell(fdt, "/cpus/cpu@0", "clock-frequency",
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index fd4942e881..f66e3cbe38 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -654,7 +654,7 @@ static void spapr_dt_cpu(CPUState *cs, void *fdt, int offset,
                        0xffffffff, 0xffffffff};
     uint32_t tbfreq = kvm_enabled() ? kvmppc_get_tbfreq()
         : SPAPR_TIMEBASE_FREQ;
-    uint32_t cpufreq = kvm_enabled() ? kvmppc_get_clockfreq() : 1000000000;
+    uint32_t cpufreq = kvm_enabled() ? kvmppc_get_clockfreq(NULL) : 1000000000;
     uint32_t page_sizes_prop[64];
     size_t page_sizes_prop_size;
     unsigned int smp_threads = ms->smp.threads;
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index c218380eb7..2accd1f946 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -1945,9 +1945,9 @@ static uint64_t kvmppc_read_int_cpu_dt(const char *propname, Error **errp)
     return kvmppc_read_int_dt(tmp, errp);
 }
 
-uint64_t kvmppc_get_clockfreq(void)
+uint64_t kvmppc_get_clockfreq(Error **errp)
 {
-    return kvmppc_read_int_cpu_dt("clock-frequency", NULL);
+    return kvmppc_read_int_cpu_dt("clock-frequency", errp);
 }
 
 static int kvmppc_get_dec_bits(void)
diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h
index ee9325bf9a..b05aedb9f8 100644
--- a/target/ppc/kvm_ppc.h
+++ b/target/ppc/kvm_ppc.h
@@ -14,7 +14,7 @@
 #ifdef CONFIG_KVM
 
 uint32_t kvmppc_get_tbfreq(void);
-uint64_t kvmppc_get_clockfreq(void);
+uint64_t kvmppc_get_clockfreq(Error **errp);
 bool kvmppc_get_host_model(char **buf);
 bool kvmppc_get_host_serial(char **buf);
 int kvmppc_get_hasidle(CPUPPCState *env);
-- 
2.36.1



  parent reply	other threads:[~2022-06-30 20:05 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-30 19:42 [PATCH 0/9] cleanup error handling in kvmppc_read_int_cpu_dt() Daniel Henrique Barboza
2022-06-30 19:42 ` [PATCH 1/9] target/ppc/kvm.c: do not return -1 on uint64_t return Daniel Henrique Barboza
2022-06-30 19:42 ` [PATCH 2/9] target/ppc: add errp to kvmppc_read_int_cpu_dt() Daniel Henrique Barboza
2022-07-02  6:24   ` Cédric Le Goater
2022-07-02 13:34     ` Daniel Henrique Barboza
2022-07-04 17:34       ` Cédric Le Goater
2022-07-04 23:19         ` Daniel Henrique Barboza
2022-07-05  6:51         ` Mark Cave-Ayland
2022-07-05  6:57           ` Cédric Le Goater
2022-07-06  7:45             ` Cédric Le Goater
2022-07-11  7:37               ` Mark Cave-Ayland
2022-07-11  7:42                 ` Cédric Le Goater
2022-07-12 12:11                   ` Mark Cave-Ayland
2022-07-12 14:54                     ` BALATON Zoltan
2022-07-13 20:30                       ` Mark Cave-Ayland
2022-07-11 12:05                 ` BALATON Zoltan
2022-07-05  9:39           ` Daniel Henrique Barboza
2022-07-05  9:44             ` Mark Cave-Ayland
2022-07-05  9:51               ` Daniel Henrique Barboza
2022-07-05  9:44             ` Cédric Le Goater
2022-06-30 19:42 ` [PATCH 3/9] target/ppc: Add error reporting when opening file fails Daniel Henrique Barboza
2022-07-02  6:24   ` Cédric Le Goater
2022-06-30 19:42 ` [PATCH 4/9] target/ppc: use g_autofree in kvmppc_read_int_cpu_dt() Daniel Henrique Barboza
2022-07-02  6:20   ` Cédric Le Goater
2022-07-06 17:10     ` Daniel Henrique Barboza
2022-06-30 19:42 ` Daniel Henrique Barboza [this message]
2022-07-02  6:22   ` [PATCH 5/9] target/ppc: use Error pointer in kvmppc_get_clockfreq() Cédric Le Goater
2022-06-30 19:42 ` [PATCH 6/9] ppc440_bamboo.c: handle clock freq read error in load_device_tree Daniel Henrique Barboza
2022-07-02  6:23   ` Cédric Le Goater
2022-06-30 19:42 ` [PATCH 7/9] sam460ex.c: use CPU_FREQ if unable to read DT clock Daniel Henrique Barboza
2022-06-30 19:42 ` [PATCH 8/9] e500.c: use PLATFORM_CLK_FREQ_HZ if unable to read clock freq from DT Daniel Henrique Barboza
2022-06-30 19:42 ` [PATCH 9/9] spapr.c: handle clock freq read errors in spapr_dt_cpu() 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=20220630194249.886747-6-danielhb413@gmail.com \
    --to=danielhb413@gmail.com \
    --cc=clg@kaod.org \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).