Message ID | 20180624040609.17572-10-f4bug@amsat.org |
---|---|
State | New |
Headers | show |
Series | hw/arm: use qemu_log_mask instead of fprintf | expand |
On 24.06.2018 06:06, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > include/hw/arm/omap.h | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h > index 39abba753d..e7fbd340f3 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 > @@ -944,8 +945,6 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem, > unsigned long sdram_size, > const char *core); > > -#define OMAP_FMT_plx "%#08" HWADDR_PRIx > - > uint32_t omap_badwidth_read8(void *opaque, hwaddr addr); > void omap_badwidth_write8(void *opaque, hwaddr addr, > uint32_t value); > @@ -959,11 +958,12 @@ void omap_badwidth_write32(void *opaque, hwaddr addr, > void omap_mpu_wakeup(void *opaque, int irq, int req); > > # define OMAP_BAD_REG(paddr) \ > - fprintf(stderr, "%s: Bad register " OMAP_FMT_plx "\n", \ > - __func__, paddr) > + qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad register %#08"HWADDR_PRIx"\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 %#08" \ > + HWADDR_PRIx "\n", \ > + __func__, paddr) > > /* OMAP-specific Linux bootloader tags for the ATAG_BOARD area > (Board-specifc tags are not here) */ > Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index 39abba753d..e7fbd340f3 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 @@ -944,8 +945,6 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem, unsigned long sdram_size, const char *core); -#define OMAP_FMT_plx "%#08" HWADDR_PRIx - uint32_t omap_badwidth_read8(void *opaque, hwaddr addr); void omap_badwidth_write8(void *opaque, hwaddr addr, uint32_t value); @@ -959,11 +958,12 @@ void omap_badwidth_write32(void *opaque, hwaddr addr, void omap_mpu_wakeup(void *opaque, int irq, int req); # define OMAP_BAD_REG(paddr) \ - fprintf(stderr, "%s: Bad register " OMAP_FMT_plx "\n", \ - __func__, paddr) + qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad register %#08"HWADDR_PRIx"\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 %#08" \ + HWADDR_PRIx "\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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)