Message ID | 1497362826-21125-11-git-send-email-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | d1bb099f6308d594061119e3a46ae29059fdb549 |
Headers | show
Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp436138qgd; Tue, 13 Jun 2017 07:32:43 -0700 (PDT) X-Received: by 10.55.151.69 with SMTP id z66mr233240qkd.90.1497364363813; Tue, 13 Jun 2017 07:32:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497364363; cv=none; d=google.com; s=arc-20160816; b=ckxK5AfLKWXOBKeNOW3VH5qN2o99VOCXaOwQtbd7sKwovf6uVZOdWBUc8WjSIkg2nF bOgeyVkJklachfwQmA3V7g48JBgHbgLIXoOo6j5f7wg2j123oZ/MieTlp3zZ4XZfOJgS AL4FYQ/ycNXuCNNM/O3t7nT5ZgLbbsaApcr2HNC2sv0Ip3V6yrsKR2QY7a0GKrpQGbWm mqvf9dKD35/DfxmWaKU3o9gZTpB0U8CnbqI+dsjBEtQUrpDG4OGsnQBA5hs7j858HC/v U4ow84wQGHLnGCWm56Afw3X1YcguxogYNrrjgBZXMANTipbl8RRVTOl9vu+gznO4LBKM Lx9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=2xiCgdGqMHsJas8/O7Zbd3Nz+PG9IV7kAgfIju7QZn4=; b=YJvXDg4dYTgFA9fbQCwo6PU61Pn0IxTyE86JwSWRsvb3DI/KbXquUNJwGb9WPLSjMt 7EokDVXNxRpod4tOuHsJQF4P+qRyU5ymcevCnEDF2ifhqfBgxZLugURH7oqghi50SNHI aXVfKMabycAVbrJTlOJg/1DVAgYa5ffSYG6U4jlkGsFreVV3SJDq1+b/oEqYYTCmiItw tPZtsXKhIbkujngUNAa2aRQlGCrnzrFtkrm7B2qBOEyfx5zoaT8TXLzAKLZuAeCvLAvQ DGM4Lc7nkfIfBucuaQY9K4JYsNDyCMHIafLc7SfpH6gLsZMV7IpU3/ADXKWne2IeDvOB UuCw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y123si59396qkb.242.2017.06.13.07.32.43 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 13 Jun 2017 07:32:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43608 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1dKms5-0007QE-9i for patch@linaro.org; Tue, 13 Jun 2017 10:32:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33258) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1dKmTg-0005Mh-PE for qemu-devel@nongnu.org; Tue, 13 Jun 2017 10:07:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1dKmTa-0006hR-SJ for qemu-devel@nongnu.org; Tue, 13 Jun 2017 10:07:28 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37258) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1dKmTa-0006fN-Cq for qemu-devel@nongnu.org; Tue, 13 Jun 2017 10:07:22 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from <pm215@archaic.org.uk>) id 1dKmTS-000144-L5 for qemu-devel@nongnu.org; Tue, 13 Jun 2017 15:07:14 +0100 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Tue, 13 Jun 2017 15:06:59 +0100 Message-Id: <1497362826-21125-11-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497362826-21125-1-git-send-email-peter.maydell@linaro.org> References: <1497362826-21125-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 10/17] timer.h: Provide better monotonic time X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list 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> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 8a1eb74..1b518bc 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -1020,10 +1020,9 @@ static inline int64_t cpu_get_host_ticks(void) /* The host CPU doesn't have an easily accessible cycle counter. Just return a monotonically increasing value. This will be totally wrong, but hopefully better than nothing. */ -static inline int64_t cpu_get_host_ticks (void) +static inline int64_t cpu_get_host_ticks(void) { - static int64_t ticks = 0; - return ticks++; + return get_clock(); } #endif