From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwwYU-0007RN-G2 for qemu-devel@nongnu.org; Tue, 17 Jun 2014 12:48:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwwYO-0003aF-BZ for qemu-devel@nongnu.org; Tue, 17 Jun 2014 12:48:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23086) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwwYO-0003aA-2r for qemu-devel@nongnu.org; Tue, 17 Jun 2014 12:48:12 -0400 Date: Tue, 17 Jun 2014 19:48:36 +0300 From: "Michael S. Tsirkin" Message-ID: <20140617164836.GA25855@redhat.com> References: <20140617154751.GA3947@amt.cnet> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20140617154751.GA3947@amt.cnet> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2] mc146818rtc: add rtc-reset-reinjection QMP command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcelo Tosatti Cc: gleb@kernel.org, mprivozn@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com On Tue, Jun 17, 2014 at 12:47:51PM -0300, Marcelo Tosatti wrote: >=20 > It is necessary to reset RTC interrupt reinjection backlog if > guest time is synchronized via a different mechanism, such as > QGA's guest-set-time command. >=20 > Failing to do so causes both corrections to be applied (summed), > resulting in an incorrect guest time. >=20 > Signed-off-by: Marcelo Tosatti Fails build for non x86 target: LINK arm-softmmu/qemu-system-arm ../qmp-marshal.o: In function `qmp_marshal_input_rtc_reset_reinjection': /scm/qemu/qmp-marshal.c:5059: undefined reference to `qmp_rtc_reset_reinjection' collect2: error: ld returned 1 exit status make[1]: *** [qemu-system-arm] Error 1 make: *** [subdir-arm-softmmu] Error 2 > diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c > index df54546..1782c4e 100644 > --- a/hw/timer/mc146818rtc.c > +++ b/hw/timer/mc146818rtc.c > @@ -26,6 +26,7 @@ > #include "sysemu/sysemu.h" > #include "hw/timer/mc146818rtc.h" > #include "qapi/visitor.h" > +#include "qmp-commands.h" > =20 > #ifdef TARGET_I386 > #include "hw/i386/apic.h" > @@ -84,6 +85,7 @@ typedef struct RTCState { > Notifier clock_reset_notifier; > LostTickPolicy lost_tick_policy; > Notifier suspend_notifier; > + QLIST_ENTRY(RTCState) link; > } RTCState; > =20 > static void rtc_set_time(RTCState *s); > @@ -522,6 +524,20 @@ static void rtc_get_time(RTCState *s, struct tm *t= m) > rtc_from_bcd(s, s->cmos_data[RTC_CENTURY]) * 100 - 1900; > } > =20 > +static QLIST_HEAD(, RTCState) rtc_devices =3D > + QLIST_HEAD_INITIALIZER(rtc_devices); > + > +#ifdef TARGET_I386 > +void qmp_rtc_reset_reinjection(Error **errp) > +{ > + RTCState *s; > + > + QLIST_FOREACH(s, &rtc_devices, link) { > + s->irq_coalesced =3D 0; > + } > +} > +#endif > + > static void rtc_set_time(RTCState *s) > { > struct tm tm; > @@ -911,6 +927,8 @@ ISADevice *rtc_init(ISABus *bus, int base_year, qem= u_irq intercept_irq) > } else { > isa_init_irq(isadev, &s->irq, RTC_ISA_IRQ); > } > + QLIST_INSERT_HEAD(&rtc_devices, s, link); > + > return isadev; > } > =20 > diff --git a/qapi-schema.json b/qapi-schema.json > index 7bc33ea..a4e2c21 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -4722,3 +4722,15 @@ > 'btn' : 'InputBtnEvent', > 'rel' : 'InputMoveEvent', > 'abs' : 'InputMoveEvent' } } > + > +## > +# @rtc-reset-reinjection > +# > +# This command will reset the RTC interrupt reinjection backlog. > +# Can be used if another mechanism to synchronize guest time > +# is in effect, for example QEMU guest agent's guest-set-time > +# command. > +# > +# Since: 2.1 > +## > +{ 'command': 'rtc-reset-reinjection' } > diff --git a/qmp-commands.hx b/qmp-commands.hx > index d8aa4ed..dc43789 100644 > --- a/qmp-commands.hx > +++ b/qmp-commands.hx > @@ -3572,3 +3572,26 @@ Example: > } }=A0] } > =20 > EQMP > + > +#if defined (TARGET_I386) > + { > + .name =3D "rtc-reset-reinjection", > + .args_type =3D "", > + .mhandler.cmd_new =3D qmp_marshal_input_rtc_reset_reinjection, > + }, > +#endif > + > +SQMP > +rtc-reset-reinjection > +--------------------- > + > +Reset the RTC interrupt reinjection backlog. > + > +Arguments: None. > + > +Example: > + > +-> { "execute": "rtc-reset-reinjection" } > +<- { "return": {} } > + > +EQMP