Re: [PATCH 5/9] target/ppc: use Error pointer in kvmppc_get_clockfreq()

[Cédric Le Goater]

On 6/30/22 21:42, Daniel Henrique Barboza wrote:
> 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);

Can't we use error_fatal instead of NULL ?

Thanks,

C.
>           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);