[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-arm] [PATCH v2 08/14] hw/arm/omap1: Use qemu_log_mask(GUEST_ER
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-arm] [PATCH v2 08/14] hw/arm/omap1: Use qemu_log_mask(GUEST_ERROR) instead of fprintf |
Date: |
Fri, 22 Jun 2018 10:48:17 -0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 |
On 06/22/2018 10:40 AM, Philippe Mathieu-Daudé wrote:
> TCMI_VERBOSE is no more used, drop the OMAP_8/16/32B_REG macros.
>
Oh and eventually:
Suggested-by: Thomas Huth <address@hidden>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
> ---
> include/hw/arm/omap.h | 18 ------------------
> hw/arm/omap1.c | 18 ++++++++++++------
> 2 files changed, 12 insertions(+), 24 deletions(-)
>
> diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h
> index b398607b06..39abba753d 100644
> --- a/include/hw/arm/omap.h
> +++ b/include/hw/arm/omap.h
> @@ -993,24 +993,6 @@ enum {
> #define OMAP_GPIOSW_INVERTED 0x0001
> #define OMAP_GPIOSW_OUTPUT 0x0002
>
> -# define TCMI_VERBOSE 1
> -
> -# ifdef TCMI_VERBOSE
> -# define OMAP_8B_REG(paddr) \
> - fprintf(stderr, "%s: 8-bit register " OMAP_FMT_plx "\n", \
> - __func__, paddr)
> -# define OMAP_16B_REG(paddr) \
> - fprintf(stderr, "%s: 16-bit register " OMAP_FMT_plx "\n", \
> - __func__, paddr)
> -# define OMAP_32B_REG(paddr) \
> - fprintf(stderr, "%s: 32-bit register " OMAP_FMT_plx "\n", \
> - __func__, paddr)
> -# else
> -# define OMAP_8B_REG(paddr)
> -# define OMAP_16B_REG(paddr)
> -# define OMAP_32B_REG(paddr)
> -# endif
> -
> # define OMAP_MPUI_REG_MASK 0x000007ff
>
> #endif /* hw_omap_h */
> diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
> index 9af04728e3..539d29ef9c 100644
> --- a/hw/arm/omap1.c
> +++ b/hw/arm/omap1.c
> @@ -34,12 +34,18 @@
> #include "qemu/cutils.h"
> #include "qemu/bcd.h"
>
> +static inline void omap_log_badwidth(const char *funcname, hwaddr addr, int
> sz)
> +{
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: %d-bit register %#08" HWADDR_PRIx
> "\n",
> + funcname, sz << 2, addr);
> +}
> +
> /* Should signal the TCMI/GPMC */
> uint32_t omap_badwidth_read8(void *opaque, hwaddr addr)
> {
> uint8_t ret;
>
> - OMAP_8B_REG(addr);
> + omap_log_badwidth(__func__, addr, 1);
> cpu_physical_memory_read(addr, &ret, 1);
> return ret;
> }
> @@ -49,7 +55,7 @@ void omap_badwidth_write8(void *opaque, hwaddr addr,
> {
> uint8_t val8 = value;
>
> - OMAP_8B_REG(addr);
> + omap_log_badwidth(__func__, addr, 1);
> cpu_physical_memory_write(addr, &val8, 1);
> }
>
> @@ -57,7 +63,7 @@ uint32_t omap_badwidth_read16(void *opaque, hwaddr addr)
> {
> uint16_t ret;
>
> - OMAP_16B_REG(addr);
> + omap_log_badwidth(__func__, addr, 2);
> cpu_physical_memory_read(addr, &ret, 2);
> return ret;
> }
> @@ -67,7 +73,7 @@ void omap_badwidth_write16(void *opaque, hwaddr addr,
> {
> uint16_t val16 = value;
>
> - OMAP_16B_REG(addr);
> + omap_log_badwidth(__func__, addr, 2);
> cpu_physical_memory_write(addr, &val16, 2);
> }
>
> @@ -75,7 +81,7 @@ uint32_t omap_badwidth_read32(void *opaque, hwaddr addr)
> {
> uint32_t ret;
>
> - OMAP_32B_REG(addr);
> + omap_log_badwidth(__func__, addr, 4);
> cpu_physical_memory_read(addr, &ret, 4);
> return ret;
> }
> @@ -83,7 +89,7 @@ uint32_t omap_badwidth_read32(void *opaque, hwaddr addr)
> void omap_badwidth_write32(void *opaque, hwaddr addr,
> uint32_t value)
> {
> - OMAP_32B_REG(addr);
> + omap_log_badwidth(__func__, addr, 4);
> cpu_physical_memory_write(addr, &value, 4);
> }
>
>
- [Qemu-arm] [PATCH v2 06/14] hw/sd/omap_mmc: Use qemu_log_mask(UNIMP) instead of printf, (continued)
- [Qemu-arm] [PATCH v2 06/14] hw/sd/omap_mmc: Use qemu_log_mask(UNIMP) instead of printf, Philippe Mathieu-Daudé, 2018/06/22
- [Qemu-arm] [PATCH v2 07/14] hw/i2c/omap_i2c: Use qemu_log_mask(UNIMP) instead of fprintf, Philippe Mathieu-Daudé, 2018/06/22
- Re: [Qemu-arm] [PATCH v2 07/14] hw/i2c/omap_i2c: Use qemu_log_mask(UNIMP) instead of fprintf, Thomas Huth, 2018/06/22
- Re: [Qemu-arm] [PATCH v2 07/14] hw/i2c/omap_i2c: Use qemu_log_mask(UNIMP) instead of fprintf, Philippe Mathieu-Daudé, 2018/06/22
- Re: [Qemu-arm] [PATCH v2 07/14] hw/i2c/omap_i2c: Use qemu_log_mask(UNIMP) instead of fprintf, Thomas Huth, 2018/06/25
- Re: [Qemu-arm] [PATCH v2 07/14] hw/i2c/omap_i2c: Use qemu_log_mask(UNIMP) instead of fprintf, Philippe Mathieu-Daudé, 2018/06/25
- Re: [Qemu-arm] [PATCH v2 07/14] hw/i2c/omap_i2c: Use qemu_log_mask(UNIMP) instead of fprintf, Thomas Huth, 2018/06/25
- Re: [Qemu-arm] [PATCH v2 07/14] hw/i2c/omap_i2c: Use qemu_log_mask(UNIMP) instead of fprintf, Philippe Mathieu-Daudé, 2018/06/25
- Re: [Qemu-arm] [PATCH v2 07/14] hw/i2c/omap_i2c: Use qemu_log_mask(UNIMP) instead of fprintf, Thomas Huth, 2018/06/25
[Qemu-arm] [PATCH v2 08/14] hw/arm/omap1: Use qemu_log_mask(GUEST_ERROR) instead of fprintf, Philippe Mathieu-Daudé, 2018/06/22
[Qemu-arm] [PATCH v2 10/14] hw/arm/stellaris: Use qemu_log_mask(UNIMP) instead of fprintf, Philippe Mathieu-Daudé, 2018/06/22
[Qemu-arm] [PATCH v2 09/14] hw/arm/omap: Use qemu_log_mask(GUEST_ERROR) instead of fprintf, Philippe Mathieu-Daudé, 2018/06/22
[Qemu-arm] [PATCH v2 12/14] hw/net/smc91c111: Use qemu_log_mask(GUEST_ERROR) instead of hw_error, Philippe Mathieu-Daudé, 2018/06/22
[Qemu-arm] [PATCH v2 11/14] hw/net/stellaris_enet: Use qemu_log_mask(GUEST_ERROR) instead of hw_error, Philippe Mathieu-Daudé, 2018/06/22