From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOaeK-0002qK-5d for qemu-devel@nongnu.org; Tue, 24 Sep 2013 18:00:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VOae8-0001Ox-Ih for qemu-devel@nongnu.org; Tue, 24 Sep 2013 18:00:04 -0400 Received: from e37.co.us.ibm.com ([32.97.110.158]:37482) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOae8-0001OZ-AF for qemu-devel@nongnu.org; Tue, 24 Sep 2013 17:59:52 -0400 Received: from /spool/local by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 24 Sep 2013 15:59:51 -0600 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: <20130924215822.25429.16708@loki> References: <1375789738-28034-1-git-send-email-stefanha@redhat.com> <20130924215822.25429.16708@loki> Message-ID: <20130924215946.25429.75793@loki> Date: Tue, 24 Sep 2013 16:59:46 -0500 Subject: Re: [Qemu-devel] [Qemu-stable] [PATCH for-1.6] qemu-timer: fix get_clock() gettimeofday() fallback #ifdef List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Anthony Liguori , qemu-stable@nongnu.org Quoting Michael Roth (2013-09-24 16:58:22) > Quoting Stefan Hajnoczi (2013-08-06 06:48:58) > > If CLOCK_MONOTONIC is not defined by system headers we use > > gettimeofday(2). Apparently this is not used very often since no one > > noticed the #ifdef was actually broken and left the function definition > > unterminated. > > = > > Signed-off-by: Stefan Hajnoczi > = > Ping, looking to pull this in for stable. Bah, ignore this. Didn't see previous discussion. > = > > --- > > include/qemu/timer.h | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > = > > diff --git a/include/qemu/timer.h b/include/qemu/timer.h > > index 9dd206c..e3299b8 100644 > > --- a/include/qemu/timer.h > > +++ b/include/qemu/timer.h > > @@ -125,8 +125,8 @@ static inline int64_t get_clock(void) > > changes, so it should be avoided. */ > > return get_clock_realtime(); > > } > > -} > > #endif > > +} > > = > > void qemu_get_timer(QEMUFile *f, QEMUTimer *ts); > > void qemu_put_timer(QEMUFile *f, QEMUTimer *ts); > > -- = > > 1.8.1.4