Re: [PATCH v4 6/6] hw/arm/virt: Implement kvm-steal-time

[Andrew Jones]

Hi Peter,

Thanks for fixing this up and applying!

drew

On Thu, Oct 08, 2020 at 09:39:59PM +0100, Peter Maydell wrote:
> On Thu, 1 Oct 2020 at 07:17, Andrew Jones <drjones@redhat.com> wrote:
> >
> > We add the kvm-steal-time CPU property and implement it for machvirt.
> > A tiny bit of refactoring was also done to allow pmu and pvtime to
> > use the same vcpu device helper functions.
> 
> > +            if (pvtime_size > pvtime_reg_size) {
> > +                error_report("pvtime requires a %ld byte memory region for 
> > "
> > +                             "%d CPUs, but only %ld has been reserved",
> > +                             pvtime_size, max_cpus, pvtime_reg_size);
> > +                exit(1);
> > +            }
> 
> This turns out not to compile on Windows:
> 
> ../../hw/arm/virt.c:1693:30: error: format '%ld' expects argument of
> type 'long int', but argument 2 has type 'hwaddr {aka long long
> unsigned int}' [-Werror=format=]
>                  error_report("pvtime requires a %ld byte memory region for "
>                               ^
> 
> I'm going to squash this fix into the pullreq:
> 
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -1690,8 +1690,9 @@ static void virt_cpu_post_init(VirtMachineState
> *vms, int max_cpus,
>              pvtime_size = REAL_HOST_PAGE_ALIGN(pvtime_size);
> 
>              if (pvtime_size > pvtime_reg_size) {
> -                error_report("pvtime requires a %ld byte memory region for "
> -                             "%d CPUs, but only %ld has been reserved",
> +                error_report("pvtime requires a %" HWADDR_PRId
> +                             " byte memory region for %d CPUs,"
> +                             " but only %" HWADDR_PRId " has been reserved",
>                               pvtime_size, max_cpus, pvtime_reg_size);
>                  exit(1);
>              }
> 
> thanks
> -- PMM
>