[Qemu-devel] [PATCH] Xen: fix converity warning of xen_pt_config_init()

[Qemu-devel] [PATCH] Xen: fix converity warning of xen_pt_config_init()

[Cao jin]

emu_regs is a pointer, ARRAY_SIZE doesn't return what we expect.
Since the remaining message is enough for debugging, so just remove it.
Also tweaked the message a little.

Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
---
 hw/xen/xen_pt_config_init.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c
index 81c6721..e505438 100644
--- a/hw/xen/xen_pt_config_init.c
+++ b/hw/xen/xen_pt_config_init.c
@@ -2047,9 +2047,8 @@ void xen_pt_config_init(XenPCIPassthroughState *s, Error **errp)
                 for (j = 0; regs->size != 0; j++, regs++) {
                     xen_pt_config_reg_init(s, reg_grp_entry, regs, &err);
                     if (err) {
-                        error_append_hint(&err, "Failed to initialize %d/%zu"
-                                " reg 0x%x in grp_type = 0x%x (%d/%zu)",
-                                j, ARRAY_SIZE(xen_pt_emu_reg_grps[i].emu_regs),
+                        error_append_hint(&err, "Failed to init register %d"
+                                " offsets 0x%x in grp_type = 0x%x (%d/%zu)", j,
                                 regs->offset, xen_pt_emu_reg_grps[i].grp_type,
                                 i, ARRAY_SIZE(xen_pt_emu_reg_grps));
                         error_propagate(errp, err);
-- 
2.1.0

Re: [Qemu-devel] [PATCH] Xen: fix converity warning of xen_pt_config_init()

[Peter Maydell]

Hi Stefano -- just a ping on this patch from January -- I have a feeling
it maybe got lost in your change of email address?

(I noticed looking through coverity reports that this one was unfixed
and found Cao Jin's patch in the list archive.)

thanks
-- PMM


On 25 January 2016 at 12:16, Cao jin <caoj.fnst@cn.fujitsu.com> wrote:
> emu_regs is a pointer, ARRAY_SIZE doesn't return what we expect.
> Since the remaining message is enough for debugging, so just remove it.
> Also tweaked the message a little.
>
> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
> ---
>  hw/xen/xen_pt_config_init.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c
> index 81c6721..e505438 100644
> --- a/hw/xen/xen_pt_config_init.c
> +++ b/hw/xen/xen_pt_config_init.c
> @@ -2047,9 +2047,8 @@ void xen_pt_config_init(XenPCIPassthroughState *s, Error **errp)
>                  for (j = 0; regs->size != 0; j++, regs++) {
>                      xen_pt_config_reg_init(s, reg_grp_entry, regs, &err);
>                      if (err) {
> -                        error_append_hint(&err, "Failed to initialize %d/%zu"
> -                                " reg 0x%x in grp_type = 0x%x (%d/%zu)",
> -                                j, ARRAY_SIZE(xen_pt_emu_reg_grps[i].emu_regs),
> +                        error_append_hint(&err, "Failed to init register %d"
> +                                " offsets 0x%x in grp_type = 0x%x (%d/%zu)", j,
>                                  regs->offset, xen_pt_emu_reg_grps[i].grp_type,
>                                  i, ARRAY_SIZE(xen_pt_emu_reg_grps));
>                          error_propagate(errp, err);
> --
> 2.1.0

Re: [Qemu-devel] [PATCH] Xen: fix converity warning of xen_pt_config_init()

[Stefano Stabellini]

Well spotted, thanks Peter!

It looks OK and has passed my tests, I'll send it in the next pull
request.

On Thu, 11 Aug 2016, Peter Maydell wrote:
> Hi Stefano -- just a ping on this patch from January -- I have a feeling
> it maybe got lost in your change of email address?
> 
> (I noticed looking through coverity reports that this one was unfixed
> and found Cao Jin's patch in the list archive.)
> 
> thanks
> -- PMM
> 
> 
> On 25 January 2016 at 12:16, Cao jin <caoj.fnst@cn.fujitsu.com> wrote:
> > emu_regs is a pointer, ARRAY_SIZE doesn't return what we expect.
> > Since the remaining message is enough for debugging, so just remove it.
> > Also tweaked the message a little.
> >
> > Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
> > ---
> >  hw/xen/xen_pt_config_init.c | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c
> > index 81c6721..e505438 100644
> > --- a/hw/xen/xen_pt_config_init.c
> > +++ b/hw/xen/xen_pt_config_init.c
> > @@ -2047,9 +2047,8 @@ void xen_pt_config_init(XenPCIPassthroughState *s, Error **errp)
> >                  for (j = 0; regs->size != 0; j++, regs++) {
> >                      xen_pt_config_reg_init(s, reg_grp_entry, regs, &err);
> >                      if (err) {
> > -                        error_append_hint(&err, "Failed to initialize %d/%zu"
> > -                                " reg 0x%x in grp_type = 0x%x (%d/%zu)",
> > -                                j, ARRAY_SIZE(xen_pt_emu_reg_grps[i].emu_regs),
> > +                        error_append_hint(&err, "Failed to init register %d"
> > +                                " offsets 0x%x in grp_type = 0x%x (%d/%zu)", j,
> >                                  regs->offset, xen_pt_emu_reg_grps[i].grp_type,
> >                                  i, ARRAY_SIZE(xen_pt_emu_reg_grps));
> >                          error_propagate(errp, err);
> > --
> > 2.1.0
>