From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51371)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mdroth@linux.vnet.ibm.com>) id 1VOacu-0001Qp-0H
	for qemu-devel@nongnu.org; Tue, 24 Sep 2013 17:58:44 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mdroth@linux.vnet.ibm.com>) id 1VOack-0001ET-EF
	for qemu-devel@nongnu.org; Tue, 24 Sep 2013 17:58:35 -0400
Received: from e31.co.us.ibm.com ([32.97.110.149]:36073)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mdroth@linux.vnet.ibm.com>) id 1VOack-0001E1-6B
	for qemu-devel@nongnu.org; Tue, 24 Sep 2013 17:58:26 -0400
Received: from /spool/local
	by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only!
	Violators will be prosecuted
	for <qemu-devel@nongnu.org> from <mdroth@linux.vnet.ibm.com>;
	Tue, 24 Sep 2013 15:58:25 -0600
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Michael Roth <mdroth@linux.vnet.ibm.com>
In-Reply-To: <1375789738-28034-1-git-send-email-stefanha@redhat.com>
References: <1375789738-28034-1-git-send-email-stefanha@redhat.com>
Message-ID: <20130924215822.25429.16708@loki>
Date: Tue, 24 Sep 2013 16:58:22 -0500
Subject: Re: [Qemu-devel] [Qemu-stable] [PATCH for-1.6] qemu-timer: fix
 get_clock() gettimeofday() fallback #ifdef
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefan Hajnoczi <stefanha@redhat.com>, qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, Anthony Liguori <aliguori@us.ibm.com>, qemu-stable@nongnu.org

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 <stefanha@redhat.com>

Ping, looking to pull this in for stable.

> ---
>  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