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

hw/gpio/zaurus.c: Use LOG_GUEST_ERROR for bad guest register accesses 



Instead of logging guest accesses to invalid register offsets in this
device using zaurus_printf() (which just prints to stderr), use the
usual qemu_log_mask(LOG_GUEST_ERROR,...).

Since this was the only use of the zaurus_printf() macro outside
spitz.c, we can move the definition of that macro from sharpsl.h
to spitz.c.

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-14-peter.maydell@linaro.org
parent eb2dc887

hw/arm/spitz.c

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ typedef struct { 
#define SPITZ_MACHINE_CLASS(klass) \

    OBJECT_CLASS_CHECK(SpitzMachineClass, klass, TYPE_SPITZ_MACHINE)



#define zaurus_printf(format, ...)                              \

    fprintf(stderr, "%s: " format, __func__, ##__VA_ARGS__)



#undef REG_FMT

#define REG_FMT                         "0x%02lx"

hw/gpio/zaurus.c

+7 −5
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ 
#include "hw/sysbus.h"

#include "migration/vmstate.h"

#include "qemu/module.h"



#undef REG_FMT

#define REG_FMT			"0x%02lx"

#include "qemu/log.h"



/* SCOOP devices */
@@ -104,7 +102,9 @@ static uint64_t scoop_read(void *opaque, hwaddr addr, 
    case SCOOP_GPRR:

        return s->gpio_level;

    default:

        zaurus_printf("Bad register offset " REG_FMT "\n", (unsigned long)addr);

        qemu_log_mask(LOG_GUEST_ERROR,

                      "scoop_read: bad register offset 0x%02" HWADDR_PRIx "\n",

                      addr);

    }



    return 0;
@@ -150,7 +150,9 @@ static void scoop_write(void *opaque, hwaddr addr, 
        scoop_gpio_handler_update(s);

        break;

    default:

        zaurus_printf("Bad register offset " REG_FMT "\n", (unsigned long)addr);

        qemu_log_mask(LOG_GUEST_ERROR,

                      "scoop_write: bad register offset 0x%02" HWADDR_PRIx "\n",

                      addr);

    }

}

include/hw/arm/sharpsl.h

+0 −3
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ 


#include "exec/hwaddr.h"



#define zaurus_printf(format, ...)	\

    fprintf(stderr, "%s: " format, __func__, ##__VA_ARGS__)



/* zaurus.c */



#define SL_PXA_PARAM_BASE	0xa0000a00