On 2016/6/6 23:59, Peter Maydell wrote: > On 26 April 2016 at 12:40, Shannon Zhao <zhaoshengl...@huawei.com> wrote: >> > From: Shannon Zhao <shannon.z...@linaro.org> >> > >> > Add a virtual PMU device for virt machine while use PPI 7 for PMU >> > overflow interrupt number. >> > >> > Signed-off-by: Shannon Zhao <shannon.z...@linaro.org> >> > diff --git a/stubs/kvm.c b/stubs/kvm.c >> > index ddd6204..667e269 100644 >> > --- a/stubs/kvm.c >> > +++ b/stubs/kvm.c >> > @@ -6,3 +6,8 @@ int kvm_arch_irqchip_create(MachineState *ms, KVMState *s) >> > { >> > return 0; >> > } >> > + >> > +int kvm_arm_pmu_create(CPUState *cs, int irq) >> > +{ >> > + return 0; >> > +} > Hi. I'm afraid this breaks compilation on 32-bit ARM hosts: > for 32-bit ARM we don't have a real kvm_arm_pmu_create() so we > end up pulling in the stubs/kvm.o object file from the stub > library. Unfortunately that then means we have two versions of > kvm_arch_irqchip_create() and the linker refuses to link. > Oops, I'll fix this and resend.
-- Shannon