[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-arm] [Qemu-devel] [PATCH v2 4/4] target/arm/kvm: pmu: improve
From: |
Andrew Jones |
Subject: |
Re: [Qemu-arm] [Qemu-devel] [PATCH v2 4/4] target/arm/kvm: pmu: improve error handling |
Date: |
Tue, 5 Sep 2017 16:44:49 +0200 |
User-agent: |
Mutt/1.6.0.1 (2016-04-01) |
On Mon, Sep 04, 2017 at 03:17:21PM +0100, Peter Maydell wrote:
> On 19 July 2017 at 14:39, Andrew Jones <address@hidden> wrote:
> > If a KVM PMU init or set-irq attr call fails we just silently stop
> > the PMU DT node generation. The only way they could fail, though,
> > is if the attr's respective KVM has-attr call fails. But that should
> > never happen if KVM advertises the PMU capability, because both
> > attrs have been available since the capability was introduced. Let's
> > just abort if this should-never-happen stuff does happen, because,
> > if it does, then something is obviously horribly wrong.
> >
> > Signed-off-by: Andrew Jones <address@hidden>
> > ---
> > hw/arm/virt.c | 9 +++------
> > target/arm/kvm32.c | 3 +--
> > target/arm/kvm64.c | 28 ++++++++++++++++++++--------
> > target/arm/kvm_arm.h | 15 ++++-----------
> > 4 files changed, 28 insertions(+), 27 deletions(-)
>
> This breaks compile on 32-bit ARM:
>
> /home/peter.maydell/qemu/target/arm/kvm32.c:530:5: error: conflicting
> types for 'kvm_arm_pmu_init'
> int kvm_arm_pmu_init(CPUState *cs)
> ^
> In file included from /home/peter.maydell/qemu/target/arm/kvm32.c:21:0:
> /home/peter.maydell/qemu/target/arm/kvm_arm.h:199:6: note: previous
> declaration of 'kvm_arm_pmu_init' w
> as here
> void kvm_arm_pmu_init(CPUState *cs);
> ^
Argh. Sorry about that. I could have sworn I compile-tested for 32-bit
ARM. Maybe I changed the series afterwards and forgot to compile-test
again...
>
> Looks like you forgot to update the 32-bit version of the function
> to the new API; I'll just fix up the patch in my queue.
Thanks!
drew