From nobody Tue Feb 10 04:15:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) client-ip=209.85.221.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1603218030; cv=none; d=zohomail.com; s=zohoarc; b=RJUH/6jUydyCoKaA1rat5WWEK6ErcZETRoX0twokbT3KaADX6w5ItHzrYp4kfCTKyCybiyqeDEKBt6p/WGnR4Hlp/IXu8Ym722yBdxukJlUmnm4PtRsvsUROfb0h61d+lro7ZvbsK3v5xedEyiXORwxlFn3L2KmpE64WhvOTWrU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603218030; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LQrTFKXWCLSqqSOpapSwwXPnnslLjbgCl2fGT7u9jw0=; b=AQ55ElHtEdTOYymi1G2THLVhvtL1xtgv0G4cJyUwkculuNg9747ZF/HoF74pd8L3eKAfFiGdN09meIi8s8r9HhjByJmb3JHLCPDeWUYYrhkDcYS4EDBGrl1+Ns320dpRTwDASwdUa7bLmIQUIJb52dY0N6w9Tf2Cy4nOCri4+Yo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.zohomail.com with SMTPS id 1603218030710368.00322199400796; Tue, 20 Oct 2020 11:20:30 -0700 (PDT) Received: by mail-wr1-f67.google.com with SMTP id h7so3357794wre.4 for ; Tue, 20 Oct 2020 11:20:30 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id p11sm4139024wrm.44.2020.10.20.11.20.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 11:20:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LQrTFKXWCLSqqSOpapSwwXPnnslLjbgCl2fGT7u9jw0=; b=tVXKYBrlySX4y89GL32QgH7h5/3ZT9bsnd/8LCsCuEa8Cb4pPlFcMQJSjmpA/MsNQc wxypXE0dJVIdGSWW53+36BdL8pI661IhgCCJVYkfsOabz8/OMyv+mdo6bKSb7AHyq1I8 VKfP0y+f+mSZLomDqSOaCT+0Ax6EixynAzkbyuQgO2UWNFLqG6QMmPXIA0NxV+Ps0hGF OX2359yqMIhxs3gYfaSRBZz+c1LiD2cYYWKaWXrpdglfIbLYDkNNnp+5uodI9PXVsRHG n7BUOPUkqCDFVXwekyshYr7NzO4Ri+VVpnyNg8eupncxipwkQNZjR+LFLCLkA6ig/4RL v2Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LQrTFKXWCLSqqSOpapSwwXPnnslLjbgCl2fGT7u9jw0=; b=h7qCj+7outY8JoIgpRYc5O9y6If9m/7VLST2ywQRbSSRXd76IV/8VXTqWgGiHlaUrr +aeu9WuDhij9dmICCPqtlh6kU716NjX+ynZYyc2IDL/FX7a3ZgWQ2B/a6CXyu9Zb2Kxr qUwmJT6YdzbaDS1HpAI4apaVY6U5c4Y97R7EA9jDwpLJoKG2uTnRfAf0xlH92PPw4AA5 Pu3Sp45YNPm8/IEDQb75KczpoytsmyD0aU+VSyfw+0dvh7g9tu/dART69eJw7EEc1Ay+ zbrvqjAXbTmAxTmT3nZ9zvA1xNykgJfYrMIc9rRr8ES3bkx+u260FjOeYuDzpOCCAPpw 18Jg== X-Gm-Message-State: AOAM532RypfAAv0H4//s1z7ZzfH9QCsqEfYLuydDVvwXXAflXhFuqwQZ x/rv75rqWu9ZKXKaqKUUzBQ= X-Google-Smtp-Source: ABdhPJxGeMKf57nyBJuXqB3UpANGvvvS7jEECJvnzXo3B1NVbkxk7AvTodWQv/i/AJo2TU9Jn7dApw== X-Received: by 2002:adf:a553:: with SMTP id j19mr4875776wrb.349.1603218029290; Tue, 20 Oct 2020 11:20:29 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell , Luc Michel , Damien Hedde , Eduardo Habkost , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 4/4] hw/clock: Inline and remove CLOCK_PERIOD_TO_NS() Date: Tue, 20 Oct 2020 20:20:08 +0200 Message-Id: <20201020182008.2240590-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201020182008.2240590-1-f4bug@amsat.org> References: <20201020182008.2240590-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) This macro is only used once. Inline caring about 64-bit multiplication, and remove it. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/clock.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/include/hw/clock.h b/include/hw/clock.h index b58038f1e7d..f329fcf0ea5 100644 --- a/include/hw/clock.h +++ b/include/hw/clock.h @@ -16,6 +16,7 @@ =20 #include "qom/object.h" #include "qemu/queue.h" +#include "qemu/host-utils.h" =20 #define TYPE_CLOCK "clock" OBJECT_DECLARE_SIMPLE_TYPE(Clock, CLOCK) @@ -38,7 +39,6 @@ typedef void ClockCallback(void *opaque); * macro helpers to convert to hertz / nanosecond */ #define CLOCK_PERIOD_FROM_NS(ns) ((ns) * (CLOCK_PERIOD_1SEC / 1000000000ll= u)) -#define CLOCK_PERIOD_TO_NS(per) ((per) / (CLOCK_PERIOD_1SEC / 1000000000ll= u)) #define CLOCK_PERIOD_FROM_HZ(hz) (((hz) !=3D 0) ? CLOCK_PERIOD_1SEC / (hz)= : 0u) =20 /** @@ -210,9 +210,14 @@ static inline uint64_t clock_get_hz(Clock *clk) return CLOCK_PERIOD_1SEC / clk->period; } =20 -static inline unsigned clock_get_ns(Clock *clk) +static inline uint64_t clock_get_ns(Clock *clk) { - return CLOCK_PERIOD_TO_NS(clock_get(clk)); + uint64_t lo, hi; + + mulu64(&lo, &hi, clock_get(clk), 1000000000llu); + divu128(&lo, &hi, CLOCK_PERIOD_1SEC); + + return lo; } =20 /** --=20 2.26.2