| Message ID | 20201220112615.933036-7-laurent@vivier.eu |
|---|---|
| State | New |
| Headers | show |
| Series | m68k: add Virtual M68k Machine | expand |
Is there someone to merge this? Thanks, Laurent Le 20/12/2020 à 12:26, Laurent Vivier a écrit : > After a migration the clock offset is updated, but we also > need to re-arm the alarm if needed. > > Signed-off-by: Laurent Vivier <laurent@vivier.eu> > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > --- > hw/rtc/goldfish_rtc.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/hw/rtc/goldfish_rtc.c b/hw/rtc/goldfish_rtc.c > index 0f4e8185a796..e07ff0164e0c 100644 > --- a/hw/rtc/goldfish_rtc.c > +++ b/hw/rtc/goldfish_rtc.c > @@ -211,6 +211,8 @@ static int goldfish_rtc_post_load(void *opaque, int version_id) > qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); > s->tick_offset = s->tick_offset_vmstate - delta; > > + goldfish_rtc_set_alarm(s); > + > return 0; > } > >
On 12/20/20 12:26 PM, Laurent Vivier wrote: > After a migration the clock offset is updated, but we also > need to re-arm the alarm if needed. > > Signed-off-by: Laurent Vivier <laurent@vivier.eu> > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > --- > hw/rtc/goldfish_rtc.c | 2 ++ > 1 file changed, 2 insertions(+) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
On Sat, Jan 23, 2021 at 7:06 AM Laurent Vivier <laurent@vivier.eu> wrote: > > Is there someone to merge this? Do you mean just this patch or the whole series? Alistair > > Thanks, > Laurent > > Le 20/12/2020 à 12:26, Laurent Vivier a écrit : > > After a migration the clock offset is updated, but we also > > need to re-arm the alarm if needed. > > > > Signed-off-by: Laurent Vivier <laurent@vivier.eu> > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > > --- > > hw/rtc/goldfish_rtc.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/hw/rtc/goldfish_rtc.c b/hw/rtc/goldfish_rtc.c > > index 0f4e8185a796..e07ff0164e0c 100644 > > --- a/hw/rtc/goldfish_rtc.c > > +++ b/hw/rtc/goldfish_rtc.c > > @@ -211,6 +211,8 @@ static int goldfish_rtc_post_load(void *opaque, int version_id) > > qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); > > s->tick_offset = s->tick_offset_vmstate - delta; > > > > + goldfish_rtc_set_alarm(s); > > + > > return 0; > > } > > > > > >
Le 26/01/2021 à 00:44, Alistair Francis a écrit : > On Sat, Jan 23, 2021 at 7:06 AM Laurent Vivier <laurent@vivier.eu> wrote: >> >> Is there someone to merge this? > > Do you mean just this patch or the whole series? Sorry, I missed your mail. I mean only this patch. Thanks, Laurent
On Sat, Feb 6, 2021 at 6:46 AM Laurent Vivier <laurent@vivier.eu> wrote: > > Le 26/01/2021 à 00:44, Alistair Francis a écrit : > > On Sat, Jan 23, 2021 at 7:06 AM Laurent Vivier <laurent@vivier.eu> wrote: > >> > >> Is there someone to merge this? > > > > Do you mean just this patch or the whole series? > > Sorry, I missed your mail. > > I mean only this patch. Ok, I have applied it. Thanks! Applied to riscv-to-apply.next Alistair > > Thanks, > Laurent >
diff --git a/hw/rtc/goldfish_rtc.c b/hw/rtc/goldfish_rtc.c index 0f4e8185a796..e07ff0164e0c 100644 --- a/hw/rtc/goldfish_rtc.c +++ b/hw/rtc/goldfish_rtc.c @@ -211,6 +211,8 @@ static int goldfish_rtc_post_load(void *opaque, int version_id) qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); s->tick_offset = s->tick_offset_vmstate - delta; + goldfish_rtc_set_alarm(s); + return 0; }