From nobody Tue Nov 18 11:49:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609707132; cv=none; d=zohomail.com; s=zohoarc; b=HkYRLILmlNp9H1p2KmP6ENRs7mOYTjie9SiB9zQHT71q9VRxv4nWg+dj789vxUwlCSVaVS01loe/Vdzflr9D9SPw10GIOCvb2toKB8gfNK6mvkhyf5dN3p+uAPzmJtDmO6LquvLcciFxEH5Le0nbYE1xylKhV18Hl61DLjC6wf0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609707132; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=S5HsQlYCUdheC9WapV12I7REW2HWT9Eel8KOz7tCI0c=; b=CFf+Lce4AM1kmyLoRN51lPUGE6iqJfm5JXzRYES7nEcZ1nZ5GPUHi/HPn/zXWkJFqoB0R3h7S1+l2TtvZ5slDMfmMn7msgUi/2OKIz8i5u58mA0MYKHBP1MGFIHX7Rq4PvpM0906o2iMCWfR2+v9Z4uH3+MxO/KHXETxabcHMsE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 1609707132061992.0554966086854; Sun, 3 Jan 2021 12:52:12 -0800 (PST) Received: by mail-wm1-f42.google.com with SMTP id 3so16641723wmg.4 for ; Sun, 03 Jan 2021 12:52:11 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (194.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.194]) by smtp.gmail.com with ESMTPSA id g5sm85018363wro.60.2021.01.03.12.52.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 12:52:09 -0800 (PST) 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=S5HsQlYCUdheC9WapV12I7REW2HWT9Eel8KOz7tCI0c=; b=Q9sViTLFYRhYMAAbN8Cn4mDn+uY5yzyxxGNl/LjYddodG4eLWGGsu6tEaaiHgaUxKV CaAWQHJPTbzzWRaNZsOBCZ1ERF7txS8dedr3q0d4RZwVLOZiVYR6MEDtdUMmIn4zAJGB eRWKuFGGIzTzKUt768P2SjYrI861/L7rr4tbzzz4Po1YYCANHwi2v210K52gHoVHWSkp bJIBOjLOrVJCCiOS8SaIVVJase97JURDngN6bF5faaj20E6Ks2eDB3KTuQpNIwBj1ksk rKEho9y4hZfE90rQwuV42/9n++/dGQ+Ae96JxiGw1856HiXjPbS1qTAwJ8FsjsOHGrHL 9ADg== 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=S5HsQlYCUdheC9WapV12I7REW2HWT9Eel8KOz7tCI0c=; b=hoCCmuM1Fxp+Z1AhBK3y7QghYbyu/8Q9Onrp0BgXan50gTnmwratQwdOauzf0ygzC/ Be1ZStxDYeFh5MYWrU01hOaslJ6cTKlilYU3wO+Co1EnAihSUJCDTsY8YAVBYjx2kPtW yVDU/sl0oocSUuIOi8X7X3NXmC4Ag0VEhcPXpo5pd50gJKIISiwGwv/2LnenkXKlD6Ay q2R3XL2d30OccuGP4nt4wc50jax5+mxBxkO+4Np+AsnDLwjypujUvLHTIHS0sEjhTkRh iKDV6Q/mVpDl38rPMT6pffZwh0q9k1UiPMAvqXCC6bibf9ggLMd8qV0+ERtdopukn4PS HvlQ== X-Gm-Message-State: AOAM530+nIjNj/kbL8bUYAPElgqWQIwMq67EHFCUpt5sn50A+TL96xaf /foVKh3kXRtaCbdW5iX/ZEJhIk+JHWk= X-Google-Smtp-Source: ABdhPJwErC5L6MiANUu0xARI9uwlt37n/DW206JgJzDU+QfAGziyfib0zaJvpPTQuHCAdn94IAD3vw== X-Received: by 2002:a1c:2b05:: with SMTP id r5mr23732194wmr.179.1609707130251; Sun, 03 Jan 2021 12:52:10 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Huacai Chen , Jiaxun Yang , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Luc Michel Subject: [PULL 22/35] clock: Define and use new clock_display_freq() Date: Sun, 3 Jan 2021 21:50:08 +0100 Message-Id: <20210103205021.2837760-23-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210103205021.2837760-1-f4bug@amsat.org> References: <20210103205021.2837760-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) From: Peter Maydell It's common to want to print a human-readable indication of a clock's frequency. Provide a utility function in the clock API to return a string which is a displayable representation of the frequency, and use it in qdev-monitor.c. Before: (qemu) info qtree [...] dev: xilinx,zynq_slcr, id "" clock-in "ps_clk" freq_hz=3D3.333333e+07 mmio 00000000f8000000/0000000000001000 After: dev: xilinx,zynq_slcr, id "" clock-in "ps_clk" freq_hz=3D33.3 MHz mmio 00000000f8000000/0000000000001000 Signed-off-by: Peter Maydell Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Luc Michel Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20201215150929.30311-5-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/devel/clocks.rst | 5 +++++ include/hw/clock.h | 12 ++++++++++++ hw/core/clock.c | 6 ++++++ softmmu/qdev-monitor.c | 6 +++--- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/docs/devel/clocks.rst b/docs/devel/clocks.rst index 2d317ff32f2..2548d842322 100644 --- a/docs/devel/clocks.rst +++ b/docs/devel/clocks.rst @@ -267,6 +267,11 @@ Here is an example: clock_get(dev->my_clk_input)); } =20 +If you are only interested in the frequency for displaying it to +humans (for instance in debugging), use ``clock_display_freq()``, +which returns a prettified string-representation, e.g. "33.3 MHz". +The caller must free the string with g_free() after use. + Calculating expiry deadlines ---------------------------- =20 diff --git a/include/hw/clock.h b/include/hw/clock.h index 852c636961e..6382f346569 100644 --- a/include/hw/clock.h +++ b/include/hw/clock.h @@ -264,4 +264,16 @@ static inline bool clock_is_enabled(const Clock *clk) return clock_get(clk) !=3D 0; } =20 +/** + * clock_display_freq: return human-readable representation of clock frequ= ency + * @clk: clock + * + * Return a string which has a human-readable representation of the + * clock's frequency, e.g. "33.3 MHz". This is intended for debug + * and display purposes. + * + * The caller is responsible for freeing the string with g_free(). + */ +char *clock_display_freq(Clock *clk); + #endif /* QEMU_HW_CLOCK_H */ diff --git a/hw/core/clock.c b/hw/core/clock.c index 8c6af223e7c..76b5f468b6e 100644 --- a/hw/core/clock.c +++ b/hw/core/clock.c @@ -12,6 +12,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/cutils.h" #include "hw/clock.h" #include "trace.h" =20 @@ -111,6 +112,11 @@ static void clock_disconnect(Clock *clk) QLIST_REMOVE(clk, sibling); } =20 +char *clock_display_freq(Clock *clk) +{ + return freq_to_str(clock_get_hz(clk)); +} + static void clock_initfn(Object *obj) { Clock *clk =3D CLOCK(obj); diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index 2c57e36c9ae..8dc656becca 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -736,11 +736,11 @@ static void qdev_print(Monitor *mon, DeviceState *dev= , int indent) } } QLIST_FOREACH(ncl, &dev->clocks, node) { - qdev_printf("clock-%s%s \"%s\" freq_hz=3D%e\n", + g_autofree char *freq_str =3D clock_display_freq(ncl->clock); + qdev_printf("clock-%s%s \"%s\" freq_hz=3D%s\n", ncl->output ? "out" : "in", ncl->alias ? " (alias)" : "", - ncl->name, - CLOCK_PERIOD_TO_HZ(1.0 * clock_get(ncl->clock))); + ncl->name, freq_str); } class =3D object_get_class(OBJECT(dev)); do { --=20 2.26.2