* [PATCH] hw/timer/arm_mptimer.c: Undo accidental rename of arm_mptimer_init()
@ 2019-10-17 13:33 Peter Maydell
2019-10-17 14:17 ` Richard Henderson
2019-10-17 14:33 ` Philippe Mathieu-Daudé
0 siblings, 2 replies; 3+ messages in thread
From: Peter Maydell @ 2019-10-17 13:33 UTC (permalink / raw)
To: qemu-arm, qemu-devel
In commit b01422622b we did an automated rename of the ptimer_init()
function to ptimer_init_with_bh(). Unfortunately this caught the
unrelated arm_mptimer_init() function. Undo that accidental
renaming.
Fixes: b01422622b7c7293196fdaf1dbb4f495af44ecf9
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/timer/arm_mptimer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c
index fdf97d1800f..2bf11f788c3 100644
--- a/hw/timer/arm_mptimer.c
+++ b/hw/timer/arm_mptimer.c
@@ -237,7 +237,7 @@ static void arm_mptimer_reset(DeviceState *dev)
}
}
-static void arm_mptimer_init_with_bh(Object *obj)
+static void arm_mptimer_init(Object *obj)
{
ARMMPTimerState *s = ARM_MPTIMER(obj);
@@ -319,7 +319,7 @@ static const TypeInfo arm_mptimer_info = {
.name = TYPE_ARM_MPTIMER,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(ARMMPTimerState),
- .instance_init = arm_mptimer_init_with_bh,
+ .instance_init = arm_mptimer_init,
.class_init = arm_mptimer_class_init,
};
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] hw/timer/arm_mptimer.c: Undo accidental rename of arm_mptimer_init()
2019-10-17 13:33 [PATCH] hw/timer/arm_mptimer.c: Undo accidental rename of arm_mptimer_init() Peter Maydell
@ 2019-10-17 14:17 ` Richard Henderson
2019-10-17 14:33 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Richard Henderson @ 2019-10-17 14:17 UTC (permalink / raw)
To: Peter Maydell, qemu-arm, qemu-devel
On 10/17/19 6:33 AM, Peter Maydell wrote:
> In commit b01422622b we did an automated rename of the ptimer_init()
> function to ptimer_init_with_bh(). Unfortunately this caught the
> unrelated arm_mptimer_init() function. Undo that accidental
> renaming.
>
> Fixes: b01422622b7c7293196fdaf1dbb4f495af44ecf9
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> hw/timer/arm_mptimer.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] hw/timer/arm_mptimer.c: Undo accidental rename of arm_mptimer_init()
2019-10-17 13:33 [PATCH] hw/timer/arm_mptimer.c: Undo accidental rename of arm_mptimer_init() Peter Maydell
2019-10-17 14:17 ` Richard Henderson
@ 2019-10-17 14:33 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-10-17 14:33 UTC (permalink / raw)
To: Peter Maydell, qemu-arm, qemu-devel
On 10/17/19 3:33 PM, Peter Maydell wrote:
> In commit b01422622b we did an automated rename of the ptimer_init()
> function to ptimer_init_with_bh(). Unfortunately this caught the
> unrelated arm_mptimer_init() function. Undo that accidental
> renaming.
>
> Fixes: b01422622b7c7293196fdaf1dbb4f495af44ecf9
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/timer/arm_mptimer.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c
> index fdf97d1800f..2bf11f788c3 100644
> --- a/hw/timer/arm_mptimer.c
> +++ b/hw/timer/arm_mptimer.c
> @@ -237,7 +237,7 @@ static void arm_mptimer_reset(DeviceState *dev)
> }
> }
>
> -static void arm_mptimer_init_with_bh(Object *obj)
> +static void arm_mptimer_init(Object *obj)
> {
> ARMMPTimerState *s = ARM_MPTIMER(obj);
>
> @@ -319,7 +319,7 @@ static const TypeInfo arm_mptimer_info = {
> .name = TYPE_ARM_MPTIMER,
> .parent = TYPE_SYS_BUS_DEVICE,
> .instance_size = sizeof(ARMMPTimerState),
> - .instance_init = arm_mptimer_init_with_bh,
> + .instance_init = arm_mptimer_init,
> .class_init = arm_mptimer_class_init,
> };
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-17 15:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-17 13:33 [PATCH] hw/timer/arm_mptimer.c: Undo accidental rename of arm_mptimer_init() Peter Maydell
2019-10-17 14:17 ` Richard Henderson
2019-10-17 14:33 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).