Commit e53652eb authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Message-id: 20200628142429.17111-16-peter.maydell@linaro.org
parent eb2d6dbc

hw/arm/pxa2xx_pic.c

+7 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "qemu/osdep.h"

#include "qapi/error.h"

#include "qemu/module.h"

#include "qemu/log.h"

#include "cpu.h"

#include "hw/arm/pxa.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 */

        return pxa2xx_pic_highest(s);

    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;

    }

}
@@ -199,7 +202,9 @@ static void pxa2xx_pic_mem_write(void *opaque, hwaddr offset, 
        s->priority[32 + ((offset - IPR32) >> 2)] = value & 0x8000003f;

        break;

    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;

    }

    pxa2xx_pic_update(opaque);

include/hw/arm/pxa.h

+0 −1
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ struct PXA2xxI2SState { 
};



# define PA_FMT			"0x%08lx"

# define REG_FMT		"0x" TARGET_FMT_plx



PXA2xxState *pxa270_init(MemoryRegion *address_space, unsigned int sdram_size,

                         const char *revision);