openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hw/arm/pxa2xx_pic: Use LOG_GUEST_ERROR for bad guest register accesses 

Instead of using printf() for logging guest accesses to invalid
register offsets in the pxa2xx PIC device, use the usual
qemu_log_mask(LOG_GUEST_ERROR,...).

This was the only user of the REG_FMT macro in pxa.h, so we can
remove that.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 20200628142429.17111-16-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2020-07-03 16:59:45 +01:00
parent eb2d6dbc98
commit e53652ebea
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/arm/pxa2xx_pic.c
View File

@ -11,6 +11,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qemu/log.h"
#include "cpu.h" #include "cpu.h"
#include "hw/arm/pxa.h" #include "hw/arm/pxa.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
@ -166,7 +167,9 @@ static uint64_t pxa2xx_pic_mem_read(void *opaque, hwaddr offset,
case ICHP: /* Highest Priority register */ case ICHP: /* Highest Priority register */
return pxa2xx_pic_highest(s); return pxa2xx_pic_highest(s);
default: default:
printf("%s: Bad register offset " REG_FMT "\n", __func__, offset); qemu_log_mask(LOG_GUEST_ERROR,
"pxa2xx_pic_mem_read: bad register offset 0x%" HWADDR_PRIx
"\n", offset);
return 0; return 0;
} }
} }
@ -199,7 +202,9 @@ static void pxa2xx_pic_mem_write(void *opaque, hwaddr offset,
s->priority[32 + ((offset - IPR32) >> 2)] = value & 0x8000003f; s->priority[32 + ((offset - IPR32) >> 2)] = value & 0x8000003f;
break; break;
default: default:
printf("%s: Bad register offset " REG_FMT "\n", __func__, offset); qemu_log_mask(LOG_GUEST_ERROR,
"pxa2xx_pic_mem_write: bad register offset 0x%"
HWADDR_PRIx "\n", offset);
return; return;
} }
pxa2xx_pic_update(opaque); pxa2xx_pic_update(opaque);

1
include/hw/arm/pxa.h
View File

@ -184,7 +184,6 @@ struct PXA2xxI2SState {
}; };
# define PA_FMT "0x%08lx" # define PA_FMT "0x%08lx"
# define REG_FMT "0x" TARGET_FMT_plx
PXA2xxState *pxa270_init(MemoryRegion *address_space, unsigned int sdram_size, PXA2xxState *pxa270_init(MemoryRegion *address_space, unsigned int sdram_size,
const char *revision); const char *revision);