On Tue, 8 Sep 2020 at 18:56, Andrew Jones <drjo...@redhat.com> wrote:
>
> On Tue, Sep 08, 2020 at 08:13:23AM +0000, Haibo Xu wrote:
> > From: Andrew Jones <drjo...@redhat.com>
> >
> > Rename kvm_arm_pmu_set_attr() to kvm_arm_set_device_attr(),
> > So both the vPMU and vSPE device can share the same API.
> >
> > Signed-off-by: Andrew Jones <drjo...@redhat.com>
>
> Looks like a faithful port of what I posted as a hunk of another patch, so
> I'll accept the authorship. Please also add you s-b though.
>
> Thanks,
> drew
>
Ok, will fix it in v3.
Thanks,
Haibo
> > ---
> > target/arm/kvm64.c | 11 ++++++-----
> > 1 file changed, 6 insertions(+), 5 deletions(-)
> >
> > diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
> > index ef1e960285..8ffd31ffdf 100644
> > --- a/target/arm/kvm64.c
> > +++ b/target/arm/kvm64.c
> > @@ -397,19 +397,20 @@ static CPUWatchpoint *find_hw_watchpoint(CPUState
> > *cpu, target_ulong addr)
> > return NULL;
> > }
> >
> > -static bool kvm_arm_pmu_set_attr(CPUState *cs, struct kvm_device_attr
> > *attr)
> > +static bool kvm_arm_set_device_attr(CPUState *cs, struct kvm_device_attr
> > *attr,
> > + const char *name)
> > {
> > int err;
> >
> > err = kvm_vcpu_ioctl(cs, KVM_HAS_DEVICE_ATTR, attr);
> > if (err != 0) {
> > - error_report("PMU: KVM_HAS_DEVICE_ATTR: %s", strerror(-err));
> > + error_report("%s: KVM_HAS_DEVICE_ATTR: %s", name, strerror(-err));
> > return false;
> > }
> >
> > err = kvm_vcpu_ioctl(cs, KVM_SET_DEVICE_ATTR, attr);
> > if (err != 0) {
> > - error_report("PMU: KVM_SET_DEVICE_ATTR: %s", strerror(-err));
> > + error_report("%s: KVM_SET_DEVICE_ATTR: %s", name, strerror(-err));
> > return false;
> > }
> >
> > @@ -426,7 +427,7 @@ void kvm_arm_pmu_init(CPUState *cs)
> > if (!ARM_CPU(cs)->has_pmu) {
> > return;
> > }
> > - if (!kvm_arm_pmu_set_attr(cs, &attr)) {
> > + if (!kvm_arm_set_device_attr(cs, &attr, "PMU")) {
> > error_report("failed to init PMU");
> > abort();
> > }
> > @@ -443,7 +444,7 @@ void kvm_arm_pmu_set_irq(CPUState *cs, int irq)
> > if (!ARM_CPU(cs)->has_pmu) {
> > return;
> > }
> > - if (!kvm_arm_pmu_set_attr(cs, &attr)) {
> > + if (!kvm_arm_set_device_attr(cs, &attr, "PMU")) {
> > error_report("failed to set irq for PMU");
> > abort();
> > }
> > --
> > 2.17.1
> >
> >
>
