Message ID | 20200902224311.1321159-50-ehabkost@redhat.com |
---|---|
State | New |
Headers | show |
Series | qom: Rename macros for consistency | expand |
On Wed, Sep 2, 2020 at 4:04 PM Eduardo Habkost <ehabkost@redhat.com> wrote: > > Make the type checking macro name consistent with the TYPE_* > constant. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > Cc: Alistair Francis <alistair@alistair23.me> > Cc: Peter Maydell <peter.maydell@linaro.org> > Cc: qemu-arm@nongnu.org > Cc: qemu-devel@nongnu.org > --- > include/hw/timer/stm32f2xx_timer.h | 2 +- > hw/timer/stm32f2xx_timer.c | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/include/hw/timer/stm32f2xx_timer.h b/include/hw/timer/stm32f2xx_timer.h > index 90f40f1746..70ef426afc 100644 > --- a/include/hw/timer/stm32f2xx_timer.h > +++ b/include/hw/timer/stm32f2xx_timer.h > @@ -63,7 +63,7 @@ > > #define TYPE_STM32F2XX_TIMER "stm32f2xx-timer" > typedef struct STM32F2XXTimerState STM32F2XXTimerState; > -DECLARE_INSTANCE_CHECKER(STM32F2XXTimerState, STM32F2XXTIMER, > +DECLARE_INSTANCE_CHECKER(STM32F2XXTimerState, STM32F2XX_TIMER, > TYPE_STM32F2XX_TIMER) > > struct STM32F2XXTimerState { > diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c > index ba8694dcd3..d880c0b4d5 100644 > --- a/hw/timer/stm32f2xx_timer.c > +++ b/hw/timer/stm32f2xx_timer.c > @@ -96,7 +96,7 @@ static void stm32f2xx_timer_set_alarm(STM32F2XXTimerState *s, int64_t now) > > static void stm32f2xx_timer_reset(DeviceState *dev) > { > - STM32F2XXTimerState *s = STM32F2XXTIMER(dev); > + STM32F2XXTimerState *s = STM32F2XX_TIMER(dev); > int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); > > s->tim_cr1 = 0; > @@ -306,7 +306,7 @@ static Property stm32f2xx_timer_properties[] = { > > static void stm32f2xx_timer_init(Object *obj) > { > - STM32F2XXTimerState *s = STM32F2XXTIMER(obj); > + STM32F2XXTimerState *s = STM32F2XX_TIMER(obj); > > sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq); > > @@ -317,7 +317,7 @@ static void stm32f2xx_timer_init(Object *obj) > > static void stm32f2xx_timer_realize(DeviceState *dev, Error **errp) > { > - STM32F2XXTimerState *s = STM32F2XXTIMER(dev); > + STM32F2XXTimerState *s = STM32F2XX_TIMER(dev); > s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, stm32f2xx_timer_interrupt, s); > } > > -- > 2.26.2 > >
diff --git a/include/hw/timer/stm32f2xx_timer.h b/include/hw/timer/stm32f2xx_timer.h index 90f40f1746..70ef426afc 100644 --- a/include/hw/timer/stm32f2xx_timer.h +++ b/include/hw/timer/stm32f2xx_timer.h @@ -63,7 +63,7 @@ #define TYPE_STM32F2XX_TIMER "stm32f2xx-timer" typedef struct STM32F2XXTimerState STM32F2XXTimerState; -DECLARE_INSTANCE_CHECKER(STM32F2XXTimerState, STM32F2XXTIMER, +DECLARE_INSTANCE_CHECKER(STM32F2XXTimerState, STM32F2XX_TIMER, TYPE_STM32F2XX_TIMER) struct STM32F2XXTimerState { diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c index ba8694dcd3..d880c0b4d5 100644 --- a/hw/timer/stm32f2xx_timer.c +++ b/hw/timer/stm32f2xx_timer.c @@ -96,7 +96,7 @@ static void stm32f2xx_timer_set_alarm(STM32F2XXTimerState *s, int64_t now) static void stm32f2xx_timer_reset(DeviceState *dev) { - STM32F2XXTimerState *s = STM32F2XXTIMER(dev); + STM32F2XXTimerState *s = STM32F2XX_TIMER(dev); int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); s->tim_cr1 = 0; @@ -306,7 +306,7 @@ static Property stm32f2xx_timer_properties[] = { static void stm32f2xx_timer_init(Object *obj) { - STM32F2XXTimerState *s = STM32F2XXTIMER(obj); + STM32F2XXTimerState *s = STM32F2XX_TIMER(obj); sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq); @@ -317,7 +317,7 @@ static void stm32f2xx_timer_init(Object *obj) static void stm32f2xx_timer_realize(DeviceState *dev, Error **errp) { - STM32F2XXTimerState *s = STM32F2XXTIMER(dev); + STM32F2XXTimerState *s = STM32F2XX_TIMER(dev); s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, stm32f2xx_timer_interrupt, s); }
Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- Cc: Alistair Francis <alistair@alistair23.me> Cc: Peter Maydell <peter.maydell@linaro.org> Cc: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org --- include/hw/timer/stm32f2xx_timer.h | 2 +- hw/timer/stm32f2xx_timer.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)