| Message ID | 20180622134036.23182-10-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/arm: use qemu_log_mask instead of fprintf | expand |
On 22.06.2018 15:40, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > include/hw/arm/omap.h | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h > index 39abba753d..3867687b8c 100644 > --- a/include/hw/arm/omap.h > +++ b/include/hw/arm/omap.h > @@ -21,6 +21,7 @@ > # define hw_omap_h "omap.h" > #include "hw/irq.h" > #include "target/arm/cpu-qom.h" > +#include "qemu/log.h" > > # define OMAP_EMIFS_BASE 0x00000000 > # define OMAP2_Q0_BASE 0x00000000 > @@ -962,8 +963,8 @@ void omap_mpu_wakeup(void *opaque, int irq, int req); > fprintf(stderr, "%s: Bad register " OMAP_FMT_plx "\n", \ > __func__, paddr) What about that fprintf above? > # define OMAP_RO_REG(paddr) \ > - fprintf(stderr, "%s: Read-only register " OMAP_FMT_plx "\n", \ > - __func__, paddr) > + qemu_log_mask(LOG_GUEST_ERROR, "%s: Read-only register " OMAP_FMT_plx \ > + "\n", __func__, paddr) > > /* OMAP-specific Linux bootloader tags for the ATAG_BOARD area > (Board-specifc tags are not here) */ > Thomas
On 06/22/2018 04:44 PM, Thomas Huth wrote: > On 22.06.2018 15:40, Philippe Mathieu-Daudé wrote: >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> --- >> include/hw/arm/omap.h | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h >> index 39abba753d..3867687b8c 100644 >> --- a/include/hw/arm/omap.h >> +++ b/include/hw/arm/omap.h >> @@ -21,6 +21,7 @@ >> # define hw_omap_h "omap.h" >> #include "hw/irq.h" >> #include "target/arm/cpu-qom.h" >> +#include "qemu/log.h" >> >> # define OMAP_EMIFS_BASE 0x00000000 >> # define OMAP2_Q0_BASE 0x00000000 >> @@ -962,8 +963,8 @@ void omap_mpu_wakeup(void *opaque, int irq, int req); >> fprintf(stderr, "%s: Bad register " OMAP_FMT_plx "\n", \ >> __func__, paddr) > > What about that fprintf above? Well there are still many fprintf() in the OMAP codebase. I didn't want to start a fprintf() cleanup, I just cherry-picked the patches I used to make sens of the current (ugly) output. With this series the console is 'usable'. > >> # define OMAP_RO_REG(paddr) \ >> - fprintf(stderr, "%s: Read-only register " OMAP_FMT_plx "\n", \ >> - __func__, paddr) >> + qemu_log_mask(LOG_GUEST_ERROR, "%s: Read-only register " OMAP_FMT_plx \ >> + "\n", __func__, paddr) >> >> /* OMAP-specific Linux bootloader tags for the ATAG_BOARD area >> (Board-specifc tags are not here) */ >> > > Thomas >
On 22.06.2018 22:13, Philippe Mathieu-Daudé wrote: > On 06/22/2018 04:44 PM, Thomas Huth wrote: >> On 22.06.2018 15:40, Philippe Mathieu-Daudé wrote: >>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >>> --- >>> include/hw/arm/omap.h | 5 +++-- >>> 1 file changed, 3 insertions(+), 2 deletions(-) >>> >>> diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h >>> index 39abba753d..3867687b8c 100644 >>> --- a/include/hw/arm/omap.h >>> +++ b/include/hw/arm/omap.h >>> @@ -21,6 +21,7 @@ >>> # define hw_omap_h "omap.h" >>> #include "hw/irq.h" >>> #include "target/arm/cpu-qom.h" >>> +#include "qemu/log.h" >>> >>> # define OMAP_EMIFS_BASE 0x00000000 >>> # define OMAP2_Q0_BASE 0x00000000 >>> @@ -962,8 +963,8 @@ void omap_mpu_wakeup(void *opaque, int irq, int req); >>> fprintf(stderr, "%s: Bad register " OMAP_FMT_plx "\n", \ >>> __func__, paddr) >> >> What about that fprintf above? > > Well there are still many fprintf() in the OMAP codebase. > > I didn't want to start a fprintf() cleanup, I just cherry-picked the > patches I used to make sens of the current (ugly) output. > > With this series the console is 'usable'. Ok, fair. But I guess you should mention this in the patch description. Thomas
diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index 39abba753d..3867687b8c 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -21,6 +21,7 @@ # define hw_omap_h "omap.h" #include "hw/irq.h" #include "target/arm/cpu-qom.h" +#include "qemu/log.h" # define OMAP_EMIFS_BASE 0x00000000 # define OMAP2_Q0_BASE 0x00000000 @@ -962,8 +963,8 @@ void omap_mpu_wakeup(void *opaque, int irq, int req); fprintf(stderr, "%s: Bad register " OMAP_FMT_plx "\n", \ __func__, paddr) # define OMAP_RO_REG(paddr) \ - fprintf(stderr, "%s: Read-only register " OMAP_FMT_plx "\n", \ - __func__, paddr) + qemu_log_mask(LOG_GUEST_ERROR, "%s: Read-only register " OMAP_FMT_plx \ + "\n", __func__, paddr) /* OMAP-specific Linux bootloader tags for the ATAG_BOARD area (Board-specifc tags are not here) */
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- include/hw/arm/omap.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)