Message ID | 20180308144845.0D7647456CD@zero.eik.bme.hu (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 03/08/2018 08:08 AM, BALATON Zoltan wrote: > Using log unimp is more appropriate for these messages and this also > silences them by default so they won't clobber make check output when > tests are added for this board. > > Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> > Reviewed-by: Thomas Huth <thuth@redhat.com> > --- > v2: Use defined format string for printing hwaddr instead of casting. Thanks. Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > I guess this does not invalidate the R-b tag of v1 so I've added that too. > > hw/ppc/ppc440_pcix.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/hw/ppc/ppc440_pcix.c b/hw/ppc/ppc440_pcix.c > index ab2626a..1dc5d7f 100644 > --- a/hw/ppc/ppc440_pcix.c > +++ b/hw/ppc/ppc440_pcix.c > @@ -286,8 +286,9 @@ static void ppc440_pcix_reg_write4(void *opaque, hwaddr addr, > break; > > default: > - error_report("%s: unhandled PCI internal register 0x%lx", __func__, > - (unsigned long)addr); > + qemu_log_mask(LOG_UNIMP, > + "%s: unhandled PCI internal register 0x%"HWADDR_PRIx"\n", > + __func__, addr); > break; > } > } > @@ -377,8 +378,9 @@ static uint64_t ppc440_pcix_reg_read4(void *opaque, hwaddr addr, > break; > > default: > - error_report("%s: invalid PCI internal register 0x%lx", __func__, > - (unsigned long)addr); > + qemu_log_mask(LOG_UNIMP, > + "%s: invalid PCI internal register 0x%" HWADDR_PRIx "\n", > + __func__, addr); > val = 0; > } > >
On Thu, Mar 08, 2018 at 12:08:08PM +0100, BALATON Zoltan wrote: > Using log unimp is more appropriate for these messages and this also > silences them by default so they won't clobber make check output when > tests are added for this board. > > Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> > Reviewed-by: Thomas Huth <thuth@redhat.com> Applied, thanks. > --- > v2: Use defined format string for printing hwaddr instead of casting. > I guess this does not invalidate the R-b tag of v1 so I've added that too. > > hw/ppc/ppc440_pcix.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/hw/ppc/ppc440_pcix.c b/hw/ppc/ppc440_pcix.c > index ab2626a..1dc5d7f 100644 > --- a/hw/ppc/ppc440_pcix.c > +++ b/hw/ppc/ppc440_pcix.c > @@ -286,8 +286,9 @@ static void ppc440_pcix_reg_write4(void *opaque, hwaddr addr, > break; > > default: > - error_report("%s: unhandled PCI internal register 0x%lx", __func__, > - (unsigned long)addr); > + qemu_log_mask(LOG_UNIMP, > + "%s: unhandled PCI internal register 0x%"HWADDR_PRIx"\n", > + __func__, addr); > break; > } > } > @@ -377,8 +378,9 @@ static uint64_t ppc440_pcix_reg_read4(void *opaque, hwaddr addr, > break; > > default: > - error_report("%s: invalid PCI internal register 0x%lx", __func__, > - (unsigned long)addr); > + qemu_log_mask(LOG_UNIMP, > + "%s: invalid PCI internal register 0x%" HWADDR_PRIx "\n", > + __func__, addr); > val = 0; > } >
On Fri, Mar 09, 2018 at 10:44:46AM +1100, David Gibson wrote: > On Thu, Mar 08, 2018 at 12:08:08PM +0100, BALATON Zoltan wrote: > > Using log unimp is more appropriate for these messages and this also > > silences them by default so they won't clobber make check output when > > tests are added for this board. > > > > Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> > > Reviewed-by: Thomas Huth <thuth@redhat.com> > > Applied, thanks. Wait.. I've taken it out again. Under some configurations (exercised by Travis) qemu_log_mask() is undeclared here you're using it. See https://travis-ci.org/dgibson/qemu/jobs/351093986 for some more information. > > > --- > > v2: Use defined format string for printing hwaddr instead of casting. > > I guess this does not invalidate the R-b tag of v1 so I've added that too. > > > > hw/ppc/ppc440_pcix.c | 10 ++++++---- > > 1 file changed, 6 insertions(+), 4 deletions(-) > > > > diff --git a/hw/ppc/ppc440_pcix.c b/hw/ppc/ppc440_pcix.c > > index ab2626a..1dc5d7f 100644 > > --- a/hw/ppc/ppc440_pcix.c > > +++ b/hw/ppc/ppc440_pcix.c > > @@ -286,8 +286,9 @@ static void ppc440_pcix_reg_write4(void *opaque, hwaddr addr, > > break; > > > > default: > > - error_report("%s: unhandled PCI internal register 0x%lx", __func__, > > - (unsigned long)addr); > > + qemu_log_mask(LOG_UNIMP, > > + "%s: unhandled PCI internal register 0x%"HWADDR_PRIx"\n", > > + __func__, addr); > > break; > > } > > } > > @@ -377,8 +378,9 @@ static uint64_t ppc440_pcix_reg_read4(void *opaque, hwaddr addr, > > break; > > > > default: > > - error_report("%s: invalid PCI internal register 0x%lx", __func__, > > - (unsigned long)addr); > > + qemu_log_mask(LOG_UNIMP, > > + "%s: invalid PCI internal register 0x%" HWADDR_PRIx "\n", > > + __func__, addr); > > val = 0; > > } > > >
On 9 March 2018 at 03:05, David Gibson <david@gibson.dropbear.id.au> wrote: > On Fri, Mar 09, 2018 at 10:44:46AM +1100, David Gibson wrote: >> On Thu, Mar 08, 2018 at 12:08:08PM +0100, BALATON Zoltan wrote: >> > Using log unimp is more appropriate for these messages and this also >> > silences them by default so they won't clobber make check output when >> > tests are added for this board. >> > >> > Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> >> > Reviewed-by: Thomas Huth <thuth@redhat.com> >> >> Applied, thanks. > > Wait.. I've taken it out again. Under some configurations (exercised > by Travis) qemu_log_mask() is undeclared here you're using it. See > https://travis-ci.org/dgibson/qemu/jobs/351093986 for some more > information. Ah, that one again. There's a patch in Stefan's tracing tree that makes that a fails-everywhere rather than only-some-configs, but he hasn't done the pullreq for 2.12 yet I think. You need a #include "qemu/log.h". thanks -- PMM
On Fri, 9 Mar 2018, Peter Maydell wrote: > On 9 March 2018 at 03:05, David Gibson <david@gibson.dropbear.id.au> wrote: >> On Fri, Mar 09, 2018 at 10:44:46AM +1100, David Gibson wrote: >>> On Thu, Mar 08, 2018 at 12:08:08PM +0100, BALATON Zoltan wrote: >>>> Using log unimp is more appropriate for these messages and this also >>>> silences them by default so they won't clobber make check output when >>>> tests are added for this board. >>>> >>>> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> >>>> Reviewed-by: Thomas Huth <thuth@redhat.com> >>> >>> Applied, thanks. >> >> Wait.. I've taken it out again. Under some configurations (exercised >> by Travis) qemu_log_mask() is undeclared here you're using it. See >> https://travis-ci.org/dgibson/qemu/jobs/351093986 for some more >> information. > > Ah, that one again. There's a patch in Stefan's tracing tree > that makes that a fails-everywhere rather than only-some-configs, > but he hasn't done the pullreq for 2.12 yet I think. > > You need a #include "qemu/log.h". OK, thanks. Should I send a v3 with this or can you patch up when applying v2? Regards, BALATON Zoltan
diff --git a/hw/ppc/ppc440_pcix.c b/hw/ppc/ppc440_pcix.c index ab2626a..1dc5d7f 100644 --- a/hw/ppc/ppc440_pcix.c +++ b/hw/ppc/ppc440_pcix.c @@ -286,8 +286,9 @@ static void ppc440_pcix_reg_write4(void *opaque, hwaddr addr, break; default: - error_report("%s: unhandled PCI internal register 0x%lx", __func__, - (unsigned long)addr); + qemu_log_mask(LOG_UNIMP, + "%s: unhandled PCI internal register 0x%"HWADDR_PRIx"\n", + __func__, addr); break; } } @@ -377,8 +378,9 @@ static uint64_t ppc440_pcix_reg_read4(void *opaque, hwaddr addr, break; default: - error_report("%s: invalid PCI internal register 0x%lx", __func__, - (unsigned long)addr); + qemu_log_mask(LOG_UNIMP, + "%s: invalid PCI internal register 0x%" HWADDR_PRIx "\n", + __func__, addr); val = 0; }