From patchwork Thu Oct 1 16:43:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 272275 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 654FBC4741F for ; Thu, 1 Oct 2020 16:59:02 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0DF7620872 for ; Thu, 1 Oct 2020 16:59:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aSpuy5mV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0DF7620872 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kO1v2-0008Fq-QI for qemu-devel@archiver.kernel.org; Thu, 01 Oct 2020 12:59:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kO1g2-00006n-CL for qemu-devel@nongnu.org; Thu, 01 Oct 2020 12:43:30 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:44392) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kO1g0-0006DS-Qf for qemu-devel@nongnu.org; Thu, 01 Oct 2020 12:43:30 -0400 Received: by mail-wr1-x42f.google.com with SMTP id s12so6576690wrw.11 for ; Thu, 01 Oct 2020 09:43: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=qkYlQ2hG55eOJBhaI2ddQgrPjAkAJgDAI2/vDJUHE4M=; b=aSpuy5mVKV3XTBolt0DA/n9lgeTekZfzkwi10SBQKfqkhawA96B46ElGQWHCHTGTuC UULcQkqNO/OmRhS2JVaiRo8mzq2mC8uJSnPU2H2uKZp6xASWBHFD+nKt1aMBEau+qAb0 L8SpyN8jyzNShR/M0yfQnJz4OFx0eTJ6QdN28qekHROTo92dV650TRCDG03WeLD8H8a+ tbfTCr5nVEcrXbybioLIJhGfcU52x58SshD2oJADJQDW+yYYslWHBchHG9TvKPBZoWwD GfW1fb5TSt+lueIS1Y+Oglv1YSKsKc9WlDAl2cZNwfJqliv9g1rcpLck2S0dzyr2wXpm kmEw== 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=qkYlQ2hG55eOJBhaI2ddQgrPjAkAJgDAI2/vDJUHE4M=; b=ISttB+Cobf2M0I7IjApwmp/ftBvRCicouNF3duqbmt8X1YDH+5m/ofaEtbUuqc0zsF R1rtpzyRhgdY2D3pwqyx0lO5awLEOURDf8FbwBtAfFBjxkc2ix0o6zHbaA3vIMPNroKa 4GsV87jqOVze6ztBNqx+5y3+Wx1rZ3Ee73nUngJXmc3bjCoAZwzsqDteeH43wVYB60Jo kJRl4XOy7odV+U/UxlBn0bVZmJ8RKZH6v+56vc8UDuX/acs3N3/lTwoPWmLcRSKz0obm 85v2KSnuLOThkvHmp9siTHd8WEt1M/il++KtfEmxFxyqxv09p7yVu+S1b5eF2+SL5EQC ChyA== X-Gm-Message-State: AOAM530e6SvpLP2yIcMfoKa4UdNUDEtV4EPTbnvRKN3UklSCv87K7DF2 6mJla64pxCUzbeyoAv7asmRJOAslhFw= X-Google-Smtp-Source: ABdhPJyHndWxHTjQLQJDVEY+v7Z4Kzx89vgIKk252SBVAYkpEHFSfoNjTZyu7ONwJ89gpluVKJ975w== X-Received: by 2002:adf:f88d:: with SMTP id u13mr10687010wrp.213.1601570606902; Thu, 01 Oct 2020 09:43:26 -0700 (PDT) Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id h3sm10733059wrq.0.2020.10.01.09.43.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 09:43:26 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 1/3] util/cutils: Introduce freq_to_str() to display Hertz units Date: Thu, 1 Oct 2020 18:43:20 +0200 Message-Id: <20201001164322.1585392-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201001164322.1585392-1-f4bug@amsat.org> References: <20201001164322.1585392-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Alistair Francis , Luc Michel , Eduardo Habkost , Havard Skinnemoen , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Tyrone Ting , Damien Hedde , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Introduce freq_to_str() to convert frequency values in human friendly units using the SI units for Hertz. Suggested-by: Luc Michel Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Reviewed-by: Luc Michel --- include/qemu/cutils.h | 12 ++++++++++++ util/cutils.c | 14 ++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h index 3a86ec0321..4bbf4834ea 100644 --- a/include/qemu/cutils.h +++ b/include/qemu/cutils.h @@ -158,6 +158,18 @@ int qemu_strtosz_metric(const char *nptr, const char **end, uint64_t *result); char *size_to_str(uint64_t val); +/** + * freq_to_str: + * @freq_hz: frequency to stringify + * + * Return human readable string for frequency @freq_hz. + * Use SI units like KHz, MHz, and so forth. + * + * The caller is responsible for releasing the value returned + * with g_free() after use. + */ +char *freq_to_str(uint64_t freq_hz); + /* used to print char* safely */ #define STR_OR_NULL(str) ((str) ? (str) : "null") diff --git a/util/cutils.c b/util/cutils.c index 8da34e04b0..be4e43a9ef 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -885,6 +885,20 @@ char *size_to_str(uint64_t val) return g_strdup_printf("%0.3g %sB", (double)val / div, suffixes[i]); } +char *freq_to_str(uint64_t freq_hz) +{ + static const char *const suffixes[] = { "", "K", "M", "G", "T", "P", "E" }; + double freq = freq_hz; + size_t idx = 0; + + while (freq >= 1000.0 && idx < ARRAY_SIZE(suffixes)) { + freq /= 1000.0; + idx++; + } + + return g_strdup_printf("%0.3g %sHz", freq, suffixes[idx]); +} + int qemu_pstrcmp0(const char **str1, const char **str2) { return g_strcmp0(*str1, *str2); From patchwork Thu Oct 1 16:43:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 272279 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 832A3C4741F for ; Thu, 1 Oct 2020 16:45:06 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 266B420872 for ; Thu, 1 Oct 2020 16:45:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fS0+JREy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 266B420872 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kO1hZ-0001wj-7w for qemu-devel@archiver.kernel.org; Thu, 01 Oct 2020 12:45:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kO1g3-00009p-Kx for qemu-devel@nongnu.org; Thu, 01 Oct 2020 12:43:31 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:40025) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kO1g2-0006EB-4L for qemu-devel@nongnu.org; Thu, 01 Oct 2020 12:43:31 -0400 Received: by mail-wm1-x342.google.com with SMTP id k18so3844077wmj.5 for ; Thu, 01 Oct 2020 09:43:29 -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=aalZfwDNGdwdW5/IIKOVPxUHA6XH4oPdaqpcACoVNTg=; b=fS0+JREyYVjO9EvT+b7+KTBJI63x8Q0fqj88LoSiwFxbXe/5Vhyf2QorziKM1xwo8S qEXXUYpCOaj1FmSZHp9wi0lBCytWSOM9ikLZtOBDl+DhEL8Grwkn/P+EYk87aNpbn7ol wMFQ4jOskhB6UQaauPR0Oa9Ir5ncFoG7/bNfjw1fQ90puX0pd/5HrkUSeo67Z0NB5dsn n61m437iNDueDmXFv4gwCwSJ2oZlCc3BKCr91xqAS5OdlS3iqN/z7A8F8XT1y2KcGUou CVhlGpSAA6MHVKy1lMxSBNQ8E9w944NW0XzVOL0UORVAj4k3+GMyUhlp2UDcivL2NmKH VU0g== 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=aalZfwDNGdwdW5/IIKOVPxUHA6XH4oPdaqpcACoVNTg=; b=H3UUlxhgyk6Uz2kLccIDmbWI5x9mUiUh/4jDj4MWavP+POaI4FKcJBzT21MYbCmrMo y7+/Pjje46zVyUBgvbm5I75FZ0wVQ13/qjm0El8CYOBQT6otn+ZBB8nYX6ZlBEVPGwU/ frF6vQbZBYIkDdHtjzRDT1YsBZXzrdeybgIdha5MmUIASEVCbiVRXVHtmnT5VI35Nh7h E6YVXHi/oNkUp7twhGnYUu8t0uhOOTCBz/RzWwfEeUZ2M6FWr3RvkKGCl/O22aS3LAfo Zr+bOQbFsP9uKpVN5k6q730ZFgtu9WaXTdmiA4KtrnDPg7EvSKYvpBBZTxPV96Sd2DrT O+eA== X-Gm-Message-State: AOAM531CMAJyZ7k/dH7Fs6cVpvcoMMQzHIixhKKaduC6Ln+lkRqEO3zS WNC5h1J38EgySDTqq/Mph0hJoY35dU8= X-Google-Smtp-Source: ABdhPJwRkbwt64+1WsO53KCSGp0gY4jt27b1b4sOgvKPpIWS1rJit2eDmXAgNO3SA82056PUg0K6Sw== X-Received: by 2002:a05:600c:2047:: with SMTP id p7mr979653wmg.168.1601570608415; Thu, 01 Oct 2020 09:43:28 -0700 (PDT) Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id h3sm10733059wrq.0.2020.10.01.09.43.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 09:43:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 2/3] qdev-monitor: Display frequencies scaled to SI unit Date: Thu, 1 Oct 2020 18:43:21 +0200 Message-Id: <20201001164322.1585392-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201001164322.1585392-1-f4bug@amsat.org> References: <20201001164322.1585392-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Alistair Francis , Luc Michel , Eduardo Habkost , Havard Skinnemoen , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Tyrone Ting , Damien Hedde , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Since commit 9f2ff99c7f2 ("qdev-monitor: print the device's clock with info qtree") we can display the clock frequencies in the monitor. Use the recently introduced freq_to_str() to display the frequencies using the closest SI unit (human friendlier). Before: (qemu) info qtree [...] dev: xilinx,zynq_slcr, id "" clock-in "ps_clk" freq_hz=3.333333e+07 mmio 00000000f8000000/0000000000001000 After: dev: xilinx,zynq_slcr, id "" clock-in "ps_clk" freq_hz=33.3 MHz mmio 00000000f8000000/0000000000001000 Reviewed-by: Luc Michel Reviewed-by: Damien Hedde Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- qdev-monitor.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index e9b7228480..a0301cfca8 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -747,11 +747,13 @@ static void qdev_print(Monitor *mon, DeviceState *dev, int indent) } } QLIST_FOREACH(ncl, &dev->clocks, node) { - qdev_printf("clock-%s%s \"%s\" freq_hz=%e\n", + g_autofree char *freq = NULL; + + freq = freq_to_str(clock_get_hz(ncl->clock)); + qdev_printf("clock-%s%s \"%s\" freq_hz=%s\n", ncl->output ? "out" : "in", ncl->alias ? " (alias)" : "", - ncl->name, - CLOCK_PERIOD_TO_HZ(1.0 * clock_get(ncl->clock))); + ncl->name, freq); } class = object_get_class(OBJECT(dev)); do { From patchwork Thu Oct 1 16:43:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 272278 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8070BC47420 for ; Thu, 1 Oct 2020 16:48:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E0FCE20897 for ; Thu, 1 Oct 2020 16:48:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ELPRRGRb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E0FCE20897 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kO1kV-0004td-Qe for qemu-devel@archiver.kernel.org; Thu, 01 Oct 2020 12:48:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kO1g4-0000DC-V3 for qemu-devel@nongnu.org; Thu, 01 Oct 2020 12:43:32 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:52221) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kO1g3-0006EW-F5 for qemu-devel@nongnu.org; Thu, 01 Oct 2020 12:43:32 -0400 Received: by mail-wm1-x343.google.com with SMTP id w2so3612209wmi.1 for ; Thu, 01 Oct 2020 09:43:31 -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=x6kGxn4MIKwxLSY1d8I1BClrthzon31d/eVho3rjiZ8=; b=ELPRRGRbY7jF8iKPppxzJ2VWwa9q8WcGGkVjdYjcC0dlecF+4CTwdjvkhyhIcoTWOD lPedZtfDzWDGy6q2GRfeBDaNu0KgPDF8ymxFIFnRQFu9uGprn3rfj6u/dLVBBzpCf0ey OOtaFz4ZLCSVikI/DHFnvJM+u0KCM9RnPbYvR189hSbyyJD4BHmy1nWrQ13kA6Xn1sRF wwT+6pKSbt+2rjrvDqIiOtbNjs7p1EYzMgSJusCbnJdND55XOidN+SMF3vxVatLylTMh 0ezFQ4amWpk/JTp5LZ6MrCLvP606Js439iDCXQI5PcXFKrcK/24DWnUOBC00eLV99XwU OOhg== 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=x6kGxn4MIKwxLSY1d8I1BClrthzon31d/eVho3rjiZ8=; b=AFoB4q9Fuq1st7llW7LwvgL7oQ8nTxzac4CfI+ywuCf5sdPJJ7vxxW7+becf3naGbJ T1tWb9ecqwoNn+lt09uPc5H2EhGKRVx9R+uwjKv4cT256sho9k5sDFbIwxJ4w95v9t8h i+Y0BFKSF9eJmkc6FHK1gTgNRWJr+mvqH+bUxt+6qkRt6ze2RWUl9MDNy3W6YA6GfAwx Nz9lG0FSpoLo8fUZGOMJyqgRmw/pCRB4QT3DKXKaag4feT+f2MWptWajIa4muOrSmAQk ySTIlVbzvSTFB+ZE+Wvnk7Rf0yICHzz4PjDfB5/l0cHLhJCvpa2xrPZv/09MHydoX2SM oAFA== X-Gm-Message-State: AOAM5316eWT4XIGbwNk6eChtxqF6zlo/uDV7crrixIxg2Co4YTVM51Lv Ba/pfVOJk/oIp90TEqFuYHyY6SEHP9M= X-Google-Smtp-Source: ABdhPJzUKjYZ43UDfU3PfSgZBmfvr7oaaVYiChY6anQdEbmd5PfZ9Gz/Sg4pAiJvwmNfXpWHiIdEdw== X-Received: by 2002:a05:600c:414a:: with SMTP id h10mr919597wmm.79.1601570609879; Thu, 01 Oct 2020 09:43:29 -0700 (PDT) Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id h3sm10733059wrq.0.2020.10.01.09.43.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 09:43:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 3/3] hw/qdev-clock: Display error hint when clock is missing from device Date: Thu, 1 Oct 2020 18:43:22 +0200 Message-Id: <20201001164322.1585392-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201001164322.1585392-1-f4bug@amsat.org> References: <20201001164322.1585392-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Alistair Francis , Luc Michel , Eduardo Habkost , Havard Skinnemoen , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Tyrone Ting , Damien Hedde , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Instead of directly aborting, display a hint to help the developer figure out the problem (likely trying to connect a clock to a device pre-dating the Clock API, thus not expecting clocks). Reviewed-by: Luc Michel Reviewed-by: Damien Hedde Reviewed-by: Edgar E. Iglesias Signed-off-by: Philippe Mathieu-Daudé --- hw/core/qdev-clock.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/core/qdev-clock.c b/hw/core/qdev-clock.c index 47ecb5b4fa..33bd4a9d52 100644 --- a/hw/core/qdev-clock.c +++ b/hw/core/qdev-clock.c @@ -12,6 +12,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/qdev-clock.h" #include "hw/qdev-core.h" #include "qapi/error.h" @@ -153,6 +154,11 @@ Clock *qdev_get_clock_in(DeviceState *dev, const char *name) assert(name); ncl = qdev_get_clocklist(dev, name); + if (!ncl) { + error_report("can not find clock-in '%s' for device type '%s'", + name, object_get_typename(OBJECT(dev))); + abort(); + } assert(!ncl->output); return ncl->clock; @@ -165,6 +171,11 @@ Clock *qdev_get_clock_out(DeviceState *dev, const char *name) assert(name); ncl = qdev_get_clocklist(dev, name); + if (!ncl) { + error_report("can not find clock-out '%s' for device type '%s'", + name, object_get_typename(OBJECT(dev))); + abort(); + } assert(ncl->output); return ncl->clock;